修改

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

@@ -720,7 +720,7 @@ export default {
       }
     }
     ::-webkit-scrollbar {
-      width: 10px;
+      width: 20px;
       height: 20px;
       background-color: transparent;
     }

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

@@ -75,6 +75,11 @@
             <i class="el-icon-refresh"></i>
           </el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="exportAllReportToExcel"
+            ><i class="el-icon-download"></i>Excel</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="showDialog">多拼派车</el-button>、
           <el-button type="primary" @click="mergeSplit()">
@@ -106,6 +111,10 @@
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
+        <el-table-column prop="netWeight" label="净重" align="center">
+        </el-table-column>
+        <el-table-column prop="inwardSteelType" label="类型" align="center">
+        </el-table-column>
         <el-table-column
           prop="consigneeName"
           label="收货单位"
@@ -233,8 +242,7 @@
           column-key="transInWarehouse"
         >
         </el-table-column>
-        <el-table-column prop="netWeight" label="净重" align="center">
-        </el-table-column>
+
         <el-table-column
           prop="carrierName"
           label="承运商"
@@ -402,7 +410,7 @@ export default {
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle: '销售统计报表',
+      tableTitle: '库存调拨派单',
       capacityList: [],
       carrierList: [],
       // 线路
@@ -772,6 +780,10 @@ export default {
         this.filterMap.materialName = row.materialName
         this.onclick(this.filterMap)
       }
+      if (column.property == 'inwardSteelType') {
+        this.filterMap.inwardSteelType = row.inwardSteelType
+        this.onclick(this.filterMap)
+      }
       if (column.property == 'carrierName') {
         this.$set(row, 'isCarrierShow', 1)
         this.clickIndex = row.group
@@ -892,13 +904,12 @@ export default {
 
     updateCapacity(row) {
       row.isIwardSteel = 4
-      row.saleOrderMaterialId = row.saleOrderId
       row.capacityId = row.newsCapacityId
       if (row.newsCapacityId == null) {
         this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
         return
       }
-      if (!isVehicleNumber(row.capacityNo)) {
+      if (!isVehicleNumber(row.capacityNo) && row.capacityNo != '车皮一个') {
         this.$message.error('请输入正确格式的车牌号!')
         return
       }
@@ -994,11 +1005,21 @@ export default {
           .post('/api/v1/ams/dispatchInwardTruckOrderBySale', map)
           .then(res => {
             if (res.data.code == '200') {
-              this.$message.success('派车成功!')
+              this.$message({
+                message: '派车成功',
+                duration: 2000,
+                offset: '250px',
+                type: 'success'
+              })
               this.getSteelReport()
               loading.close()
             } else {
-              this.$message.error('派车失败,请联系管理员')
+              this.$message({
+                message: res.data.data,
+                duration: 2000,
+                offset: '250px',
+                type: 'error'
+              })
               this.getSteelReport()
               loading.close()
             }
@@ -1010,7 +1031,6 @@ export default {
           })
       }
     },
-
     //多拼派车
     updateMulCapacity() {
       let i = 0
@@ -1020,7 +1040,8 @@ export default {
       }
       this.selection.forEach(item => {
         item.isIwardSteel = 4
-        item.saleOrderMaterialId = item.saleOrderId
+        item.saleOrderId = item.saleOrderId
+        item.saleOrderMaterialId = item.saleOrderMaterialId
         item.capacityNumber = this.capacityNumber
       })
       if (this.selection[0].sendStation == '达州站') {
@@ -1060,13 +1081,23 @@ export default {
         .post('/api/v1/ams/dispatchInwardTruckOrderBySale', map)
         .then(res => {
           if (res.data.code == '200') {
-            this.$message.success('派车成功!')
+            this.$message({
+              message: '派车成功',
+              duration: 2000,
+              offset: '250px',
+              type: 'success'
+            })
             this.getSteelReport()
             loading.close()
             this.capacityId = null
             this.dialogTableVisible = false
           } else {
-            this.$message.error('派车失败,请联系管理员')
+            this.$message({
+              message: res.data.data,
+              duration: 2000,
+              offset: '250px',
+              type: 'error'
+            })
             this.getSteelReport()
             loading.close()
             this.capacityId = null
@@ -1159,9 +1190,6 @@ export default {
     },
     //修改承运商授权
     updateTruckCarrier(row) {
-      if (!row.saleOrderMaterialId) {
-        row.saleOrderMaterialId = row.saleOrderId
-      }
       if (row.newCarrierId == null) {
         this.$message.warning('请注册承运商或者选中弹出层之后再提交!')
         this.getSteelReport()
@@ -1236,9 +1264,12 @@ export default {
         } else {
           // 判断当前元素与上一个元素是否相同
           if (
-            data[i].orderId === data[i - 1].orderId &&
-            data[i].orderId != null &&
-            data[i - 1].orderId != null
+            (data[i].orderId === data[i - 1].orderId &&
+              data[i].orderId != null &&
+              data[i - 1].orderId != null) ||
+            (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId &&
+              data[i].saleOrderMaterialId != null &&
+              data[i - 1].saleOrderMaterialId != null)
           ) {
             this.spanArr[this.pos] += 1
             data[i].group = data[i - 1].group

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

@@ -219,6 +219,7 @@
               !columnNoRoutList.includes('选择')
           "
         ></el-table-column>
+
         <el-table-column
           width="50"
           label="序号"
@@ -316,6 +317,17 @@
           v-if="!columnNoRoutList.includes('运单状态')"
         >
         </el-table-column>
+        <el-table-column
+          prop="orderStatusActually"
+          column-key="orderStatusActually"
+          key="orderStatusActually"
+          label="订单实际状态"
+          align="center"
+          width="100"
+          :filters="filterorderStatusActually"
+          v-if="!columnNoRoutList.includes('运单状态')"
+        >
+        </el-table-column>
         <!-- <el-table-column
           prop="areaName"
           label="销售片区"
@@ -793,6 +805,19 @@
               <span>客户:</span>
               <span>{{ steelMap.consigneeName }}</span>
             </div>
+            <div
+              class="steelMapClass13"
+              v-if="!notRoutList.includes('closeOrder')"
+            >
+              <span>车辆备注:</span>
+              <span
+                ><el-input
+                  v-model="steelMap.truckRemark"
+                  width="250px"
+                ></el-input
+              ></span>
+              <!-- <span>{{ steelMap.truckRemark }}</span> -->
+            </div>
           </div>
           <div class="steelMapClass2">
             <div class="steelMapClass22">
@@ -1077,6 +1102,7 @@
                   type="primary"
                   @click="scope.row.materialNumber++"
                   style="height:40px"
+                  :disabled="scope.row.saleOrderStatus == 4"
                   v-if="!notRoutList.includes('materialNum')"
                 >
                   +
@@ -1965,6 +1991,7 @@ export default {
         '出厂时间',
         '进厂时间',
         '运单状态',
+        '订单实际状态',
         '车牌号',
         '承运商',
         '客户',
@@ -2058,6 +2085,7 @@ export default {
       filterCarrierList: [],
       filterCapacityList: [],
       filtermaterialNameList: [],
+      filterorderStatusActually: [],
       filterorderStatus: [
         { text: '未派发', value: '未派发' },
         { text: '已派单', value: '已派单' },
@@ -2820,19 +2848,6 @@ export default {
       }
     },
     mergeSplit() {
-      //如果勾选了多条则执行合并操作,如果勾选了一条则执行拆分操作
-      // if (
-      //   this.$refs.tableRef.selection.filter(e => {
-      //     return e.entryGateTime != null
-      //   }).length > 0
-      // ) {
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '该车已进厂不允许操作',
-      //     offset: '250',
-      //     duration: '2300'
-      //   })
-      // }
       if (this.$refs.tableRef.selection.length == 1) {
         this.$confirm(
           `尊敬的用户${getCookie(
@@ -3683,6 +3698,23 @@ export default {
         this.headColumnList.splice(this.headColumnList.indexOf('flStatus'), 1)
         delete this.filterMap.flStatusList
       }
+      if (
+        typeof obj.orderStatusActually != 'undefined' &&
+        obj.orderStatusActually.length > 0
+      ) {
+        this.headColumnList.push('orderStatusActually')
+        this.filterMap.orderStatusActuallyList = obj.orderStatusActually
+      }
+      if (
+        typeof obj.orderStatusActually != 'undefined' &&
+        obj.orderStatusActually.length == 0
+      ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('orderStatusActually'),
+          1
+        )
+        delete this.filterMap.orderStatusActuallyList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -4099,6 +4131,8 @@ export default {
         })
       }
       this.downloadLoading = true
+      tHeader.unshift('车序号')
+      filterVal.unshift('saleOrderMaterialId')
       require.ensure([], () => {
         const {
           export_json_to_excel
@@ -5072,12 +5106,18 @@ export default {
       if (!obj.carrierList || obj.carrierList.length === 0) {
         this.filterCarrierList = data[0].filterCarrierList
       }
-      if (!obj.orderStatusList || obj.orderStatusList === 0) {
+      if (!obj.orderStatusList || obj.orderStatusList.length === 0) {
         this.filterorderStatus = data[0].filterorderStatus
       }
-      if (!obj.areaNameList || obj.areaNameList === 0) {
+      if (!obj.areaNameList || obj.areaNameList.length === 0) {
         this.filterAreaName = data[0].filterAreaName
       }
+      if (
+        !obj.orderStatusActuallyList ||
+        obj.orderStatusActuallyList.length === 0
+      ) {
+        this.filterorderStatusActually = data[0].filterorderStatusActually
+      }
     },
     //重新获取表格数据
     refresh() {
@@ -5196,6 +5236,8 @@ export default {
             this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
             this.filterSaleRemark = res.data.data[0].filterSaleRemark
             this.filterTruckRemark = res.data.data[0].filterTruckRemark
+            this.filterorderStatusActually =
+              res.data.data[0].filterorderStatusActually
           }
           this.maxHeight =
             window.innerHeight -
@@ -5303,6 +5345,11 @@ export default {
           margin-left: 50px;
           margin-right: 10px;
         }
+        .steelMapClass13 {
+          display: flex;
+          margin-left: 50px;
+          margin-right: 10px;
+        }
       }
       .steelMapClass2 {
         margin-top: 20px;

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

@@ -44,8 +44,7 @@
         id="tableRef"
         ref="tableRef"
         border
-        :summary-method="getSummaries"
-        show-summary
+        :row-style="{ height: '30px' }"
       >
         <el-table-column
           prop="carrierDirection"
@@ -377,11 +376,41 @@ export default {
             sjTime(this.startTime)
         )
         .then(res => {
+          let summaryRow = {
+            carrierDirection: '合计',
+            finishEd: 0,
+            outFactoryEd: 0,
+            enFactoryEd: 0,
+            queueOrder: 0,
+            receivedOrder: 0,
+            dispatchOrderEd: 0,
+            arrageTruckNumber: 0,
+            unArragePlanTruckNumber: 0,
+            processPlanTruckNumber: 0,
+            submitPlanTruckNumber: 0,
+            savePlanTruckNumber: 0,
+            noUploadPlanTruckNumber: 0
+          }
+          res.data.data.forEach(item => {
+            summaryRow.finishEd += item.finishEd
+            summaryRow.outFactoryEd += item.outFactoryEd
+            summaryRow.enFactoryEd += item.enFactoryEd
+            summaryRow.queueOrder += item.queueOrder
+            summaryRow.receivedOrder += item.receivedOrder
+            summaryRow.dispatchOrderEd += item.dispatchOrderEd
+            summaryRow.arrageTruckNumber += item.arrageTruckNumber
+            summaryRow.unArragePlanTruckNumber += item.unArragePlanTruckNumber
+            summaryRow.processPlanTruckNumber += item.processPlanTruckNumber
+            summaryRow.submitPlanTruckNumber += item.submitPlanTruckNumber
+            summaryRow.savePlanTruckNumber += item.savePlanTruckNumber
+            summaryRow.noUploadPlanTruckNumber += item.noUploadPlanTruckNumber
+          })
           this.tableData = res.data.data
+          this.tableData.push(summaryRow)
         })
     },
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { border: '2px,solid,#000' }
+      return { border: '1px,solid,#000' }
     },
     getSummaries(param) {
       const { columns, data } = param

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

@@ -32,13 +32,12 @@
           <i class="el-icon-download"></i>导出excel
         </el-button>
       </div>
-
       <!-- 装车出库详情 -->
       <div
         ref="yawnReport"
         style="width:100%;height:500px;float:left;margin-left:5px"
       >
-        <div>
+        <div class="table">
           <el-table
             ref="yawnReportData"
             highlight-current-row
@@ -46,7 +45,7 @@
             fit
             :data="yawnReportData"
             :span-method="objectSpanMethod"
-            :row-style="{ height: '40px' }"
+            :row-style="{ height: '30px' }"
             style="width: 100%;font-size: 18px"
           >
             <el-table-column
@@ -87,11 +86,39 @@
             <el-table-column
               align="center"
               prop="notSendNum"
-              label="未派车数"
+              label="未派车"
+              width="100px"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="unReceiveNum"
+              label="未接收"
+              width="100px"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="receivedNum"
+              label="已接收"
+              width="100px"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="queueNum"
+              label="排队中"
               width="100px"
             >
             </el-table-column>
             <el-table-column
+              align="center"
+              prop="enFactoryNum"
+              label="已进厂"
+              width="100px"
+            >
+            </el-table-column>
+            <!-- <el-table-column
               align="center"
               prop="notEnNum"
               label="未进厂数"
@@ -104,12 +131,12 @@
               label="进厂待装数"
               width="100px"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               align="center"
               prop="percent"
               label="派车率"
-              width="100px"
+              width="110px"
             >
             </el-table-column>
             <el-table-column
@@ -133,6 +160,13 @@
               width="100px"
             >
             </el-table-column>
+            <el-table-column
+              align="center"
+              prop="materialThoWeight"
+              label="理重"
+              width="100px"
+            >
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -209,6 +243,12 @@ export default {
             percent: '',
             planNum: 0,
             quxiaoNum: 0,
+            unReceiveNum: 0,
+            receivedNum: 0,
+            queueNum: 0,
+            enFactoryNum: 0,
+            totalNet: 0,
+            materialThoWeight: 0,
             target: '合计'
           }
           res.data.data.forEach(item => {
@@ -220,6 +260,16 @@ export default {
             countRow.orderNum += item.orderNum
             countRow.planNum += item.planNum
             countRow.quxiaoNum += item.quxiaoNum
+            countRow.unReceiveNum += item.unReceiveNum
+            countRow.receivedNum += item.receivedNum
+            countRow.queueNum += item.queueNum
+            countRow.enFactoryNum += item.enFactoryNum
+            countRow.totalNet =
+              (countRow.totalNet * 1000 + item.totalNet * 1000) / 1000
+            countRow.materialThoWeight =
+              (countRow.materialThoWeight * 1000 +
+                item.materialThoWeight * 1000) /
+              1000
           })
           if (countRow.planNum) {
             countRow.percent =
@@ -318,4 +368,13 @@ export default {
   }
 }
 </script>
-<style lang="scss"></style>
+<style lang="scss" scoped>
+.table {
+  /deep/ .el-table__row > td {
+    // overflow-y: auto;
+    // position: absolute !important;
+
+    border: 1px, solid, #000 !important;
+  }
+}
+</style>