Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/landTransportation/index.js

@@ -244,7 +244,7 @@ export function saveFile(data) {
         data:data
     })
 }
-//保存附件
+//获取默认公司名称
 export function getCorp() {
     return request({
         url: '/api/blade-client/corpsattn/get-corp',

src/components/crop-select/main.vue

@@ -41,7 +41,7 @@
         <el-option
           v-for="item in corpList"
           :key="item.id"
-          :label="item.cname"
+          :label="label?item[label]:item.cname"
           :value="item.id"
         >
         </el-option>
@@ -49,6 +49,7 @@
       <el-button
         icon="el-icon-search"
         size="mini"
+        v-if="label != 'shortName'"
         :disabled="disabled"
         @click="openDialog()"
       ></el-button>
@@ -166,6 +167,7 @@ export default {
     collapseTags: Boolean,
     gysType: String,
     treeType: String,
+    label: String,
     belongtocompany: Number
   },
   model: {

src/views/landTransportation/dispatchingCars/index.vue

@@ -72,6 +72,13 @@
               v-model="row.corpId"
           ></crop-select>
         </template>
+        <template slot="corpShortNameSearch" slot-scope="{ row,index}">
+          <crop-select
+              v-model="row.corpId"
+              :corpType="'KH'"
+              :label="'shortName'"
+          ></crop-select>
+        </template>
         <template slot="addressDetail" slot-scope="{ row,index}">
           <el-tooltip class="item" effect="dark" placement="top">
             <div v-html="ToBreak(row.addressDetail)" slot="content"></div>

src/views/landTransportation/driver/index.vue

@@ -325,6 +325,7 @@ export default {
           label: '车号',
           width: 150,
           prop: 'plateNo',
+          filterable: true,
           overHidden: true,
           index:8,
           type: 'select',
@@ -340,6 +341,7 @@ export default {
           index:9,
           search: true,
           overHidden: true,
+          filterable: true,
           prop: 'driverId',
           type: 'select',
           dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1918,12 +1918,16 @@ export default {
     },
     //确认变更
     confirmChange() {
-      validChange().then(res => {
-        this.goodsForm.status = 0
-        this.goodsOptionFormC.disabled = false
-        this.goodsOptionForm.disabled = false
-        this.goodsOptionFormTwo.disabled = false
-        this.typeTwo = true
+      validChange({id:this.id}).then(res => {
+        if (res.data.data){
+          this.goodsForm.status = 0
+          this.goodsOptionFormC.disabled = false
+          this.goodsOptionForm.disabled = false
+          this.goodsOptionFormTwo.disabled = false
+          this.typeTwo = true
+        }else {
+          this.$message.error('不允许变更')
+        }
       })
     },
     //变更保存

src/views/landTransportation/placeAnOrder/index.vue

@@ -127,6 +127,13 @@
           </el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
+        <template slot="corpShortNameSearch" slot-scope="{ row,index}">
+          <crop-select
+              v-model="row.corpId"
+              :corpType="'KH'"
+              :label="'shortName'"
+          ></crop-select>
+        </template>
         <template slot="corpNameSearch" slot-scope="{ row,index}">
           <crop-select
               v-model="row.corpId"