提交代码

build/utils.js

@@ -18,7 +18,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 
 let devModules = ['all']
 //let devModules=['index']
-// let devModules = ['index', 'statisticalReport']
+//let devModules = ['index', 'statisticalReport','sale','TMS','RMS']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/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

@@ -832,6 +832,8 @@ export default {
       centerDialogVisible: false,
       //
       steelMap: {},
+      startTime: new Date(),
+      endTime: new Date(),
       //钢材子表数据
       steelList: [],
       drawer: false,
@@ -876,8 +878,6 @@ export default {
           lable: '车牌号'
         }
       ],
-      startTime: null,
-      endTime: null,
       //合计净重
       totalNumber: 0,
       //合计车数
@@ -1418,6 +1418,10 @@ export default {
       this.priceList=this.priceAllList.slice(startPageNum,endPageNum)
     },
     async updateDetailsOrderPrice() {
+      if (Object.values(this.steelMap).length == 0) {
+        this.$message.error('请点击需要执行更改操作的行！')
+        return
+      }
       //计算分页尺寸
       let startPageNum=(this.currentPage-1)*this.currentPageSize
       let endPageNum=(this.currentPage)*this.currentPageSize
@@ -2996,7 +3000,7 @@ export default {
         consigneeLoginName = getCookie('loginName')
         obj.consigneeLoginName = consigneeLoginName
       }
-      console.log("数据获取")
+      console.log("数据展示")
       console.log(this.screen)
       if (this.screen == '客户') {
         consigneeName = this.input
@@ -3005,6 +3009,7 @@ export default {
       } else if (this.screen == '车牌号') {
         capacityNo = this.input
       } else if (this.screen == '分录ID') {
+        console.log("进入了分录")
         easPrimaryId = this.input
       } else {
         remark = this.input
@@ -3183,6 +3188,7 @@ export default {
       let capacityNo = null
       let remark = null
       let saler = null
+      let easPrimaryId = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
@@ -3205,17 +3211,17 @@ export default {
         carrierName = this.input
       } else if (this.screen == '车牌号') {
         capacityNo = this.input
+      } else if (this.screen == '分录ID') {
+        easPrimaryId = this.input
       } else {
         remark = this.input
       }
       if (this.screen1 == '下单客户') {
         consigneeName = this.input1
-      } else if (this.screen == '承运商') {
+      } else if (this.screen1 == '承运商') {
         carrierName = this.input1
-      } else if (this.screen == '车牌号') {
+      } else if (this.screen1 == '车牌号') {
         capacityNo = this.input1
-      } else {
-        remark = this.input1
       }
       if (getCookie('orgCode') == 'chengyunshang') {
         carrierSsoId = getCookie('userId')
@@ -3242,7 +3248,9 @@ export default {
             '&carrierName=' +
             carrierName +
             '&capacityNo=' +
-            capacityNo,
+            capacityNo+
+            '&easPrimaryId=' +
+            easPrimaryId,
           this.filterMap
         )
         .then(res => {
@@ -3279,7 +3287,9 @@ export default {
             '&carrierName=' +
             carrierName +
             '&capacityNo=' +
-            capacityNo,
+            capacityNo
+            +'&easPrimaryId=' +
+            easPrimaryId,
           this.filterMap
         )
         .then(res => {