提交代码

build/utils.js

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

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

@@ -89,9 +89,8 @@
             ><i class="el-icon-edit"></i>更改</el-button
           > -->
           <el-button
-            type="success"
+            type="primary"
             @click="updateDetailsOrderPrice"
-            v-if="!notRoutList.includes('capacityNo')"
           >
             <i class="el-icon-edit"></i>修改计费详单
           </el-button>
@@ -107,6 +106,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="makeSurePrice"
+          v-if="!notRoutList.includes('capacityNo')"
             ><i class="el-icon-circle-check"></i>确认执行价</el-button
           >
         </el-form-item>
@@ -165,6 +165,13 @@
                 label="订单日期"
                 width="110px"
                 align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="orderMakingTime"
+                label="制单时间"
+                width="110px"
+                align="center"
                 show-overflow-tooltip
               >
               </el-table-column>
@@ -179,15 +186,6 @@
                 show-overflow-tooltip
               >
               </el-table-column>
-              <el-table-column
-                prop="areaName"
-                label="销售片区"
-                width="150px"
-                align="center"
-                column-key="saleAreaList"
-                :filters="filterSaleAreaList"
-              >
-              </el-table-column>
               <el-table-column
                 prop="carrierName"
                 label="承运商"
@@ -210,33 +208,6 @@
                 :filters="filterCapacityList"
               >
               </el-table-column>
-              <el-table-column
-                prop="materialName"
-                column-key="materialNameList"
-                label="物资名称"
-                align="center"
-                width="150px"
-                sortable
-                :filters="filtermaterialNameList"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialSpe"
-                label="物资规格"
-                column-key="materialSpe"
-                align="center"
-                sortable
-                :filters="filtermaterialSpe"
-                width="120px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialNum"
-                label="物资件数"
-                align="center"
-                width="50px"
-              >
-              </el-table-column>
               <el-table-column
                 prop="addressPlace"
                 label="收货地址"
@@ -273,101 +244,101 @@
               >
               </el-table-column>
               <el-table-column
-                prop="saleRemark"
-                column-key="saleRemark"
-                label="摘要"
-                width="150px"
-                align="center"
-                :filters="filterSaleRemark"
+                prop="materialWeight"
+                label="理重"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="capacityTel"
-                label="司机电话"
-                width="120px"
+                prop="materialName"
+                column-key="materialNameList"
+                label="物资名称"
                 align="center"
+                width="150px"
+                sortable
+                :filters="filtermaterialNameList"
               >
               </el-table-column>
               <el-table-column
-                prop="tareWeightTime"
-                label="皮重时间"
-                width="130px"
-                show-overflow-tooltip
+                prop="materialSpe"
+                label="物资规格"
+                column-key="materialSpe"
+                align="center"
+                sortable
+                :filters="filtermaterialSpe"
+                width="120px"
               >
               </el-table-column>
               <el-table-column
-                prop="tareWeight"
-                label="皮重"
-                show-overflow-tooltip
+                prop="materialPlanNumber"
+                label="计划件数"
+                align="center"
+                width="50px"
               >
               </el-table-column>
               <el-table-column
-                prop="grossWeightTime"
-                label="毛重时间"
-                width="130px"
-                show-overflow-tooltip
+                prop="materialNum"
+                label="装车件数"
+                align="center"
+                width="50px"
               >
               </el-table-column>
               <el-table-column
-                prop="grossWeight"
-                label="毛重"
+                prop="saleRemark"
+                column-key="saleRemark"
+                label="摘要"
+                width="150px"
+                align="center"
+                :filters="filterSaleRemark"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="arrivalAddress"
-                label="抵达地址"
-                width="280px"
+                prop="closeEntryId"
+                label="金蝶分录ID"
+                width="120px"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="arrivalTime"
-                label="抵达时间"
-                width="150px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="receiptAddress"
-                label="签收地址"
-                width="280px"
+                prop="actualCity"
+                label="卸货城市"
+                width="120px"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="receiptTime"
-                label="签收时间"
+                prop="areaName"
+                label="分区"
                 width="150px"
+                align="center"
+                column-key="saleAreaList"
+                :filters="filterSaleAreaList"
               >
               </el-table-column>
