xiugai1

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-// let devModules = ['index', 'inward', 'statisticalReport']
 let devModules = ['all']
+// let devModules = ['index', 'inward', 'statisticalReport', 'RMS']
+// let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

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

@@ -80,7 +80,6 @@
           <el-button type="primary" @click="refresh">
             <i class="el-icon-refresh"></i>
           </el-button>
-
           <el-button type="primary" class="btn" @click="batchOperate"
             >批量保存</el-button
           >
@@ -101,6 +100,7 @@
             v-model="sendStationId"
             @change="handleMulSendChange()"
             placeholder="请选择发站"
+            clearable
           >
             <el-option
               v-for="item in sendStationList"
@@ -113,6 +113,19 @@
         </el-form-item>
       </el-form>
     </div>
+    <div class="num">
+      <span class="titleTxt">总计划数:</span>
+      <span class="titleTxt">{{ totalPlanNum }}</span>
+
+      <span class="titleTxt">当前勾选计划数:</span>
+      <span class="titleTxt">{{ togglePlanNum }}</span>
+
+      <span class="titleTxt">达州站计划数:</span>
+      <span class="titleTxt">{{ dazhouPlannNum }}</span>
+
+      <span class="titleTxt">专线计划数:</span>
+      <span class="titleTxt">{{ zhuanxianPlanNum }}</span>
+    </div>
     <div class="main">
       <el-table
         :data="tableData"
@@ -132,23 +145,28 @@
           handleMulSendChange()
         "
       >
-        <el-table-column type="selection" width="55" align="center">
-        </el-table-column>
         <el-table-column
           prop="group"
           width="50"
           label="序号"
           align="center"
+          column-key="group"
+          key="group"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
-
+        <el-table-column type="selection" width="40" align="center">
+        </el-table-column>
+        <el-table-column type="index" width="40" label="行号" align="center">
+        </el-table-column>
         <el-table-column
           prop="saleRemark"
           label="摘要"
           width="120px"
           align="center"
+          column-key="saleRemark"
+          key="saleRemark"
         >
         </el-table-column>
         <el-table-column
@@ -207,30 +225,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="transInDep"
-          label="调入部门"
-          width="120px"
-          align="center"
-          column-key="transInDep"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="transOutDep"
-          label="调出部门"
-          width="120px"
-          align="center"
-          column-key="transOutDep"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="transInWarehouse"
-          label="调入仓库"
-          width="120px"
-          align="center"
-          column-key="transInWarehouse"
-        >
-        </el-table-column>
+
         <el-table-column
           prop="materialName"
           label="物资名称"
@@ -274,6 +269,30 @@
           align="center"
         >
         </el-table-column>
+        <el-table-column
+          prop="transInDep"
+          label="调入部门"
+          width="120px"
+          align="center"
+          column-key="transInDep"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="transOutDep"
+          label="调出部门"
+          width="120px"
+          align="center"
+          column-key="transOutDep"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="transInWarehouse"
+          label="调入仓库"
+          width="120px"
+          align="center"
+          column-key="transInWarehouse"
+        >
+        </el-table-column>
         <el-table-column
           prop="sendStationOptionName"
           label="发站修改人"
@@ -388,12 +407,31 @@ export default {
       //收货客户列表
       consigneeList: [],
       receiveName: null,
-      sendStationId: null
+      sendStationId: null,
+      totalPlanNum: 0,
+      dazhouPlannNum: 0,
+      zhuanxianPlanNum: 0,
+      togglePlanNum: 0
     }
   },
   created() {
     this.getRequestUrl()
   },
