xiugai1

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', 'inward', 'statisticalReport', 'RMS']
+// let devModules = ['index', 'statisticalReport', 'inward']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

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

@@ -134,6 +134,8 @@
         style="width: 100%; margin-top: 20px"
         :max-height="maxHeight"
         :height="maxHeight"
+        @row-click="rowClick"
+        :row-class-name="tableRowClassName"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
         :key="saleSteelKey"
@@ -411,7 +413,9 @@ export default {
       totalPlanNum: 0,
       dazhouPlannNum: 0,
       zhuanxianPlanNum: 0,
-      togglePlanNum: 0
+      togglePlanNum: 0,
+      tableRowIndex: '',
+      isRowClick: 0
     }
   },
   created() {
@@ -420,6 +424,7 @@ export default {
   watch: {
     tableData: {
       handler(oldVal, newVal) {
+        this.tableRowIndex = ''
         this.totalPlanNum = this.tableData.length
         this.dazhouPlannNum = this.tableData.filter(item => {
           return item.sendStation == '达州站'
@@ -450,6 +455,19 @@ export default {
       window.innerHeight - document.querySelector('.head').offsetHeight - 40
   },
   methods: {
+    rowClick(row, column, event) {
+      console.log(row)
+      this.tableRowIndex = row.saleMaterialId
+      this.isRowClick = 1
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (
+        row.saleMaterialId == this.tableRowIndex &&
+        this.tableRowIndex !== ''
+      ) {
+        return 'warning-row'
+      }
+    },
     batchOperate() {
       console.log(this.$refs.tableRef.data)
       this.axios

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

@@ -93,6 +93,8 @@
         border
         style="width: 100%; margin-top: 20px"
         max-height="500px"
+        @row-click="rowClick"
+        :row-class-name="tableRowClassName"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
         :summary-method="getSummaries"
@@ -102,10 +104,18 @@
       >
         <el-table-column width="50" label="序号" align="center" type="index">
         </el-table-column>
+        <el-table-column
+          prop="orderTime"
+          label="订单日期"
+          width="80px"
+          align="center"
+          column-key="orderTime"
+        >
+        </el-table-column>
         <el-table-column
           prop="sendStation"
           label="发站"
-          width="120px"
+          width="80px"
           align="center"
           column-key="sendStation"
           :filters="[
@@ -120,6 +130,8 @@
           label="收货单位"
           width="200px"
           align="center"
+          :filters="filterConsigneeList"
+          :filter-method="filterConsignee"
         >
         </el-table-column>
         <el-table-column
@@ -127,6 +139,8 @@
           label="卸货地点"
           width="200px"
           align="center"
+          :filters="filterUnloadPlaceList"
+          :filter-method="filterUnloadPlace"
         >
           <template slot-scope="scope">
             <el-autocomplete
@@ -157,7 +171,9 @@
           prop="arrivalStation"
           label="到站"
           align="center"
-          width="150px"
+          width="120px"
+          :filters="filterToStationList"
+          :filter-method="filterToStation"
         >
         </el-table-column>
 
@@ -165,7 +181,9 @@
           prop="capacityNum"
           label="车牌号"
           align="center"
-          width="150px"
+          width="100px"
+          :filters="filterCapacityList"
+          :filter-method="filterCapacity"
         >
         </el-table-column>
         <el-table-column
@@ -173,41 +191,45 @@
           label="物资名称"
           align="center"
           width="150px"
+          :filters="filtermaterialNameList"
+          :filter-method="filterMaterialName"
         >
         </el-table-column>
         <el-table-column
           prop="materialSpa"
           label="规格"
           align="center"
-          width="150px"
+          width="120px"
+          :filters="filtermaterialSpaList"
+          :filter-method="filterMaterialSpa"
         >
         </el-table-column>
         <el-table-column
           prop="materialNum"
           label="件数"
           align="center"
-          width="150px"
+          width="60px"
         >
         </el-table-column>
         <el-table-column
           prop="materialWeight"
           label="重量"
           align="center"
-          width="150px"
+          width="60px"
         >
         </el-table-column>
         <el-table-column
           prop="theoryWeight"
           label="理重"
           align="center"
-          width="150px"
+          width="60px"
         >
         </el-table-column>
         <el-table-column
           prop="stackName"
           label="货位"
           align="center"
-          width="180px"
+          width="120px"
         >
           <template slot-scope="scope">
             <el-input v-model.number="scope.row.stackName" placeholder="货位">
@@ -225,14 +247,14 @@
           prop="orderNum"
           label="运输订单号"
           align="center"
-          width="150px"
+          width="180px"
         >
         </el-table-column>
         <el-table-column
           prop="wgmDelete"
           label="入库状态"
           align="center"
-          width="150px"
+          width="100px"
           column-key="wgmDelete"
           :filters="[
             { text: '入库', value: '入库' },
@@ -242,11 +264,20 @@
           :filter-method="filterDeleted"
         >
         </el-table-column>
+        <el-table-column
+          prop="outGateTime"
+          label="出厂日期"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
         <el-table-column
           prop="EnStation"
           label="进站日期"
           align="center"
           width="150px"
+          :filters="filterEnStationList"
+          :filter-method="filterEnStation"
         >
           <template slot-scope="scope">
             <el-date-picker
@@ -288,6 +319,8 @@
           label="发出日期"
           align="center"
           width="150px"
+          :filters="filterOutStationList"
+          :filter-method="filterOutStation"
         >
           <template slot-scope="scope">
             <el-date-picker
@@ -462,7 +495,17 @@ export default {
       unloadPointList: [],
       spanArr: [],
       mergeList: ['wagonNo', 'wagonBillWeight', 'OutStation'],
-      filterMap: {}
+      filterMap: {},
+      filterConsigneeList: [],
+      filterEnStationList: [],
+      filterOutStationList: [],
+      filtermaterialSpaList: [],
+      filtermaterialNameList: [],
+      filterCapacityList: [],
+      filterToStationList: [],
+      filterUnloadPlaceList: [],
+      tableRowIndex: '',
+      isRowClick: 0
     }
   },
   created() {
@@ -471,7 +514,36 @@ export default {
   mounted() {
     this.showSummariesPosition()
   },
+  watch: {
+    tableData: {
+      handler() {
+        this.tableRowIndex = ''
+        if (this.tableData.length > 0) {
+          this.filterEnStationList = this.tableData[0].filterEnStationList
+          this.filterOutStationList = this.tableData[0].filterOutStationList
+          this.filtermaterialSpaList = this.tableData[0].filtermaterialSpaList
+          this.filtermaterialNameList = this.tableData[0].filtermaterialNameList
+          this.filterCapacityList = this.tableData[0].filterCapacityList
+          this.filterToStationList = this.tableData[0].filterToStationList
+          this.filterUnloadPlaceList = this.tableData[0].filterUnloadPlaceList
+          this.filterConsigneeList = this.tableData[0].filterConsigneeList
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   methods: {
+    rowClick(row, column, event) {
+      console.log(row, 'row')
+      this.tableRowIndex = row.group
+      this.isRowClick = 1
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.group == this.tableRowIndex && this.tableRowIndex !== '') {
+        return 'warning-row'
+      }
+    },
     batchOperate() {
       this.$refs.tableRef.data.forEach((e, index) => {
         this.$refs.tableRef.data.forEach((item, index) => {
@@ -688,6 +760,39 @@ export default {
     filterSend(value, row, column) {
       return row.sendStation === value
     },
+    //筛选收货单位
+    filterConsignee(value, row, column) {
+      return row.consigneeName === value
+    },
+    //筛选卸货地点
+    filterUnloadPlace(value, row, column) {
+      return row.unloadPoint === value
+    },
+    //筛选到站
+    filterToStation(value, row, column) {
+      return row.arrivalStation === value
+    },
+    //筛选车牌号
+    filterCapacity(value, row, column) {
+      return row.capacityNum === value
+    },
+    //筛选物资
+    filterMaterialName(value, row, column) {
+      return row.materialName === value
+    },
+    //筛选规格
+    filterMaterialSpa(value, row, column) {
+      return row.materialSpa === value
+    },
+    //筛选进站日期
+    filterEnStation(value, row, column) {
+      return row.EnStation === value
+    },
+    //筛选发出日期
+    filterOutStation(value, row, column) {
+      return row.OutStation === value
+    },
+
     //筛选类型
     filterType(value, row, column) {
       return row.orderType.indexOf(value) != -1
@@ -824,7 +929,7 @@ export default {
     }
     /deep/ .el-table__body {
       tr:hover > td {
-        background-color: #8089f8;
+        background-color: #fff;
       }
     }
   }

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

@@ -142,7 +142,7 @@
             <el-table-column
               align="center"
               prop="numGong"
-              label="工厂"
+              label="工地"
               width="80px"
             >
             </el-table-column>
@@ -170,7 +170,14 @@
             <el-table-column
               align="center"
               prop="trainWeight"
-              label="车皮"
+              label="车皮(磅重)"
+              width="80px"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="trainThoWeight"
+              label="车皮(理重)"
               width="80px"
             >
             </el-table-column>
@@ -257,6 +264,7 @@ export default {
             totalNet: 0,
             materialThoWeight: 0,
             trainWeight: 0,
+            trainThoWeight: 0,
             target: '合计'
           }
           res.data.data.forEach(item => {
@@ -280,11 +288,15 @@ export default {
                   item.materialThoWeight * 1000) /
                 1000
               countRow.trainWeight += item.trainWeight
+              countRow.trainThoWeight += item.trainThoWeight
             }
           })
           if (countRow.planNum) {
             countRow.percent =
-              ((countRow.orderNum / countRow.planNum) * 100).toFixed(4) + '%'
+              (
+                (countRow.orderNum / (countRow.planNum - countRow.quxiaoNum)) *
+                100
+              ).toFixed(2) + '%'
           } else {
             countRow.percent = 'NAL'
           }