-
               <el-table-column
-                prop="orderNo"
-                label="运输订单号"
-                width="180px"
-                align="center"
+                prop="unloadType"
+                label="卸货类别"
+                width="60px"
               >
               </el-table-column>
-              <el-table-column prop="saler" label="业务员" align="center">
-              </el-table-column>
               <el-table-column
-                prop="shipperName"
-                label="发货单位"
-                width="170px"
-                align="center"
+                prop="paymentCustomer"
+                label="付款单位"
+                width="120px"
+                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="saleOrderNo"
-                label="销售订单号"
-                width="200px"
-                align="center"
+                prop="consingneeSettlementMethod"
+                label="结算方式"
+                width="120px"
+                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="closeEntryId"
-                label="金蝶分录ID"
+                prop="saleOrderReceiveCustomer"
+                label="收款单位"
                 width="120px"
                 show-overflow-tooltip
               >
@@ -396,7 +367,7 @@
               individual-panel
               @resetTable="reset"
             >
-              <el-table-column
+            <el-table-column
                 width="50"
                 label="序号"
                 align="center"
@@ -414,6 +385,14 @@
                 show-overflow-tooltip
               >
               </el-table-column>
+              <el-table-column
+                prop="orderMakingTime"
+                label="制单时间"
+                width="110px"
+                align="center"
+                show-overflow-tooltip
+              >
+              </el-table-column>
               <el-table-column
                 prop="consigneeName"
                 label="客户"
@@ -425,15 +404,6 @@
                 show-overflow-tooltip
               >
               </el-table-column>
-              <el-table-column
-                prop="areaName"
-                label="销售片区"
-                width="150px"
-                align="center"
-                column-key="saleAreaList"
-                :filters="filterSaleAreaList"
-              >
-              </el-table-column>
               <el-table-column
                 prop="carrierName"
                 label="承运商"
@@ -457,38 +427,20 @@
               >
               </el-table-column>
               <el-table-column
-                prop="materialName"
-                column-key="materialNameList"
-                label="物资名称"
-                align="center"
-                width="150px"
-                sortable
-                :filters="filtermaterialNameList"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialSpe"
-                label="物资规格"
-                column-key="materialSpe"
-                align="center"
+                prop="addressPlace"
+                label="收货地址"
+                width="250px"
                 sortable
-                :filters="filtermaterialSpe"
-                width="120px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialNum"
-                label="物资件数"
-                align="center"
-                width="50px"
+                column-key="addressPlace"
+                :filters="filteraddressPlace"
               >
               </el-table-column>
               <el-table-column
-                prop="addressPlace"
+                prop="actualAddress"
                 label="实际收货地址"
                 width="250px"
                 sortable
-                column-key="addressPlace"
+                column-key="actualAddress"
                 :filters="filteraddressPlace"
               >
               </el-table-column>
@@ -510,101 +462,101 @@
               >
               </el-table-column>
               <el-table-column
-                prop="saleRemark"
-                column-key="saleRemark"
-                label="摘要"
-                width="150px"
-                align="center"
-                :filters="filterSaleRemark"
+                prop="materialWeight"
+                label="理重"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="capacityTel"
-                label="司机电话"
-                width="120px"
+                prop="materialName"
+                column-key="materialNameList"
+                label="物资名称"
                 align="center"
+                width="150px"
+                sortable
+                :filters="filtermaterialNameList"
               >
               </el-table-column>
               <el-table-column
-                prop="tareWeightTime"
-                label="皮重时间"
-                width="130px"
-                show-overflow-tooltip
+                prop="materialSpe"
+                label="物资规格"
+                column-key="materialSpe"
+                align="center"
+                sortable
+                :filters="filtermaterialSpe"
+                width="120px"
               >
               </el-table-column>
               <el-table-column
-                prop="tareWeight"
-                label="皮重"
-                show-overflow-tooltip
+                prop="materialPlanNumber"
+                label="计划件数"
+                align="center"
+                width="50px"
               >
               </el-table-column>
               <el-table-column
-                prop="grossWeightTime"
-                label="毛重时间"
-                width="130px"
-                show-overflow-tooltip
+                prop="materialNum"
+                label="装车件数"
+                align="center"
+                width="50px"
               >
               </el-table-column>
               <el-table-column
