修改

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-// let devModules = ['index', 'RMS']
+// let devModules = ['index', 'statisticalReport', 'sale']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -2138,7 +2138,6 @@ export default {
           this.receipctPhotoClick(row.orderNo, 1)
         }
       }
-      this.$refs.tableRef.toggleRowSelection(row)
     },
     //反关闭运单
     reverseCloseOrder() {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1090,7 +1090,11 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="签收地址">
-          <el-input v-model="location" style="width:400px" :disabled="orgCode!='wuliuyunshubu'"></el-input>
+          <el-input
+            v-model="location"
+            style="width:400px"
+            :disabled="orgCode != 'wuliuyunshubu'"
+          ></el-input>
         </el-form-item>
         <el-form-item label="抵达图片（车头、满货箱）" style="">
           <el-upload
@@ -2154,7 +2158,8 @@ export default {
             return map
           })
           let map = {
-            mapList: mapList
+            mapList: mapList,
+            userName: getCookie('loginName')
           }
           this.axios
             .post('/api/v1/ams/splitOrder', map)
@@ -2213,7 +2218,8 @@ export default {
             return map
           })
           let map = {
-            mapList: mapList
+            mapList: mapList,
+            userName: getCookie('loginName')
           }
           this.axios
             .post('/api/v1/ams/mergeOrder', map)
@@ -2515,21 +2521,26 @@ export default {
         this.$message.warning('该车未出厂，不允许签收')
         return
       }
-      if(row.arrivalAddress){
+      if (row.arrivalAddress) {
         //优先获取抵达地址
-        this.location=row.arrivalAddress;
-      }else{
+        this.location = row.arrivalAddress
+      } else {
         //其次获取车辆定位
-          this.axios
-          .get('/api/v1/otms/getCurrentLocation?capcityNumber=' + row.newCapacityNo)
+        this.axios
+          .get(
+            '/api/v1/otms/getCurrentLocation?capcityNumber=' + row.newCapacityNo
+          )
           .then(res => {
-            if (res.data.status=='succeed' && res.data.data.result.status!=1001) {
-              this.location=res.data.data.result.adr;
-            }else{
-              this.location=null;
-              this.$message.warning("获取不到车辆定位！请联系销售公司上传！");
+            if (
+              res.data.status == 'succeed' &&
+              res.data.data.result.status != 1001
+            ) {
+              this.location = res.data.data.result.adr
+            } else {
+              this.location = null
+              this.$message.warning('获取不到车辆定位！请联系销售公司上传！')
             }
-        });
+          })
       }
       this.orderNumber = row.orderNo
       this.capacityNumber = row.capacityNo
@@ -2569,7 +2580,9 @@ export default {
     },
     arrivalAndReceive() {
       if (!this.location) {
-        this.$message.warning('签收地址必须取车辆定位！若取不到请联系销售公司上传！')
+        this.$message.warning(
+          '签收地址必须取车辆定位！若取不到请联系销售公司上传！'
+        )
         return
       }
       if (this.fileListArrival.length < 2) {
@@ -2636,7 +2649,7 @@ export default {
       this.dialogVisible = true
     },
     closeUpload() {
-      this.location=null
+      this.location = null
       this.arrivalReceiving = false
       this.isLoading = false
       this.$refs.arrival.clearFiles()