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

src/api/landTransportation/index.js

@@ -176,6 +176,14 @@ export function fleetList(data) {
         params:data
     })
 }
+//获取司机信息
+export function fleetListTwo(data) {
+    return request({
+        url: '/api/blade-client/land-vehicle/driver-list',
+        method: 'get',
+        params:data
+    })
+}
 //获取省市区
 export function addressList(name) {
     return request({

src/router/views/index.js

@@ -1382,6 +1382,21 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/landTransportation/reportAnalysis/index')
   }]
 },
+//散货台账
+{
+  path: '/landTransportation/bulkReportAnalysis/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/landTransportation/bulkReportAnalysis/index',
+    name: '散货台账',
+    meta: {
+      i18n: '/landTransportation/bulkReportAnalysis/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/landTransportation/bulkReportAnalysis/index')
+  }]
+},
 //运维-价格管理
 {
   path: '/maintenance/priceManagement/index',

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -62,7 +62,7 @@
         <trade-card title="基础信息">
           <el-row>
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+              <el-form-item :label="item.label+':'" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="goodsDisable || viewDisabled" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <crop-select
                   v-else-if="item.prop === 'corpId'"
@@ -88,6 +88,9 @@
                 </el-select>
                 <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" :disabled="goodsDisable || viewDisabled" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || goodsDisable || viewDisabled" placeholder="请输入"  size="small" autocomplete="off"></el-input>
+                <template slot="label" v-if="item.prop === 'corpId'">
+                  <e-crop-jump :label="item.label" corp-type="KH"></e-crop-jump>
+                </template>
               </el-form-item>
             </el-col>
           </el-row>

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -39,7 +39,7 @@
         <trade-card title="基础信息">
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+              <el-form-item :label="item.label+':'" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
                   :disabled="receiptDisable || viewDisabled" size="small" type="date" placeholder="请选择日期"
                   value-format="yyyy-MM-dd HH:mm:ss" />
@@ -61,6 +61,9 @@
                 <el-input v-else v-model="form[item.prop]" size="small"
                   :disabled="item.disabled ? true : false || receiptDisable || viewDisabled" placeholder="请输入"
                   autocomplete="off"></el-input>
+                <template slot="label" v-if="item.prop === 'corpId'">
+                  <e-crop-jump :label="item.label" corp-type="GYS"></e-crop-jump>
+                </template>
               </el-form-item>
             </el-col>
           </el-row>

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -507,7 +507,7 @@
             width="180"
             label="货物体积">
           <template slot-scope="scope">
-            <el-input-number :controls="false" v-model="scope.row.volume" size="small" :disabled="goodsForm.status !== 0" placeholder="请输入内容" precision="2"></el-input-number>
+            <el-input-number :controls="false" v-model="scope.row.volume" size="small" :disabled="goodsForm.status !== 0" placeholder="请输入内容" precision="2" @change="calculateFreight()"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
@@ -533,7 +533,7 @@
             label="重量">
           <template slot-scope="scope">
             <el-input v-model="scope.row.weight" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+                      placeholder="请输入内容" @input="calculateFreight()"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -543,7 +543,7 @@
             label="件数">
           <template slot-scope="scope">
             <el-input v-model="scope.row.quantity" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+                      placeholder="请输入内容" @input="calculateFreight()"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -733,7 +733,7 @@
             width="180"
             label="货物体积">
           <template slot-scope="scope">
-            <el-input-number :controls="false" v-model="scope.row.volume" size="small" :disabled="goodsForm.status !== 0" placeholder="请输入内容" precision="2"></el-input-number>
+            <el-input-number :controls="false" v-model="scope.row.volume" size="small" :disabled="goodsForm.status !== 0" placeholder="请输入内容" precision="2" @change="calculateFreight()"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
@@ -762,6 +762,7 @@
                 v-model="scope.row.weight"
                 :disabled="goodsForm.status !== 0"
                 size="small"
+                @input="calculateFreight()"
                 placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
@@ -775,6 +776,7 @@
                 v-model="scope.row.quantity"
                 :disabled="goodsForm.status !== 0"
                 size="small"
+                @input="calculateFreight()"
                 placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
@@ -1630,8 +1632,51 @@ export default {
             trigger: "blur"
           }],
         }, {
+          label: '计价单位',
+          span: 6,
+          type: "select",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=count_unit",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          prop: 'pricingUnit',
+          change:(data)=>{
+            this.goodsForm.pricingUnit = data.value
+            this.calculateFreight(data)
+          }
+        }, {
+          label: '装卸货',
+          span: 6,
+          type: "select",
+          prop: 'loadingUnloading',
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+          dicData:[{
+            dictValue:'装货'
+          },{
+            dictValue:'卸货'
+          }],
+          change:(data)=>{
+            this.goodsForm.loadingUnloading = data.value
+            this.calculateFreight(data)
+          }
+        }, {
+          label: '单价',
+          span: 6,
+          prop: 'unitPrice',
+          change:(data)=>{
+            this.goodsForm.unitPrice = data.value
+            this.calculateFreight(data)
+          }
+        }, {
           label: '单车运费',
           span: 6,
+          type: 'number',
+          controls:false,
+          precision:2,
           prop: 'freightCollect'
         }
           // , {