-                prop="grossWeight"
-                label="毛重"
+                prop="saleRemark"
+                column-key="saleRemark"
+                label="摘要"
+                width="150px"
+                align="center"
+                :filters="filterSaleRemark"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="arrivalAddress"
-                label="抵达地址"
-                width="280px"
+                prop="closeEntryId"
+                label="金蝶分录ID"
+                width="120px"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="arrivalTime"
-                label="抵达时间"
-                width="150px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="receiptAddress"
-                label="签收地址"
-                width="280px"
+                prop="actualCity"
+                label="卸货城市"
+                width="120px"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="receiptTime"
-                label="签收时间"
+                prop="areaName"
+                label="分区"
                 width="150px"
+                align="center"
+                column-key="saleAreaList"
+                :filters="filterSaleAreaList"
               >
               </el-table-column>
               <el-table-column
-                prop="orderNo"
-                label="运输订单号"
-                width="180px"
-                align="center"
+                prop="unloadType"
+                label="卸货类别"
+                width="60px"
               >
               </el-table-column>
-
-              <el-table-column prop="saler" label="业务员" align="center">
-              </el-table-column>
               <el-table-column
-                prop="shipperName"
-                label="发货单位"
-                width="170px"
-                align="center"
+                prop="paymentCustomer"
+                label="付款单位"
+                width="120px"
+                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="saleOrderNo"
-                label="销售订单号"
-                width="200px"
-                align="center"
+                prop="consingneeSettlementMethod"
+                label="结算方式"
+                width="120px"
+                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
-                prop="closeEntryId"
-                label="金蝶分录ID"
+                prop="saleOrderReceiveCustomer"
+                label="收款单位"
                 width="120px"
                 show-overflow-tooltip
               >
@@ -725,6 +677,7 @@ import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
 import { downloadFile } from '@/utils/base64ToBlob.js'
