修改

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 // let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'appoint']
+// let devModules = ['index', 'statisticalReport', 'sale']
 let devModules = ['all']
 // let devModules = ['index', 'ADMINISTRATORS']
 

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

@@ -256,7 +256,6 @@
                 label="车号"
                 align="center"
                 width="90px"
-                sortable
                 show-overflow-tooltip
                 :filters="filterCapacityList"
               >
@@ -268,7 +267,6 @@
                 align="center"
                 column-key="consigneeName"
                 :filters="filterConsigneeList"
-                sortable
                 show-overflow-tooltip
               >
               </el-table-column>
@@ -278,7 +276,6 @@
                 label="物料名称"
                 align="center"
                 width="150px"
-                sortable
                 :filters="filtermaterialNameList"
               >
               </el-table-column>
@@ -287,7 +284,6 @@
                 label="规格型号"
                 column-key="materialSpe"
                 align="center"
-                sortable
                 :filters="filtermaterialSpe"
                 width="120px"
               >
@@ -335,7 +331,6 @@
                 align="center"
                 width="80px"
                 column-key="carrierList"
-                sortable
                 show-overflow-tooltip
                 :filters="filterCarrierList"
               >
@@ -344,7 +339,6 @@
                 prop="addressPlace"
                 label="下货地点"
                 width="300px"
-                sortable
                 column-key="actualAddress"
               >
               </el-table-column>
@@ -494,7 +488,6 @@
                 align="center"
                 width="90px"
                 :filters="filterCapacityList"
-                sortable
                 show-overflow-tooltip
               >
               </el-table-column>
@@ -505,7 +498,6 @@
                 align="center"
                 column-key="consigneeName"
                 :filters="filterConsigneeList"
-                sortable
                 show-overflow-tooltip
               >
               </el-table-column>
@@ -515,7 +507,6 @@
                 label="物料名称"
                 align="center"
                 width="150px"
-                sortable
                 :filters="filtermaterialNameList"
               >
               </el-table-column>
@@ -524,7 +515,6 @@
                 label="规格型号"
                 column-key="materialSpe"
                 align="center"
-                sortable
                 :filters="filtermaterialSpe"
                 width="120px"
               >
@@ -572,7 +562,6 @@
                 align="center"
                 width="80px"
                 column-key="carrierList"
-                sortable
                 show-overflow-tooltip
                 :filters="filterCarrierList"
               >
@@ -581,7 +570,6 @@
                 prop="addressPlace"
                 label="下货地点"
                 width="300px"
-                sortable
                 column-key="actualAddress"
                 show-overflow-tooltip
               >
@@ -1037,7 +1025,6 @@
           label="车号"
           align="center"
           width="90px"
-          sortable
           show-overflow-tooltip
           :filters="filterCapacityList"
         >
@@ -1049,7 +1036,6 @@
           align="center"
           column-key="consigneeName"
           :filters="filterConsigneeList"
-          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -1059,7 +1045,6 @@
           label="物料名称"
           align="center"
           width="150px"
-          sortable
           :filters="filtermaterialNameList"
         >
         </el-table-column>
@@ -1068,7 +1053,6 @@
           label="规格型号"
           column-key="materialSpe"
           align="center"
-          sortable
           :filters="filtermaterialSpe"
           width="120px"
         >
@@ -1112,7 +1096,6 @@
           align="center"
           width="80px"
           column-key="carrierList"
-          sortable
           show-overflow-tooltip
           :filters="filterCarrierList"
         >
@@ -1121,7 +1104,6 @@
           prop="addressPlace"
           label="下货地点"
           width="300px"
-          sortable
           column-key="actualAddress"
         >
         </el-table-column>
@@ -2146,7 +2128,11 @@ export default {
     },
     updateTruckDetail() {
       this.isLoading = true
-      if (!this.detailAmount || !this.detailRemark) {
+      if (
+        this.detailAmount == null ||
+        this.detailAmount == '' ||
+        !this.detailRemark
+      ) {
         this.$message.warning('请填写所有信息！')
         this.isLoading = false
       } else {

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

@@ -256,7 +256,6 @@ export default {
       //请求所有汽车衡和门岗
       let that = this
       that.axios.get('/api/v1/otms/mapvertexs/findSelections').then(res => {
-        console.log(res.data.data)
         if (res.data.data) {
           res.data.data.forEach(vertex => {
             that.initPoint(

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

@@ -107,6 +107,11 @@
             <i class="el-icon-truck"></i>轨迹
           </el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="buLuCaseNo">
+            <i class="el-icon-truck"></i>补录箱号
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
     <div class="table">
@@ -197,6 +202,21 @@
         </div>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="caseNoVisiable">
+      <div class="admin2">
+        <div class="poundNo from">
+          <span class="text">运输订单号:</span>
+          <el-input v-model="orderNumber" disabled></el-input>
+        </div>
+        <div class="poundNo from">
+          <span class="text">箱号:</span>
+          <el-input v-model="caseNumber"></el-input>
+        </div>
+        <div class="button_box">
+          <el-button type="primary" @click="buLuCaseNoZx()">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
     <el-dialog
       title="抵达签收"
       :visible.sync="arrivalReceiving"
@@ -306,6 +326,8 @@ export default {
   },
   data() {
     return {
+      caseNoVisiable: false,
+      caseNumber: null,
       condition1: null,
       condition2: null,
       input1: null,
@@ -405,6 +427,57 @@ export default {
     console.log(this.orgCode)
   },
   methods: {
+    buLuCaseNo() {
+      if (!this.selection) {
+        this.$message.warning('请选择需要补录箱号的实绩')
+        return
+      }
+      console.log(this.selection, 'this.selection')
+      this.orderNumber = this.selection.orderNumber
+      this.caseNumber = this.selection.caseNumber
+      this.caseNoVisiable = true
+    },
+    buLuCaseNoZx() {
+      console.log(this.selection, 'selection')
+      if (this.caseNumber) {
+        this.axios
+          .post('/api/v1/tms/updateLoadingIdRemark', {
+            loadResultId: this.selection.resultId,
+            caseNumber: this.caseNumber
+          })
+          .then(res => {
+            if (getCookie('orgCode') == 'chengyunshang') {
+              this.option.requestUrl =
+                '/api/v1/tms/getAllSaleReport?apiId=526&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=' +
+                getCookie('userId') +
+                '&i=' +
+                new Date()
+            } else {
+              this.option.requestUrl =
+                '/api/v1/tms/getAllSaleReport?apiId=526&startTime=null&endTime=null&orderType=2&shipperId=2&carrierSsoId=' +
+                null +
+                '&i=' +
+                new Date()
+            }
+            this.$message({
+              type: 'success',
+              message: '补录成功',
+              offsite: 250,
+              duration: 2000
+            })
+            this.caseNoVisiable = false
+          })
+          .catch(e => {
+            this.$message({
+              type: 'error',
+              message: '补录失败',
+              offsite: 250,
+              duration: 2000
+            })
+            this.caseNoVisiable = false
+          })
+      }
+    },
     //选中
     selectOne(selection) {
       console.log('selection', selection)