提交代码

build/utils.js

@@ -15,16 +15,11 @@ 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 = ['all']
 //let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
-// let devModules = ['all']
->>>>>>> ecb211626d4aa9a51230114ced8866039cba10e1
+let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

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

@@ -168,11 +168,10 @@
               >
               </el-table-column>
               <el-table-column
-                prop="orderMakingTime"
+                prop="saleMakeDate"
                 label="制单时间"
                 width="110px"
                 align="center"
-                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
@@ -386,11 +385,10 @@
               >
               </el-table-column>
               <el-table-column
-                prop="orderMakingTime"
+                prop="saleMakeDate"
                 label="制单时间"
                 width="110px"
                 align="center"
-                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
@@ -1163,6 +1161,8 @@ export default {
     //只修改单价
     makeSure() {
       //若没有单价Id
+      console.log("获取数据")
+      console.log(this.userId)
       console.log(this.makeSurePriceOrderList)
       if (this.makeSurePriceOrderList.length == 0) {
         this.$message({
@@ -1183,6 +1183,7 @@ export default {
       })
       let mapValue = {}
       mapValue.mapList = mapList
+      mapValue.userId=this.userId
       // //是否确定修改详单地址!
       // this.$confirm('确定修改', '提示', {
       //   confirmButtonText: '仅修改单价',
@@ -1198,7 +1199,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()
@@ -1211,6 +1212,8 @@ export default {
     },
     //修改单价和收货地址
     makeSureAll(){
+      console.log("获取数据")
+      console.log(this.userId)
       if (this.makeSurePriceOrderList.length == 0) {
         this.$message({
           type: 'success',
@@ -1231,11 +1234,14 @@ export default {
       let mapValue = {}
       mapValue.mapList = mapList
       mapValue.updatePlace = 1
+      mapValue.userId=this.userId
+      console.log("要的数据")
+      console.log(mapValue)
             this.axios
               .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()
@@ -2893,7 +2899,6 @@ export default {
           loading.close()
         })
         .catch(() => {
-          loading.close()
         })
 
       this.axios
@@ -2932,8 +2937,9 @@ export default {
           loading.close()
         })
         .catch(() => {
-          loading.close()
         })
+        loading.close();
+
     }
   }
 }