+import { get } from 'http'
 export default {
   components: {
     PathView,
@@ -980,6 +933,8 @@ export default {
       makeSurePlaceId: null,
       detailsAmount: null,
       mapValuenew:{},
+      //用于赋予承运商的权限
+      userId:'',
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -997,6 +952,7 @@ export default {
     }
   },
   created() {
+    this.userId=getCookie('userId')
     if (this.orgCodeList.includes(getCookie('orgCode'))) {
       this.isShowOperate = true
     }
@@ -1147,19 +1103,46 @@ export default {
     },
     selectAddresClick() {
       if (this.addresText) {
-        this.Address.requestUrl =
-          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=' +
+        if(!this.notRoutList.includes('capacityNo')){
+          this.Address.requestUrl =
+          '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
           this.addresText
+        }else{
+          this.Address.requestUrl =
+          '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
+          this.addresText+
+          '&userId='+this.userId
+        }
       } else {
-        this.Address.requestUrl =
-          '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
+        if(!this.notRoutList.includes('capacityNo')){
+          this.Address.requestUrl =
+          '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' + new Date()
+        }else{
+          this.Address.requestUrl =
+          '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' + new Date()
+          +'&userId='+this.userId
+        }
       }
     },
     updateDetailsOrderPrice() {
-      this.originalAddress = this.steelMap.actualAddress
+      if(this.steelMap.actualAddress==null){
+        this.originalAddress =this.steelMap.addressPlace
+      }else{
+        this.originalAddress =this.steelMap.actualAddress
+      }
       this.originalPriceValue = this.steelMap.priceValue
-      this.Address.requestUrl =
-        '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
+      if(!this.notRoutList.includes('capacityNo')){
+        console.log("进入了1")
+        console.log(this.userId)
+        this.Address.requestUrl =
+        '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' + new Date()
+      }else{
+        console.log("进入了2")
+        console.log(this.userId)
+        this.Address.requestUrl =
+        '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' + new Date()
+        +'&userId='+this.userId
+      }
       this.dialogFormVisible = true
     },
     currentRadioChange2(val) {
@@ -2698,22 +2681,22 @@ export default {
         )
         .then(res => {
           this.tableData = res.data.data
+          //遍历保留两位小数
+          this.tableData.forEach(e=>{
+              try {
+                  if(e.priceValue){
+                    e.priceValue=e.priceValue.toFixed(2);
+                  }
+                  if(e.detailsAmount){
+                    e.detailsAmount=e.detailsAmount.toFixed(2);
+                  }
+              } catch (error) {
+                  
+              }
+          })
           this.totalHeight += this.itemHeight
           this.visibleList = res.data.data
           console.log(this.visibleList);
-          try {
-            //遍历保留两位小数
-            this.visibleList.forEach(e=>{
-                if(e.priceValue){
-                  e.priceValue=e.priceValue.toFixed(2);
-                }
-                if(e.detailsAmount){
-                  e.detailsAmount=e.detailsAmount.toFixed(2);
-                }
-            }) 
-          } catch (error) {
-              
-          }
           console.log(this.visibleList, 'this.visibleList')
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
@@ -2744,22 +2727,22 @@ export default {
           obj
         )
         .then(res => {
-          this.tableData = res.data.data
+          this.tableData1 = res.data.data
+          //遍历保留两位小数
+          this.tableData1.forEach(e=>{
+              try {
+                  if(e.priceValue){
+                    e.priceValue=e.priceValue.toFixed(2);
+                  }
+                  if(e.detailsAmount){
+                    e.detailsAmount=e.detailsAmount.toFixed(2);
+                  }
+              } catch (error) {
+                  
+              }
+          })
           this.totalHeight += this.itemHeight
           this.visibleList1 = res.data.data
-          try {
-            //遍历保留两位小数
-            this.visibleList1.forEach(e=>{
-                if(e.priceValue){
-                  e.priceValue=e.priceValue.toFixed(2);
-                }
-                if(e.detailsAmount){
-                  e.detailsAmount=e.detailsAmount.toFixed(2);
-                }
-            }) 
-          } catch (error) {
-              
-          }
           console.log(this.visibleList1, 'this.visibleList1')
           this.getSpanArr1(this.visibleList1)
           this.getTotalNum(this.tableData)
@@ -2851,27 +2834,25 @@ export default {
         )
         .then(res => {
           this.tableData = res.data.data
+          //遍历保留两位小数
+          this.tableData.forEach(e=>{
+              try {
+                  if(e.priceValue){
+                    e.priceValue=e.priceValue.toFixed(2);
+                  }
+                  if(e.detailsAmount){
+                    e.detailsAmount=e.detailsAmount.toFixed(2);
+                  }
+              } catch (error) {
+                  
+              }
+          })
           this.totalHeight += this.itemHeight
           this.visibleList = []
           this.visibleList = this.tableData.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
-          console.log("获取到的数据")
-          console.log(this.visibleList)
-          try {
-            //遍历保留两位小数
-            this.visibleList.forEach(e=>{
-                if(e.priceValue){
-                  e.priceValue=e.priceValue.toFixed(2);
-                }
-                if(e.detailsAmount){
-                  e.detailsAmount=e.detailsAmount.toFixed(2);
-                }
-            }) 
-          } catch (error) {
-              
-          }
           console.log(this.visibleList)
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
@@ -2905,25 +2886,25 @@ export default {
         )
         .then(res => {
           this.tableData1 = res.data.data
+          //遍历保留两位小数
+          this.tableData1.forEach(e=>{
+              try {
+                  if(e.priceValue){
+                    e.priceValue=e.priceValue.toFixed(2);
+                  }
+                  if(e.detailsAmount){
+                    e.detailsAmount=e.detailsAmount.toFixed(2);
+                  }
+              } catch (error) {
+                  
+              }
+          })
           this.totalHeight += this.itemHeight
           this.visibleList1 = []
           this.visibleList1 = this.tableData1.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
-          try {
-            //遍历保留两位小数
-            this.visibleList1.forEach(e=>{
-                if(e.priceValue){
-                  e.priceValue=e.priceValue.toFixed(2);
-                }
-                if(e.detailsAmount){
-                  e.detailsAmount=e.detailsAmount.toFixed(2);
-                }
-            }) 
-          } catch (error) {
-              
-          }
           console.log(this.visibleList1)
           this.getSpanArr1(this.visibleList1)
           this.getTotalNum(this.tableData1)