+  watch: {
+    tableData: {
+      handler(oldVal, newVal) {
+        this.totalPlanNum = this.tableData.length
+        this.dazhouPlannNum = this.tableData.filter(item => {
+          return item.sendStation == '达州站'
+        }).length
+        this.zhuanxianPlanNum = this.tableData.filter(item => {
+          return item.sendStation == '专用线'
+        }).length
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   mounted() {
     this.information()
     this.$nextTick(() => {
@@ -429,6 +467,7 @@ export default {
     handleSelectionChange() {
       //批量绑定收货客户
       let selection = this.$refs.tableRef.selection
+      this.togglePlanNum = this.$refs.tableRef.selection.length
       console.log('selection:', selection)
       if (!selection) return
       this.consigneeList.forEach(e => {
@@ -443,6 +482,7 @@ export default {
     handleMulSendChange() {
       //批量绑定发站
       let selection = this.$refs.tableRef.selection
+      this.togglePlanNum = this.$refs.tableRef.selection.length
       console.log('selection:', selection)
       if (!selection || !this.sendStationId) return
       selection.forEach(row => {
@@ -709,6 +749,15 @@ export default {
     margin-top: 20px;
     margin-left: 20px;
   }
+  .num {
+    margin-top: 10px;
+    margin-left: 20px;
+    .titleTxt {
+      margin-left: 5px;
+      font-size: 18px;
+      font-weight: 600;
+    }
+  }
   .main {
     margin-top: 20px;
     margin-left: 20px;

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

@@ -91,7 +91,6 @@
         :data="tableData"
         ref="tableRef"
         border
-        stripe
         style="width: 100%; margin-top: 20px"
         max-height="500px"
         :row-style="{ height: '30px' }"
@@ -809,7 +808,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 #platformStockInfo {
   .head {
     margin-top: 20px;
@@ -823,6 +822,11 @@ export default {
       height: 20px;
       background-color: transparent;
     }
+    /deep/ .el-table__body {
+      tr:hover > td {
+        background-color: #8089f8;
+      }
+    }
   }
 }
 </style>

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

@@ -180,7 +180,9 @@
 
         <el-form-item>
           <span style="width: auto;font-size: 16px;line-height: auto;"
-            >车数/件数： {{ totalCapacity }}/{{ totalNumber }}
+            >车数/件数/取消： {{ totalCapacity }}/{{ totalNumber }}/{{
+              quxiaoCapacityNum
+            }}
           </span>
         </el-form-item>
       </el-form>
@@ -1968,6 +1970,8 @@ export default {
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
+      //取消车数
+      quxiaoCapacityNum: 0,
       tableTitle: '销售统计报表',
       capacityList: [],
       carrierList: [],
@@ -5038,6 +5042,7 @@ export default {
           if (res.data.data.length > 0) {
             this.totalNumber = `${res.data.data[0].totalNumber}件`
             this.totalCapacity = `${res.data.data[0].totalCapacity}车`
+            this.quxiaoCapacityNum = `${res.data.data[0].quxiaoCapacityNum}车`
             console.log(obj, 'obj')
             if (this.filterMap) {
               this.filterRefreshCtrl(res.data.data, this.filterMap)
@@ -5226,6 +5231,7 @@ export default {
           if (res.data.data.length > 0) {
             this.totalNumber = `${res.data.data[0].totalNumber}件`
             this.totalCapacity = `${res.data.data[0].totalCapacity}车`
+            this.quxiaoCapacityNum = `${res.data.data[0].quxiaoCapacityNum}车`
             this.filterConsigneeList = res.data.data[0].filterConsigneeList
             this.filterCarrierList = res.data.data[0].filterCarrierList
             this.filterCapacityList = res.data.data[0].filterCapacityList
@@ -5314,6 +5320,12 @@ export default {
       width: 220px;
     }
   }
+  /deep/ .el-tabs__new-tab {
+    font-size: 20px;
+    line-height: 20px;
+    font-weight: 700 !important;
+    color: #000;
+  }
 
   .batchCarrierClass {
     display: flex;

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

@@ -65,57 +65,57 @@
             <el-table-column
               align="center"
               prop="planNum"
-              label="下达计划"
-              width="100px"
+              label="审核计划"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="quxiaoNum"
               label="取消计划"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="orderNum"
               label="已派计划"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="notSendNum"
               label="未派车"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="unReceiveNum"
               label="未接收"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="receivedNum"
               label="已接收"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="queueNum"
               label="排队中"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="enFactoryNum"
               label="已进厂"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <!-- <el-table-column
@@ -143,14 +143,14 @@
               align="center"
               prop="numGong"
               label="工厂"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="numCang"
               label="库房"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
             <el-table-column
@@ -164,14 +164,14 @@
               align="center"
               prop="materialThoWeight"
               label="理重"
-              width="100px"
+              width="110px"
             >
             </el-table-column>
             <el-table-column
               align="center"
               prop="trainWeight"
               label="车皮"
-              width="100px"
+              width="80px"
             >
             </el-table-column>
           </el-table>
@@ -260,25 +260,27 @@ export default {
             target: '合计'
           }
           res.data.data.forEach(item => {
-            countRow.EnNum += item.EnNum
-            countRow.notEnNum += item.notEnNum
-            countRow.notSendNum += item.notSendNum
-            countRow.numCang += item.numCang
-            countRow.numGong += item.numGong
-            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
-            countRow.trainWeight += item.trainWeight
+            if (item.target != '月合计') {
+              countRow.EnNum += item.EnNum
+              countRow.notEnNum += item.notEnNum
+              countRow.notSendNum += item.notSendNum
+              countRow.numCang += item.numCang
+              countRow.numGong += item.numGong
+              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
+              countRow.trainWeight += item.trainWeight
+            }
           })
           if (countRow.planNum) {
             countRow.percent =
@@ -286,7 +288,8 @@ export default {
           } else {
             countRow.percent = 'NAL'
           }
-          res.data.data.push(countRow)
+          res.data.data.splice(res.data.data.length - 1, 0, countRow)
+          // res.data.data.push(countRow)
           this.getSpanArr(res.data.data)
           this.yawnReportData = res.data.data
         } else {