提交代码

build/utils.js

@@ -15,8 +15,16 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
+<<<<<<< HEAD
 let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
 //let devModules = ['all']
+=======
+
+// let devModules = ['index', 'statisticalReport', 'appoint']
+let devModules = ['all']
+//let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
+// let devModules = ['all']
+>>>>>>> ecb211626d4aa9a51230114ced8866039cba10e1
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

@@ -70,10 +70,10 @@ let proxyTable = {
       '^/icore.icp.web/game/v1': '/v1'
     }
   },
-  // 所有数据的请求域名地址r
+  // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    //target: 'http://localhost:8080',
+    // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

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

@@ -1198,7 +1198,7 @@ export default {
         .then(res => {
           if (res.data.code == '200') {
             this.$message.success('修改详单单价成功!')
-            //this.$refs.tableRef.clearSelection()
+            this.$refs.tableRef.clearSelection()
             //重置未结算详单表单信息
             // this.operation(this.steelMap)
             this.loadNewData()
@@ -1235,7 +1235,7 @@ export default {
               .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
               .then(res => {
                 if (res.data.code == '200') {
-                  //this.$refs.tableRef.clearSelection()
+                  this.$refs.tableRef.clearSelection()
                   this.$message.success('修改详单单价和地址成功!')
                   // this.operation(this.steelMap)
                   this.loadNewData()

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

@@ -1214,7 +1214,9 @@ export default {
         '抵达时间',
         '签收时间',
         '系统建议运价',
-        '摘要'
+        '摘要',
+        '排队开始时间',
+        '钢材科放行时间'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -1301,8 +1303,8 @@ export default {
       orderNumber: null,
       capacityNumber: null,
       arrivalReceiving: false,
-      arriavlList:[],
-      receiveList:[],
+      arriavlList: [],
+      receiveList: [],
       fileListArrival: [],
       fileListReceive: [],
       dialogImageUrl: '',
@@ -1587,32 +1589,32 @@ export default {
       this.axios
         .post('/api/v1/otms/getArrivalPhoto?orderNumber=' + row.orderNo)
         .then(res => {
-          console.log("arrivalPhoto:",res);
-          if(res.data){
-            this.arriavlList=[];
-            res.data.forEach((e,index) => {
+          console.log('arrivalPhoto:', res)
+          if (res.data) {
+            this.arriavlList = []
+            res.data.forEach((e, index) => {
               this.arriavlList.push({
-                name:"file"+index,
-                url:e
-              });
-            });
-            this.fileListArrival=this.arriavlList;
+                name: 'file' + index,
+                url: e
+              })
+            })
+            this.fileListArrival = this.arriavlList
           }
         })
       //签收图片
       this.axios
         .post('/api/v1/otms/getReceivingPhotoByUrl?orderNumber=' + row.orderNo)
         .then(res => {
-          console.log("ReceivingPhoto:",res);
-          if(res.data){
-            this.receiveList=[];
-            res.data.forEach((e,index) => {
+          console.log('ReceivingPhoto:', res)
+          if (res.data) {
+            this.receiveList = []
+            res.data.forEach((e, index) => {
               this.receiveList.push({
-                name:"file"+index,
-                url:e
-              });
-            });
-            this.fileListReceive=this.receiveList;
+                name: 'file' + index,
+                url: e
+              })
+            })
+            this.fileListReceive = this.receiveList
           }
         })
     },
@@ -2374,13 +2376,13 @@ export default {
               loading.close()
             } else {
               loading.close()
-              this.$alert(res.data.data,'提示',{
-                confirmButtonText:"确定",
-                callback:action=>{
-                   this.getSteelReport()
+              this.$alert(res.data.data, '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                  this.getSteelReport()
                   this.operation(this.steelMap)
                 }
-              });
+              })
             }
           })
           .catch(() => {

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

@@ -447,11 +447,13 @@ export default {
       filterMap: {},
       //销售订单主表数据
       saleOrderList: [
+        'receiveId',
         'receiveName',
         'isSelfMention',
         'saleRemark',
         'saleOrderReceiveCustomer',
         'salerName',
+        'salerId',
         'saleOrderNo',
         'saleArea',
         'saleOrderId'
@@ -463,9 +465,12 @@ export default {
         'district',
         'town',
         'truckRemark',
+        'shipperAddressId',
+        'placeId',
         'place',
         'saleOrderConsigneeTel',
         'saleDateOfReceipt',
+        'materialId',
         'materialName',
         'materialSpecification',
         'materialModel',
@@ -498,7 +503,7 @@ export default {
     this.remarkDateOld = this.getRemarkDateOld()
     this.addSaleOrder1 = this.debounce(() => {
       this.addSaleOrder()
-    }, 2000)
+    }, 1000)
     this.getSteelReport()
   },
   watch: {
@@ -682,11 +687,15 @@ export default {
             saleOrderListMap.push(map)
           })
           this.axios
-            .post('/api/v1/ams/addUnloadSteelSaleOrderList', saleOrderListMap)
+            .post('/api/v1/ams/addUnloadSteelSaleOrderList', saleOrderListMap, {
+              timeout: 5 * 60 * 1000
+            })
             .then(res => {
               if (res.data.code == '200') {
                 this.axios
-                  .post('/api/v1/ams/closingEntries', closeEntryList)
+                  .post('/api/v1/ams/closingEntries', closeEntryList, {
+                    timeout: 3 * 60 * 1000
+                  })
                   .then(res => {
                     if (res.data.code == '200') {
                       this.getSteelReport()
@@ -699,8 +708,14 @@ export default {
                       })
                     }
                   })
+                  .catch(e => {
+                    loading.close()
+                  })
               }
             })
+            .catch(e => {
+              loading.close()
+            })
         })
         .catch(() => {
           this.$message({