@@ -2315,6 +2360,59 @@ export default {
     this.$refs.other.show = false
   },
   methods: {
+    //单车运费计算
+    calculateFreight(data){
+      if (this.goodsForm.pricingUnit && this.goodsForm.loadingUnloading && this.goodsForm.unitPrice){
+        if (this.goodsForm.loadingUnloading == '装货'){
+          if (this.goodsForm.pricingUnit == '体积'){
+            this.goodsForm.freightCollect = 0
+            this.tableData.forEach(item=>{
+              if (item.volume){
+                this.goodsForm.freightCollect += Number(item.volume) * Number(this.goodsForm.unitPrice)
+              }
+            })
+            // unitPrice
+          }else if (this.goodsForm.pricingUnit == '重量'){
+            this.goodsForm.freightCollect = 0
+            this.tableData.forEach(item=>{
+              if (item.weight){
+                this.goodsForm.freightCollect += Number(item.weight) * Number(this.goodsForm.unitPrice)
+              }
+            })
+          }else if (this.goodsForm.pricingUnit == '件数'){
+            this.goodsForm.freightCollect = 0
+            this.tableData.forEach(item=>{
+              if (item.quantity){
+                this.goodsForm.freightCollect += Number(item.quantity) * Number(this.goodsForm.unitPrice)
+              }
+            })
+          }
+        }else {
+          if (this.goodsForm.pricingUnit == '体积'){
+            this.goodsForm.freightCollect = 0
+            this.tableDataTwo.forEach(item=>{
+              if (item.volume){
+                this.goodsForm.freightCollect += Number(item.volume) * Number(this.goodsForm.unitPrice)
+              }
+            })
+          }else if (this.goodsForm.pricingUnit == '重量'){
+            this.goodsForm.freightCollect = 0
+            this.tableDataTwo.forEach(item=>{
+              if (item.weight){
+                this.goodsForm.freightCollect += Number(item.weight) * Number(this.goodsForm.unitPrice)
+              }
+            })
+          }else if (this.goodsForm.pricingUnit == '件数'){
+            this.goodsForm.freightCollect = 0
+            this.tableDataTwo.forEach(item=>{
+              if (item.quantity){
+                this.goodsForm.freightCollect += Number(item.quantity) * Number(this.goodsForm.unitPrice)
+              }
+            })
+          }
+        }
+      }
+    },
     openTrack(row) {
       gaude({itemId: row.id, plateNo: row.plateNo, tenantId: '234557', color: '2'}).then(res => {
         this.lineArr = res.data.data.trackArray
@@ -2474,7 +2572,7 @@ export default {
       if (id) {
         ids = id
       } else {
-        ids = this.id
+        ids = this.goodsForm.id
       }
       detailDelegationList({id: ids}).then(res => {
         this.goodsForm = res.data.data
@@ -2566,9 +2664,11 @@ export default {
       if (scope.row.id) {
         tRemove({ids: scope.row.id}).then(res => {
           this.tableData.splice(scope.$index, 1);
+          this.calculateFreight()
         })
       } else {
         this.tableData.splice(scope.$index, 1);
+        this.calculateFreight()
       }
     },
     //删除途径地址

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -354,14 +354,7 @@ export default {
             type: 'sum',
             decimals: 2
           }],
-        column: [{
-          label: '客户名称',
-          prop: 'corpShortName',
-          overHidden: true,
-          index: 1,
-          width: 100,
-          search: true,
-        }, {
+        column: [ {
           label: '货运日期',
           prop: 'arrivalTime',
           overHidden: true,
@@ -374,6 +367,20 @@ export default {
           width: 126,
           search: true,
         }, {
+          label: '车号',
+          prop: 'plateNo',
+          index: 11,
+          width: 90,
+          search: true,
+          overHidden: true,
+        },{
+          label: '客户名称',
+          prop: 'corpShortName',
+          overHidden: true,
+          index: 1,
+          width: 100,
+          search: true,
+        }, {
           label: '业务员',
           prop: 'salesmanName',
           index: 3,
@@ -452,12 +459,6 @@ export default {
           search: true,
           overHidden: true,
         }, {
-          label: '车号',
-          prop: 'plateNo',
-          index: 11,
-          width: 90,
-          overHidden: true,
-        }, {
           label: '应收运费',
           overHidden: true,
           index: 12,
@@ -475,12 +476,12 @@ export default {
           index: 14,
           width: 100,
           overHidden: true,
-        }, {
-          label: '应付杂费明细',
+        },{
+          label: '应收杂费明细',
           width: 100,
           index: 15,
           overHidden: true,
-          prop: 'extraAmountItemC'
+          prop: 'extraAmountItemD'
         }]
       },
       //平台
@@ -574,14 +575,7 @@ export default {
             type: 'sum',
             decimals: 2
           }],
-        column: [{
-          label: '客户名称',
-          prop: 'corpShortName',
-          overHidden: true,
-          index: 1,
-          width: 100,
-          search: true,
-        }, {
+        column: [ {
           label: '货运日期',
           prop: 'arrivalTime',
           overHidden: true,
@@ -594,6 +588,20 @@ export default {
           width: 126,
           search: true,
         }, {
+          label: '车号',
+          prop: 'plateNo',
+          index: 11,
+          width: 90,
+          search: true,
+          overHidden: true,
+        },{
+          label: '客户名称',
+          prop: 'corpShortName',
+          overHidden: true,
+          index: 1,
+          width: 100,
+          search: true,
+        }, {
           label: '业务员',
           prop: 'salesmanName',
           index: 3,
@@ -659,12 +667,6 @@ export default {
           search: true,
           overHidden: true,
         }, {
-          label: '车号',
-          prop: 'plateNo',
-          index: 11,
-          width: 90,
-          overHidden: true,
-        }, {
           label: '应收运费',
           overHidden: true,
           index: 12,
@@ -698,6 +700,7 @@ export default {
           label: '应收杂费明细',
           width: 100,
           index: 18,
+          overHidden: true,
           prop: 'extraAmountItemD'
         }, {
           label: '应付杂费明细',
@@ -809,8 +812,17 @@ export default {
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
           width: 126,
+          searchOrder:1,
           search: true,
         }, {
+          label: '车号',
+          prop: 'plateNo',
+          index: 10,
+          width: 90,
+          search: true,
+          searchOrder:2,
+          overHidden: true,
+        }, {
           label: '物流运输',
           prop: 'dispatchDept',
           search: true,
@@ -874,12 +886,6 @@ export default {
           search: true,
           overHidden: true,
         }, {
-          label: '车号',
-          prop: 'plateNo',
-          index: 10,
-          width: 90,
-          overHidden: true,
-        }, {
           label: '应付运费',
           prop: 'landAmountC',
           index: 11,
@@ -942,22 +948,22 @@ export default {
       }
     }
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88.3), this.optionList);
-    if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1){
-      this.goodsOptionCrud.column.push({
-        label: '利润',
-        width: 80,
-        precision: 2,
-        index: 17,
-        type: 'number',
-        prop: 'profit'
-      })
-    }else {
-      for (let item in this.goodsOptionCrud.column){
-        if (this.goodsOptionCrud.column[item].prop == 'profit'){
-          this.goodsOptionCrud.column.splice(item, 1);
-        }
-      }
-    }
+    // if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1){
+    //   this.goodsOptionCrud.column.push({
+    //     label: '利润',
+    //     width: 80,
+    //     precision: 2,
+    //     index: 17,
+    //     type: 'number',
+    //     prop: 'profit'
+    //   })
+    // }else {
+    //   for (let item in this.goodsOptionCrud.column){
+    //     if (this.goodsOptionCrud.column[item].prop == 'profit'){
+    //       this.goodsOptionCrud.column.splice(item, 1);
+    //     }
+    //   }
+    // }
     this.collectionOption = await this.getColumnData(this.getColumnName(88.2), this.collectionOptionBackup);
     getSalesman().then(res=>{
       this.findObject(this.goodsOptionCrud.column, "salesmanName").dicData = res.data.data
@@ -979,6 +985,9 @@ export default {
         const num = 3 - Number(i % 3)
         this.goodsOptionCrud.searchMenuSpan = num * 8;
         this.goodsOptionCrud.searchMenuPosition = "right";
+      }else {
+        this.goodsOptionCrud.searchMenuSpan = 3 * 8;
+        this.goodsOptionCrud.searchMenuPosition = "right";
       }
     },
     openTrack(row) {

src/views/landTransportation/motorcadeDriver/index.vue

@@ -217,7 +217,7 @@ import {
   driverQueryCollection,
   fleetList,
   motorcadeDriver,
-  fleetDriverSave, telephone, getAttachment, saveAttached, recordingDetails, changeVehicle
+  fleetDriverSave, telephone, getAttachment, saveAttached, recordingDetails, changeVehicle, fleetListTwo
 } from "@/api/landTransportation";
 import {location} from "@/api/gaude";
 import {businessStatisticsFrequency} from "@/api/wel";
@@ -252,14 +252,10 @@ export default {
             value: "plateNo"
           },
           change: (data) => {
-            fleetList({fleetId:this.formDataList.fleetId}).then(res => {
-              for (let item in res.data.data) {
-                if (data.value === res.data.data[item].plateNo) {
-                  this.formData.driverId = res.data.data[item].driverId
-                  this.formData.driverName = res.data.data[item].driverName
-                  this.formData.tel = res.data.data[item].tel
-                }
-              }
+            fleetListTwo({plateNo:data.value}).then(res => {
+              this.formData.driverId = res.data.data[0].driverId
+              this.formData.driverName = res.data.data[0].driverName
+              this.formData.tel = res.data.data[0].tel
             })
           }
         }, {
@@ -474,18 +470,14 @@ export default {
             // hide:true,
             // showColumn: false,
             filterable: true,
-            disabled: true,
             type: 'select',
             cascader: ['plateNo'],
             overHidden: true,
             prop: 'fleetId',
-            dicUrl: "/api/blade-client/corpsdesc/corpsDescList?corpType=CD",
+            dicUrl: "/api/blade-client/corpsdesc/fleetList",
             props: {
               label: "cname",
-              value: "id",
-              // label: "fleetName",
-              // value: "fleetId",
-              // res: "data.records"
+              value: "id"
             },
             cell: true
           }, {
@@ -743,14 +735,10 @@ export default {
     }
     this.key++
     this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
-      fleetList({fleetId:data.row.fleetId}).then(res => {
-        for (let item in res.data.data) {
-          if (data.value === res.data.data[item].plateNo) {
-            this.goodsList[data.index].driverId = res.data.data[item].driverId
-            this.goodsList[data.index].driverName = res.data.data[item].driverName
-            this.goodsList[data.index].tel = res.data.data[item].tel
-          }
-        }
+      fleetListTwo({plateNo:data.value}).then(res => {
+        this.goodsList[data.index].driverId = res.data.data[0].driverId
+        this.goodsList[data.index].driverName = res.data.data[0].driverName
+        this.goodsList[data.index].tel = res.data.data[0].tel
       })
     }
     this.findObject(this.entrustOptionTwoT.column, "driverId").change = (data) => {

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1708,6 +1708,7 @@ export default {
       for (let item of this.salesmanList) {
         if (item.id == val) {
           this.goodsForm.salesmanDept = item.deptId.split(',')[0]
+          this.goodsForm.tel = item.phone
         }
       }
     },

src/views/landTransportation/reportAnalysis/index.vue

@@ -234,6 +234,7 @@ export default {
           }, {
             label: '车号',
             width: 90,
+            search: true,
             prop: 'plateNo'
           }, {
             label: '备注',
@@ -275,7 +276,7 @@ export default {
         menuWidth: 140,
         menu: true,
         searchMenuPosition: "right",
-        searchMenuSpan: 6,
+        searchMenuSpan: 8,
         align: 'center',
         height: "auto",
         showSummary: true,
@@ -362,6 +363,13 @@ export default {
           width: 126,
           search: true,
         }, {
+          label: '车号',
+          width: 90,
+          prop: 'plateNo',
+          overHidden: true,
+          index: 10,
+          search: true
+        }, {
           label: '货运地点',
           index: 4,
           width: 132,
@@ -404,13 +412,6 @@ export default {
             overHidden: true,
             prop: 'ctnDetail'
           }, {
-            label: '车号',
-            width: 90,
-            prop: 'plateNo',
-            overHidden: true,
-            index: 10,
-            search: true
-          }, {
             label: '备注',
             overHidden: true,
             index: 13,
@@ -458,7 +459,7 @@ export default {
       // })
       if (this.roleName.indexOf('车队') !== -1) {
         for (let item of this.goodsOptionCrud.column) {
-          if (item.prop === 'dispatchDeptName') return false
+          if (item.prop === 'dispatchDeptName') return this.calculateHu()
         }
         this.goodsOptionCrud.column.push(
             {
@@ -508,7 +509,7 @@ export default {
         return this.calculateHu()
       } else {
         for (let item of this.goodsOptionCrud.column) {
-          if (item.prop === 'dispatcherName') return false
+          if (item.prop === 'dispatcherName') return this.calculateHu()
         }
         this.goodsOptionCrud.column.push(
             {
@@ -578,7 +579,7 @@ export default {
     if (this.roleName.indexOf('客户') !== -1) {
       this.goodsOptionCrud.menu = true
       for (let item of this.goodsOptionCrud.column) {
-        if (item.prop === 'landAmountD') return
+        if (item.prop === 'landAmountD') return this.calculateHu()
       }
       this.goodsOptionCrud.column.push(
           {
@@ -657,7 +658,7 @@ export default {
     if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('管理员') !== -1) {
       this.goodsOptionCrud.menu = false
       for (let item of this.goodsOptionCrud.column) {
-        if (item.prop === 'landAmountC') return
+        if (item.prop === 'landAmountC') return this.calculateHu()
       }
       this.goodsOptionCrud.column.push(
           {
@@ -736,17 +737,21 @@ export default {
           })
       return this.calculateHu()
     }
+    // this.calculateHu()
   },
   methods: {
     calculateHu() {
       let i = 0;
       this.goodsOptionCrud.column.forEach(item => {
-        if (item.search === true) i++
+        if (item.search) i++
       })
       if (i % 3 !== 0) {
         const num = 3 - Number(i % 3)
         this.goodsOptionCrud.searchMenuSpan = num * 8;
         this.goodsOptionCrud.searchMenuPosition = "right";
+      }else {
+        this.goodsOptionCrud.searchMenuSpan = 3 * 8;
+        this.goodsOptionCrud.searchMenuPosition = "right";
       }
     },
     openTrack(row) {
@@ -867,7 +872,7 @@ export default {
         // })
         if (this.roleName.indexOf('车队') !== -1) {
           for (let item of this.goodsOptionCrud.column) {
-            if (item.prop === 'dispatchDeptName') return false
+            if (item.prop === 'dispatchDeptName') return this.calculateHu()
           }
           this.goodsOptionCrud.column.push(
               {
@@ -917,7 +922,7 @@ export default {
           return this.calculateHu()
         } else {
           for (let item of this.goodsOptionCrud.column) {
-            if (item.prop === 'dispatcherName') return false
+            if (item.prop === 'dispatcherName') return this.calculateHu()
           }
           this.goodsOptionCrud.column.push(
               {
@@ -987,7 +992,7 @@ export default {
       if (this.roleName.indexOf('客户') !== -1) {
         this.goodsOptionCrud.menu = true
         for (let item of this.goodsOptionCrud.column) {
-          if (item.prop === 'landAmountD') return
+          if (item.prop === 'landAmountD') return this.calculateHu()
         }
         this.goodsOptionCrud.column.push(
             {
@@ -1066,7 +1071,7 @@ export default {
       if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('管理员') !== -1) {
         this.goodsOptionCrud.menu = false
         for (let item of this.goodsOptionCrud.column) {
-          if (item.prop === 'landAmountC') return
+          if (item.prop === 'landAmountC') return this.calculateHu()
         }
         this.goodsOptionCrud.column.push(
             {

src/views/purchase/contract/detailsPage.vue

@@ -69,7 +69,7 @@
         <trade-card title="基础信息">
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span ? item.span : 8" :key="index">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+              <el-form-item :label="item.label+':'" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]"
                   :disabled="item.disabled ? true : false || viewDisabled" size="small" type="date" @change="dateChange"
                   placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
@@ -81,7 +81,6 @@
                 <el-input type="age" v-else-if="item.prop === 'orderAmount'" v-model="form[item.prop]"
                   :disabled="item.disabled ? true : false || takeDisabled || viewDisabled" size="small"
                   autocomplete="off" @input="RMBChange" placeholder="请输入"></el-input>
-
                 <crop-select v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" corpType="GYS"
                   :disabled="item.disabled ? true : false || takeDisabled || viewDisabled" style="width: 100%">
                 </crop-select>
@@ -129,6 +128,13 @@
                 <el-input type="age" v-else v-model="form[item.prop]"
                   :disabled="item.disabled ? true : false || takeDisabled || viewDisabled" size="small"
                   autocomplete="off" placeholder="请输入"></el-input>
+
+                <template slot="label" v-if="item.prop === 'corpId'">
+                  <e-crop-jump :label="item.label" corp-type="GYS"></e-crop-jump>
+                </template>
+                <template slot="label" v-if="item.prop === 'belongToCorpId'">
+                  <e-crop-jump :label="item.label" corp-type="GS"></e-crop-jump>
+                </template>
               </el-form-item>
             </el-col>
           </el-row>

src/views/salesManagement/salesContract/detailsPage.vue

@@ -69,7 +69,7 @@
         <trade-card title="基础信息">
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span ? item.span : 8" :key="index">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+              <el-form-item :label="item.label+':'" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
                   :disabled="viewDisabled || takeDisabled" size="small" type="date" placeholder="选择日期"
                   value-format="yyyy-MM-dd HH:mm:ss" />
@@ -100,6 +100,12 @@
                 <el-input type="age" v-else v-model="form[item.prop]" size="small"
                   :disabled="item.disabled ? true : false || viewDisabled" autocomplete="off" placeholder="请输入">
                 </el-input>
+                <template slot="label" v-if="item.prop === 'corpId'">
+                  <e-crop-jump :label="item.label" corp-type="KH"></e-crop-jump>
+                </template>
+                <template slot="label" v-if="item.prop === 'belongToCorpId'">
+                  <e-crop-jump :label="item.label" corp-type="GS"></e-crop-jump>
+                </template>
               </el-form-item>
             </el-col>
           </el-row>

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -224,7 +224,13 @@ export default {
           index: 1,
           width: 150,
           overHidden: true,
-        }, {
+        },{
+          label: '客户名称',
+          prop: 'corpShortName',
+          index: 2,
+          width: 100,
+          overHidden: true,
+        },{
           label: '业务员',
           prop: 'salesmanName',
           index: 2,
@@ -325,61 +331,67 @@ export default {
           index: 1,
           width: 150,
           overHidden: true,
+        },{
+          label: '客户名称',
+          prop: 'corpShortName',
+          index: 2,
+          width: 100,
+          overHidden: true,
         }, {
           label: '业务员',
           prop: 'salesmanName',
-          index: 2,
+          index: 3,
           width: 70,
           overHidden: true,
         },{
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
-          index: 3,
+          index: 4,
           width: 80,
         }, {
           label: '派车单号',
           width: 90,
-          index: 4,
+          index: 5,
           overHidden: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
           width: 90,
-          index: 5,
+          index: 6,
           overHidden: true,
           prop: 'contractNo'
         }, {
           label: '装货地点',
           prop: 'addressDetail',
-          index: 6,
+          index: 7,
           width: 130,
         }, {
           label: '卸货地点',
           prop: 'unloadingPlace',
-          index: 7,
+          index: 8,
           width: 130,
         }, {
           label: '车型',
           width: 80,
-          index: 8,
+          index: 9,
           prop: 'fleetVolum'
         }, {
           label: '车队',
           prop: 'fleetShortName',
-          index: 9,
+          index: 10,
           width: 90,
           overHidden: true,
         }, {
           label: '车号',
           prop: 'plateNo',
-          index: 10,
+          index: 11,
           width: 90,
           overHidden: true,
         }, {
           label: '状态',
           prop: 'status',
-          index: 11,
+          index: 12,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
           props: {
             label: "dictValue",
@@ -392,27 +404,21 @@ export default {
         }, {
           label: '应收运费',
           prop: 'freightCollect',
-          index: 12,
+          index: 13,
           width: 100,
           overHidden: true,
         }, {
           label: '应收杂费',
           prop: 'extraAmountD',
-          index: 13,
+          index: 14,
           width: 100,
           overHidden: true,
         },{
           label: '应付杂费',
           prop: 'extraAmountC',
-          index: 14,
-          width: 100,
-          overHidden: true
-        },{
-          label: '客户名称',
-          prop: 'corpShortName',
           index: 15,
           width: 100,
-          overHidden: true,
+          overHidden: true
         }, {
           label: '备注',
           prop: 'remarks',
@@ -545,24 +551,23 @@ export default {
       }
       this.option.column.push(
           {
+            label: '客户名称',
+            prop: 'corpShortName',
+            index: 2,
+            width: 100,
+            overHidden: true,
+          },{
             label: '业务员',
             prop: 'salesmanName',
-            index: 2,
+            index: 3,
             width: 60,
             overHidden: true,
           }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
-            index: 2,
-            width: 100,
-          },
-          {
-            label: '客户名称',
-            prop: 'corpShortName',
-            index: 16,
+            index: 4,
             width: 100,
-            overHidden: true,
           }, {
             label: '应付杂费',
             prop: 'extraAmountC',
@@ -624,6 +629,12 @@ export default {
       }
       this.option.column.push(
           {
+            label: '客户名称',
+            prop: 'corpShortName',
+            index: 2,
+            width: 100,
+            overHidden: true,
+          },{
             label: '业务员',
             prop: 'salesmanName',
             index: 2,
@@ -637,13 +648,6 @@ export default {
             width: 100
           },
           {
-            label: '客户名称',
-            prop: 'corpShortName',
-            index: 16,
-            width: 100,
-            overHidden: true,
-          },
-          {
             label: '应收运费',
             prop: 'landAmountD',
             index: 14,
@@ -694,6 +698,12 @@ export default {
           }
           this.option.column.push(
               {
+                label: '客户名称',
+                prop: 'corpShortName',
+                index: 2,
+                width: 100,
+                overHidden: true,
+              },{
                 label: '业务员',
                 prop: 'salesmanName',
                 index: 2,
@@ -706,13 +716,7 @@ export default {
                 index: 2,
                 width: 100,
               },
-              {
-                label: '客户名称',
-                prop: 'corpShortName',
-                index: 16,
-                width: 100,
-                overHidden: true,
-              }, {
+               {
                 label: '应付杂费',
                 prop: 'extraAmountC',
                 index: 14,
@@ -773,6 +777,12 @@ export default {
           }
           this.option.column.push(
               {
+                label: '客户名称',
+                prop: 'corpShortName',
+                index: 2,
+                width: 100,
+                overHidden: true,
+              },{
                 label: '业务员',
                 prop: 'salesmanName',
                 index: 2,
@@ -785,13 +795,7 @@ export default {
                 index: 2,
                 width: 100
               },
-              {
-                label: '客户名称',
-                prop: 'corpShortName',
-                index: 16,
-                width: 100,
-                overHidden: true,
-              },
+
               {
                 label: '应收运费',
                 prop: 'landAmountD',