提交代码

build/utils.js

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

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

@@ -246,6 +246,43 @@
                 :filters="filteraddressPlace"
               >
               </el-table-column>
+              <el-table-column
+                prop="actualAddress"
+                label="实际收货地址"
+                width="250px"
+                sortable
+                column-key="addressPlace"
+                :filters="filteraddressPlace"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="priceValue"
+                label="系统建议运价"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="detailsAmount"
+                label="系统建议运费"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futurePriceValue"
+                label="修改后的运价"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futureDetailsAmount"
+                label="修改后的运费"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="netWeight"
+                label="净重"
+                show-overflow-tooltip
+              >
+              </el-table-column>
               <el-table-column
                 prop="saleRemark"
                 column-key="saleRemark"
@@ -289,12 +326,6 @@
                 show-overflow-tooltip
               >
               </el-table-column>
-              <el-table-column
-                prop="netWeight"
-                label="净重"
-                show-overflow-tooltip
-              >
-              </el-table-column>
               <el-table-column
                 prop="arrivalAddress"
                 label="抵达地址"
@@ -321,28 +352,6 @@
                 width="150px"
               >
               </el-table-column>
-              <el-table-column
-                prop="priceValue"
-                label="系统建议运价"
-                width="100px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="detailsAmount"
-                label="系统建议运费"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="futurePriceValue"
-                label="修改后的运价"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="futureDetailsAmount"
-                label="修改后的运费"
-                width="100px"
-              >
-              </el-table-column>
               <el-table-column
                 prop="orderNo"
                 label="运输订单号"
@@ -493,6 +502,43 @@
                 :filters="filteraddressPlace"
               >
               </el-table-column>
+              <el-table-column
+                prop="actualAddress"
+                label="实际收货地址"
+                width="250px"
+                sortable
+                column-key="addressPlace"
+                :filters="filteraddressPlace"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="priceValue"
+                label="系统建议运价"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="detailsAmount"
+                label="系统建议运费"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futurePriceValue"
+                label="修改后的运价"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="futureDetailsAmount"
+                label="修改后的运费"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="netWeight"
+                label="净重"
+                show-overflow-tooltip
+              >
+              </el-table-column>
               <el-table-column
                 prop="saleRemark"
                 column-key="saleRemark"
@@ -536,13 +582,6 @@
                 show-overflow-tooltip
               >
               </el-table-column>
-              <el-table-column
-                prop="netWeight"
-                label="净重"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-
               <el-table-column
                 prop="arrivalAddress"
                 label="抵达地址"
@@ -569,28 +608,6 @@
                 width="150px"
               >
               </el-table-column>
-              <el-table-column
-                prop="priceValue"
-                label="系统建议运价"
-                width="100px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="detailsAmount"
-                label="系统建议运费"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="futurePriceValue"
-                label="修改后的运价"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="futureDetailsAmount"
-                label="修改后的运费"
-                width="100px"
-              >
-              </el-table-column>
               <el-table-column
                 prop="orderNo"
                 label="运输订单号"
@@ -954,7 +971,7 @@ export default {
       makeSurePriceOrderList: [],
       makeSurePriceId: null,
       makeSurePlaceId: null,
-
+      detailsAmount: null,
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -1148,6 +1165,7 @@ export default {
       this.steelMap.priceId = val.priceid
       this.makeSurePriceId = val.priceid
       this.makeSurePlaceId = val.placeId
+      this.detailsAmount=val.detailsAmount
     },
     makeSure() {
       //若没有单价Id
@@ -1174,7 +1192,7 @@ export default {
         map.orderId = e
         map.priceId = this.makeSurePriceId
         map.placeId = this.makeSurePlaceId
-        map.detailsAmount = this.detailsAmount
+        map.detailsAmount=this.detailsAmount
         mapList.push(map)
       })
       let mapValue = {}
@@ -1837,8 +1855,9 @@ export default {
       var title = this.tableTitle
       let tHeader = []
       let filterVal = []
-      console.log(this.$refs.tableRef)
       if(this.activeName==='first'){
+        console.log("进入了1")
+        console.log(this.$refs.tableRef)
         this.$refs.tableRef.$children.forEach(item => {
         if (item.label != undefined && item.prop != undefined) {
           if (tHeader.indexOf(item.label) === -1) {