tajhd

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
-let devModules = ['index', 'sale', 'statisticalReport']
+let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    // target: 'http://172.16.33.166:80',
-    target: 'http://localhost:8080',
+    target: 'http://172.16.33.166:80',
+    // target: 'http://localhost:8080',
     // target: 'http://192.168.1.102:8080',
     ws: true,
     pathRewrite: {

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

@@ -115,6 +115,7 @@
         @cell-mouse-leave="cellLeave"
         @row-click="rowClick"
         :cell-style="cellStyle"
+        @filter-change="filterChange"
       >
         <el-table-column
           width="50"
@@ -146,7 +147,6 @@
           align="center"
           column-key="consigneeName"
           :filters="filterConsigneeList"
-          :filter-method="filterConsignee"
           sortable
           show-overflow-tooltip
         >
@@ -164,10 +164,10 @@
           label="承运商"
           align="center"
           width="80px"
+          column-key="carrierList"
           sortable
           show-overflow-tooltip
           :filters="filterCarrierList"
-          :filter-method="filterCarrier"
         >
         </el-table-column>
         <el-table-column
@@ -179,7 +179,6 @@
           sortable
           show-overflow-tooltip
           :filters="filterCapacityList"
-          :filter-method="filterCapacity"
         >
         </el-table-column>
         <el-table-column
@@ -190,7 +189,7 @@
           sortable
           show-overflow-tooltip
           :filters="filtermaterialNameList"
-          :filter-method="filtermaterialName"
+          column-key="materialNameList"
         >
         </el-table-column>
         <el-table-column
@@ -862,7 +861,9 @@ export default {
         '是否自提',
         '订单日期',
         '短信发送',
-        '销售片区'
+        '销售片区',
+        '抵达时间',
+        '签收时间'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -935,7 +936,8 @@ export default {
       filterConsigneeList: [],
       filterCarrierList: [],
       filterCapacityList: [],
-      filtermaterialNameList: []
+      filtermaterialNameList: [],
+      filterMap: {}
     }
   },
   created() {
@@ -968,6 +970,50 @@ export default {
   },
   computed: {},
   methods: {
+    //筛选
+    filterChange(obj) {
+      if (typeof obj.carrierList != 'undefined' && obj.carrierList.length > 0) {
+        this.filterMap.carrierList = obj.carrierList
+      }
+      if (
+        typeof obj.carrierList != 'undefined' &&
+        obj.carrierList.length == 0
+      ) {
+        delete this.filterMap.carrierList
+      }
+      if (
+        typeof obj.materialNameList != 'undefined' &&
+        obj.materialNameList.length > 0
+      ) {
+        this.filterMap.materialNameList = obj.materialNameList
+      }
+      if (
+        typeof obj.materialNameList != 'undefined' &&
+        obj.materialNameList.length == 0
+      ) {
+        delete this.filterMap.materialNameList
+      }
+      if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length > 0) {
+        this.filterMap.capacityList = obj.capacityNo
+      }
+      if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length == 0) {
+        delete this.filterMap.capacityList
+      }
+      if (
+        typeof obj.consigneeName != 'undefined' &&
+        obj.consigneeName.length > 0
+      ) {
+        this.filterMap.consigneeNameList = obj.consigneeName
+      }
+      if (
+        typeof obj.consigneeName != 'undefined' &&
+        obj.consigneeName.length == 0
+      ) {
+        delete this.filterMap.consigneeNameList
+      }
+      // if (obj)
+      this.onclick(this.filterMap)
+    },
     //控制筛选数组变化
     filterListChange() {
       let consigneeNameList = this.tableData.map(e => {
@@ -994,7 +1040,10 @@ export default {
         .filter(e => {
           return e != null
         })
-
+      this.filterConsigneeList = []
+      this.filterCarrierList = []
+      this.filterCapacityList = []
+      this.filtermaterialNameList = []
       Array.from(new Set(consigneeNameList)).forEach(e => {
         let map = {}
         map.text = e
@@ -1020,18 +1069,6 @@ export default {
         this.filtermaterialNameList.push(map)
       })
     },
-    filterConsignee(value, row) {
-      return row.consigneeName === value
-    },
-    filterCarrier(value, row) {
-      return row.carrierName === value
-    },
-    filterCapacity(value, row) {
-      return row.capacityNo === value
-    },
-    filtermaterialName(value, row) {
-      return row.materialName === value
-    },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
         column.property == 'arrivalAddress' ||
@@ -1891,7 +1928,7 @@ export default {
         })
     },
     //查询，输入查询条件
-    onclick() {
+    onclick(obj) {
       this.isRowClick = 0
       const loading = this.$loading({
         lock: true,
@@ -1959,7 +1996,8 @@ export default {
             '&saler=' +
             saler +
             '&easPrimaryId=' +
-            easPrimaryId
+            easPrimaryId,
+          obj
         )
         .then(res => {
           this.tableData = res.data.data