修改

build/utils.js

@@ -20,7 +20,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // let devModules = ['index', 'inward']
 let devModules = ['all']
 
-// let devModules = ['index', 'statisticalReport']
+// let devModules = ['index', 'statisticalReport', 'inward']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -650,17 +650,32 @@ export default {
           .post('/api/v1/ams/updateCapacityNumberInFactory', row)
           .then(res => {
             if (res.data.code == '200') {
-              this.$message.success('变更车牌号成功!')
+              this.$message({
+                message: '变更成功!',
+                duration: 2000,
+                type: 'success',
+                offset: '250'
+              })
               this.getSteelReport()
               loading.close()
             } else {
-              this.$message.success('变更失败，请联系管理员')
+              this.$message({
+                message: '变更失败，请联系管理员!',
+                duration: 2000,
+                type: 'error',
+                offset: '250'
+              })
               this.getSteelReport()
               loading.close()
             }
           })
           .catch(() => {
-            this.$message.success('变更失败，请联系管理员')
+            this.$message({
+              message: '变更失败，请联系管理员!',
+              duration: 2000,
+              type: 'error',
+              offset: '250'
+            })
             this.getSteelReport()
             loading.close()
           })
@@ -1116,12 +1131,19 @@ export default {
     },
     //获取钢材订单报表
     getSteelReport() {
+      let startTime = null
+      let endTime = null
+
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
+      }
       this.axios
         .post(
           '/api/v1/tms/getInwardSaleSteelOrder?startTime=' +
-            null +
+            startTime +
             '&endTime=' +
-            null +
+            endTime +
             '&i=' +
             new Date()
         )

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

@@ -1095,7 +1095,8 @@
             <el-table-column prop="netWeight" label="净重"> </el-table-column>
             <el-table-column prop="loadTime" label="装货时间" width="130px">
             </el-table-column>
-            <el-table-column prop="detailsAmount" label="运费" width="130px">
+
+            <el-table-column prop="saleRemarkByasm" label="摘要" width="100px">
             </el-table-column>
             <el-table-column
               prop="closeEntryId"
@@ -2174,7 +2175,8 @@ export default {
       columnHiddenData: [],
       consigneeCheckList: [],
       showPopover: false,
-      schemeMap: {}
+      schemeMap: {},
+      statusNumData: []
     }
   },
   created() {
@@ -4854,6 +4856,9 @@ export default {
           this.$message.info('取消输入')
         })
     },
+    getStatusNum(data) {
+      //未派发、取消
+    },
     //查询，输入查询条件
     onclick(obj) {
       this.$store.commit('updateSaleSteelToggleIds', { isClear: 1 })
@@ -4875,6 +4880,8 @@ export default {
       let saler = null
       let easPrimaryId = null
       let consigneeLoginName = null
+      let receiveAddress = null
+      obj.receiveAddress = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
@@ -4898,6 +4905,9 @@ export default {
         capacityNo = this.input
       } else if (this.screen == '分录ID') {
         easPrimaryId = this.input
+      } else if (this.screen == '收货地址') {
+        receiveAddress = this.input
+        obj.receiveAddress = receiveAddress
       } else {
         remark = this.input
       }
@@ -4916,15 +4926,21 @@ export default {
       ) {
         capacityNo = this.input1
       } else if (
-        this.screen == '分录ID' &&
+        this.screen1 == '分录ID' &&
         this.input1 != null &&
         this.input1 != ''
       ) {
         easPrimaryId = this.input1
+      } else if (
+        this.screen1 == '收货地址' &&
+        this.input1 != null &&
+        this.input1 != ''
+      ) {
+        receiveAddress = this.input1
+        obj.receiveAddress = receiveAddress
       } else if (this.input1 != null && this.input1 != '') {
         remark = this.input1
       }
-      console.log(remark)
       this.axios
         .post(
           '/api/v1/tms/getSaleSteelReport?startTime=' +

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

@@ -60,6 +60,7 @@
         <el-table-column
           prop="carrierLine"
           label="承运线路"
+          width="200"
           align="center"
           column-key="carrierLine"
           key="carrierLine"
@@ -79,59 +80,93 @@
           label="销售下达计划(车)"
           align="center"
           column-key="planTruckNumber"
+          width="100"
           key="planTruckNumber"
         >
         </el-table-column>
+        <el-table-column
+          prop="unArragePlanTruckNumber"
+          label="未派发"
+          align="center"
+          column-key="unArragePlanTruckNumber"
+          key="unArragePlanTruckNumber"
+          width="80"
+        >
+        </el-table-column>
         <el-table-column label="安排运力(车)" align="center">
           <el-table-column
             prop="arrageTruckNumber"
-            label="安排"
+            label="总安排"
             align="center"
             column-key="arrageTruckNumber"
             key="arrageTruckNumber"
+            width="80"
           >
           </el-table-column>
           <el-table-column
-            prop="actuallyFinish"
-            label="实际完成"
+            prop="dispatchOrderEd"
+            label="已派单"
             align="center"
-            column-key="actuallyFinish"
-            key="actuallyFinish"
+            column-key="dispatchOrderEd"
+            key="dispatchOrderEd"
+            width="80"
           >
           </el-table-column>
           <el-table-column
-            prop="enFactoryLoading"
-            label="进厂待装"
+            prop="receivedOrder"
+            label="已接单"
             align="center"
-            column-key="enFactoryLoading"
-            key="enFactoryLoading"
+            column-key="receivedOrder"
+            key="receivedOrder"
+            width="80"
           >
           </el-table-column>
           <el-table-column
-            prop="unEnfactory"
-            label="未进厂"
+            prop="queueOrder"
+            label="排队中"
             align="center"
-            column-key="unEnfactory"
-            key="unEnfactory"
+            column-key="queueOrder"
+            key="queueOrder"
+            width="80"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="enFactoryEd"
+            label="已进厂"
+            align="center"
+            column-key="enFactory"
+            key="enFactory"
+            width="80"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="outFactoryEd"
+            label="已出厂"
+            align="center"
+            column-key="outFactoryEd"
+            key="outFactoryEd"
+            width="80"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="finishEd"
+            label="已完成"
+            align="center"
+            column-key="finishEd"
+            key="finishEd"
+            width="80"
           >
           </el-table-column>
         </el-table-column>
-        <el-table-column
-          prop="unArragePlanTruckNumber"
-          label="欠运力"
-          align="center"
-          column-key="unArragePlanTruckNumber"
-          key="unArragePlanTruckNumber"
-        >
-        </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="remark"
           label="备注"
           align="center"
           column-key="remark"
           key="remark"
+          
         >
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <div class="remarkTitle"></div>
       <table class="title">