修改

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-let devModules = ['all']
-// let devModules = ['index', 'statisticalReport']
 // let devModules = ['all']
+// let devModules = ['index', 'statisticalReport']
+let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

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

@@ -2218,6 +2218,7 @@ export default {
         this.batchCapacityList.forEach(row => {
           row.capacityId = this.capacityId
           row.capacityNumber = this.capacityNo
+          row.capacityNo = this.capacityNo
           //是否校验GPS
           row.isCheckGPS = this.isCheckGPS
           row.userId = getCookie('userId')
@@ -2232,6 +2233,8 @@ export default {
         let map = {
           list: this.batchCapacityList
         }
+        console.log(map, 'batchMap')
+        return
         this.axios.post('/api/v1/ams/batchUpdateCapacity', map).then(res => {
           if (res.data.code == '200') {
             this.$message.success('派车成功!')
@@ -2296,7 +2299,29 @@ export default {
       if (this.$refs.tableRef.selection.length == 1) {
         this.splitOrder()
       } else if (this.$refs.tableRef.selection.length > 1) {
-        this.mergeOrder()
+        this.$confirm(
+          `尊敬的用户${getCookie(
+            'loginName'
+          )},系统温馨提示您进行合并操作前,请确认所合并的订单将不会在金蝶进行提交,审核等操作!`,
+          '提醒',
+          {
+            confirmButtonText: '我已确认',
+            cancelButtonText: '我再想想',
+            center: true,
+            type: 'warning'
+          }
+        )
+          .then(() => {
+            this.mergeOrder()
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              duration: '2500',
+              message: '操作取消',
+              offset: '250'
+            })
+          })
       } else {
         this.$message({
           type: 'warning',