修改

build/utils.js

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

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -679,7 +679,9 @@ export default {
       gatePostId: null,
       orderStatus: null,
       loadDetail: {},
-      jsonStringValue: ''
+      jsonStringValue: '',
+      transferMap: {},
+      transferList: []
     }
   },
   created() {
@@ -690,16 +692,27 @@ export default {
     this.information()
   },
   methods: {
-    transfer() {
-      console.log(jsonStrToMap(this.jsonStringValue), 'map')
-      const map = jsonStrToMap(this.jsonStringValue)
-      this.capacityName = map.get('carNo')
-      //判断是不是钢材销售,如果是钢材销售那就通过车牌号去查信息,如果不是钢材销售就拿运输订单号
-      if (map.get('flag') == 'GCXS') {
-        this.capacityName = map.get('carNo')
-        this.querySearchCapacity(this.capacityName)
-      }
-    },
+    //  transfer() {
+    //   console.log(jsonStrToMap(this.jsonStringValue), 'map')
+    //   const map = jsonStrToMap(this.jsonStringValue)
+    //   const obj = Array.from(map).reduce((obj, [key, value]) => {
+    //     Object.assign(obj, { [key]: value })
+    //   }, {})
+    //   this.transferMap = obj
+    //   console.log(this.transferMap, 'this.transferMap')
+    //   this.capacityName = map.get('carNo')
+    //   //判断是不是钢材销售,如果是钢材销售那就通过车牌号去查信息,如果不是钢材销售就拿运输订单号
+    //   if (map.get('flag') == 'GCXS') {
+    //     this.capacityName = map.get('carNo')
+    //      this.axios
+    //       .get('/api/v1/uc/getCapacityNumber?index=' + this.capacityName)
+    //       .then(res => {
+    //         this.transferList = res.data.data
+    //       })
+    //     console.log(this.transferList)
+    //     this.handleSelectCapacity(this.transferList[0])
+    //   }
+    // },
     selectLoadingIdRemark() {
       if (
         this.loadDetail.orderNumber &&
@@ -953,6 +966,7 @@ export default {
         .then(res => {
           if (res.data.code == '200') {
             var restaurantsCarrier = res.data.data
+            this.transferList = res.data.data
             console.log(restaurantsCarrier, 'restaurantsCarrier')
             var results = queryString
               ? restaurantsCarrier.filter(this.createFilterCarrier(queryString))
@@ -984,6 +998,7 @@ export default {
     },
     onClickConfirm() {
       this.poundNo = 'jlbl' + toDateNo(new Date())
+      console.log(typeof this.transferMap.orderNumber)
       if (this.switchValue) {
         if (
           this.orderNumber == null ||
@@ -1055,6 +1070,7 @@ export default {
       } else {
         arr.push(mapFirst)
       }
+      console.log(arr, 'arr')
       this.axios.post('/api/v1/uc/recordingWeightResult', arr).then(res => {
         this.$message.success('补录计量实绩成功')
         this.$router.go(0)

src/views/index/components/printScan1.vue

@@ -143,6 +143,7 @@ export default {
       }
     },*/
     async querynumber() {
+      console.log(this.orderNumber)
       console.log(this.orderNumber)
       let orderNumber = this.orderNumber
       let i = 0

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

@@ -210,6 +210,10 @@
           align="center"
           width="180px"
         >
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.stackName" placeholder="货位">
+            </el-input>
+          </template>
         </el-table-column>
         <el-table-column
           prop="weightNo"
@@ -485,6 +489,7 @@ export default {
       })
       this.$refs.tableRef.data.forEach(row => {
         row.personnelSsoId = getCookie('userId')
+        row.remark = row.stackName || ''
         if (
           (typeof row.EnStation == 'object' ||
             typeof row.EnStation == 'string') &&
@@ -579,6 +584,7 @@ export default {
       ) {
         row.OutStation = sjTime(new Date(row.OutStation))
       }
+      row.remark = row.stackName || ''
       console.log(typeof row.EnStation)
       console.log(typeof row.OutStation)
       this.axios

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

@@ -101,24 +101,42 @@
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
       >
-        <el-table-column type="selection" width="40"> </el-table-column>
+        <el-table-column type="selection" width="30" align="center">
+        </el-table-column>
         <el-table-column
           prop="index"
-          width="40"
+          width="30"
           label="序号"
           align="center"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
-        <el-table-column prop="netWeight" label="净重" align="center">
+        <el-table-column
+          prop="netWeight"
+          label="净重"
+          align="center"
+          width="50"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="tareWeight"
+          label="皮重"
+          align="center"
+          width="50"
+        >
         </el-table-column>
-        <el-table-column prop="inwardSteelType" label="类型" align="center">
+        <el-table-column
+          prop="inwardSteelType"
+          label="类型"
+          align="center"
+          width="50"
+        >
         </el-table-column>
         <el-table-column
           prop="consigneeName"
           label="收货单位"
-          width="200px"
+          width="196px"
           align="center"
         >
         </el-table-column>
@@ -127,7 +145,7 @@
           column-key="sendStation"
           label="发站"
           align="center"
-          width="100px"
+          width="70px"
           :filters="[
             { text: '专用线', value: '专用线' },
             { text: '达州站', value: '达州站' }
@@ -165,23 +183,28 @@
           prop="toTheStation"
           label="到站"
           align="center"
-          width="100px"
+          width="108px"
         >
         </el-table-column>
         <el-table-column
           prop="materialName"
           label="物资名称"
           align="center"
-          width="100px"
+          width="125px"
         >
         </el-table-column>
-        <el-table-column prop="materialSpe" label="物资规格" align="center">
+        <el-table-column
+          prop="materialSpe"
+          label="物资规格"
+          align="center"
+          width="100px"
+        >
         </el-table-column>
         <el-table-column
           prop="materialNum"
-          label="物资件数"
+          label="件数"
           align="center"
-          width="50px"
+          width="40px"
         >
           <!-- <template slot-scope="scope">
             <button
@@ -1429,7 +1452,7 @@ export default {
         materialName = this.input1
         obj.materialName = materialName
       } else {
-        remark = this.input
+        remark = this.input1
       }
       this.axios
         .post(

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

@@ -260,7 +260,7 @@ export default {
           }
         ]
       },
-      startTime: new Date(new Date().getTime() - 86400000),
+      startTime: new Date(),
       // endTime: new Date(),
       titleTXT: null,
       tableData: [],

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

@@ -167,6 +167,13 @@
               width="100px"
             >
             </el-table-column>
+            <el-table-column
+              align="center"
+              prop="trainWeight"
+              label="车皮"
+              width="100px"
+            >
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -199,7 +206,7 @@ export default {
     endTime.setHours(8)
     endTime.setMinutes(0)
     endTime.setSeconds(0)
-    let startTime = new Date(endTime.getTime() - 1000 * 60 * 60 * 24)
+    let startTime = new Date(endTime.getTime())
     this.map.startTime = startTime
     this.map.endTime = endTime
   },
@@ -211,14 +218,14 @@ export default {
     search() {
       //时间校验
       if (this.map.startTime && this.map.endTime) {
-        if (this.map.startTime >= this.map.endTime) {
-          this.$message({
-            message: '结束日期必须大于起始日期!',
-            type: 'warning',
-            duration: 2000
-          })
-          return
-        }
+        // if (this.map.startTime >= this.map.endTime) {
+        //   this.$message({
+        //     message: '结束日期必须大于起始日期!',
+        //     type: 'warning',
+        //     duration: 2000
+        //   })
+        //   return
+        // }
         this.map.startTime = sjTime(this.map.startTime)
         this.map.endTime = sjTime(this.map.endTime)
       } else {
@@ -249,6 +256,7 @@ export default {
             enFactoryNum: 0,
             totalNet: 0,
             materialThoWeight: 0,
+            trainWeight: 0,
             target: '合计'
           }
           res.data.data.forEach(item => {
@@ -270,6 +278,7 @@ export default {
               (countRow.materialThoWeight * 1000 +
                 item.materialThoWeight * 1000) /
               1000
+            countRow.trainWeight += item.trainWeight
           })
           if (countRow.planNum) {
             countRow.percent =