修改销售钢材报表

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.104:8080',
     ws: true,
     pathRewrite: {

src/views/WMS/components/steel/bar1_steel/bar1_steel_inbound.vue

@@ -6,7 +6,6 @@
         <el-form-item>
           <span class="text">入库时间：</span>
           <el-date-picker
-            disabled
             v-model="startTime"
             type="datetime"
             placeholder="选择日期"
@@ -15,7 +14,6 @@
           </el-date-picker>
           <span class="text">至</span>
           <el-date-picker
-            disabled
             v-model="endTime"
             type="datetime"
             placeholder="选择日期"
@@ -58,37 +56,37 @@
 </template>
 
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
-      inputText: "",
+      inputText: '',
       startTime: null,
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
         // selectionType: "select",
         // mapList: [],
       }
-    };
+    }
   },
   created() {
-    var date = new Date();
-    let dateStr = this.formatDate(date, "yyyy-MM-dd hh:mm:ss");
+    var date = new Date()
+    let dateStr = this.formatDate(date, 'yyyy-MM-dd hh:mm:ss')
 
-    this.startTime = Date.parse(new Date(dateStr));
-    this.endTime = new Date(this.startTime + 86400000);
+    this.startTime = Date.parse(new Date(dateStr))
+    this.endTime = new Date(this.startTime + 86400000)
 
     this.options.requestUrl =
-      "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+      '/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=' +
       1 +
-      "&startTime=" +
+      '&startTime=' +
       sjTime(this.startTime) +
-      "&endTime=" +
-      sjTime(this.endTime);
-    this.tableShow = true;
+      '&endTime=' +
+      sjTime(this.endTime)
+    this.tableShow = true
   },
 
   methods: {
@@ -96,100 +94,100 @@ export default {
       if (/(y+)/.test(fmt)) {
         fmt = fmt.replace(
           RegExp.$1,
-          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
-        );
+          (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+        )
       }
       let o = {
-        "M+": date.getMonth() + 1,
-        "d+": date.getDate(),
-        "h+": 0,
-        "m+": 0,
-        "s+": 0
-      };
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': 0,
+        'm+': 0,
+        's+': 0
+      }
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + "";
+          let str = o[k] + ''
           fmt = fmt.replace(
             RegExp.$1,
             RegExp.$1.length === 1 ? str : this.padLeftZero(str)
-          );
+          )
         }
       }
-      return fmt;
+      return fmt
     },
     padLeftZero(str) {
-      return ("00" + str).substr(str.length);
+      return ('00' + str).substr(str.length)
     },
     querySearch(queryString, cb) {
       var restaurants = [
-        { value: "螺纹钢" },
-        { value: "盘螺" },
-        { value: "乱尺" }
-      ];
+        { value: '螺纹钢' },
+        { value: '盘螺' },
+        { value: '乱尺' }
+      ]
       var results = queryString
         ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
+        : restaurants
       // 调用 callback 返回建议列表的数据
-      cb(results);
+      cb(results)
     },
     createFilter(queryString) {
       return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick() {
-      let startTime = null;
-      let endTime = null;
+      let startTime = null
+      let endTime = null
       if (this.startTime) {
-        startTime = sjTime(this.startTime);
+        startTime = sjTime(this.startTime)
       }
       if (this.endTime) {
-        endTime = sjTime(this.endTime);
+        endTime = sjTime(this.endTime)
       }
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
           this.options.requestUrl =
-            "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+            '/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=' +
             1 +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&i=" +
-            new Date();
+            '&i=' +
+            new Date()
           this.options.requestQuery = {
             materialNames: this.inputText
-          };
+          }
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
           // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning("开始时间要比结束时间早");
+          this.startTime = null
+          this.endTime = null
+          this.$message.warning('开始时间要比结束时间早')
         }
       } else {
-        this.getRequestUrl();
+        this.getRequestUrl()
       }
     },
     selectionChange(selection) {
-      this.options.mapList = selection;
+      this.options.mapList = selection
     },
     onreserved() {
       this.$router.push({
-        path: "/bar1_addSteelInbound"
-      });
+        path: '/bar1_addSteelInbound'
+      })
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/views/WMS/components/steel/bar2_steel/bar2_steel_inbound.vue

@@ -6,7 +6,6 @@
         <el-form-item>
           <span class="text">入库时间：</span>
           <el-date-picker
-            disabled
             v-model="startTime"
             type="datetime"
             placeholder="选择日期"
@@ -15,7 +14,6 @@
           </el-date-picker>
           <span class="text">至</span>
           <el-date-picker
-            disabled
             v-model="endTime"
             type="datetime"
             placeholder="选择日期"
@@ -50,37 +48,37 @@
 </template>
 
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
-      inputText: "",
+      inputText: '',
       startTime: null,
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
         // selectionType: "select",
         // mapList: [],
       }
-    };
+    }
   },
   created() {
-    var date = new Date();
-    let dateStr = this.formatDate(date, "yyyy-MM-dd hh:mm:ss");
+    var date = new Date()
+    let dateStr = this.formatDate(date, 'yyyy-MM-dd hh:mm:ss')
 
-    this.startTime = Date.parse(new Date(dateStr));
-    this.endTime = new Date(this.startTime + 86400000);
+    this.startTime = Date.parse(new Date(dateStr))
+    this.endTime = new Date(this.startTime + 86400000)
 
     this.options.requestUrl =
-      "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+      '/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=' +
       2 +
-      "&startTime=" +
+      '&startTime=' +
       sjTime(this.startTime) +
-      "&endTime=" +
-      sjTime(this.endTime);
-    this.tableShow = true;
+      '&endTime=' +
+      sjTime(this.endTime)
+    this.tableShow = true
   },
 
   methods: {
@@ -88,100 +86,100 @@ export default {
       if (/(y+)/.test(fmt)) {
         fmt = fmt.replace(
           RegExp.$1,
-          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
-        );
+          (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+        )
       }
       let o = {
-        "M+": date.getMonth() + 1,
-        "d+": date.getDate(),
-        "h+": 0,
-        "m+": 0,
-        "s+": 0
-      };
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': 0,
+        'm+': 0,
+        's+': 0
+      }
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + "";
+          let str = o[k] + ''
           fmt = fmt.replace(
             RegExp.$1,
             RegExp.$1.length === 1 ? str : this.padLeftZero(str)
-          );
+          )
         }
       }
-      return fmt;
+      return fmt
     },
     padLeftZero(str) {
-      return ("00" + str).substr(str.length);
+      return ('00' + str).substr(str.length)
     },
     querySearch(queryString, cb) {
       var restaurants = [
-        { value: "螺纹钢" },
-        { value: "盘螺" },
-        { value: "乱尺" }
-      ];
+        { value: '螺纹钢' },
+        { value: '盘螺' },
+        { value: '乱尺' }
+      ]
       var results = queryString
         ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
+        : restaurants
       // 调用 callback 返回建议列表的数据
-      cb(results);
+      cb(results)
     },
     createFilter(queryString) {
       return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick() {
-      let startTime = null;
-      let endTime = null;
+      let startTime = null
+      let endTime = null
       if (this.startTime) {
-        startTime = sjTime(this.startTime);
+        startTime = sjTime(this.startTime)
       }
       if (this.endTime) {
-        endTime = sjTime(this.endTime);
+        endTime = sjTime(this.endTime)
       }
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
           this.options.requestUrl =
-            "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+            '/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=' +
             2 +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&i=" +
-            new Date();
+            '&i=' +
+            new Date()
           this.options.requestQuery = {
             materialNames: this.inputText
-          };
+          }
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
           // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning("开始时间要比结束时间早");
+          this.startTime = null
+          this.endTime = null
+          this.$message.warning('开始时间要比结束时间早')
         }
       } else {
-        this.getRequestUrl();
+        this.getRequestUrl()
       }
     },
     selectionChange(selection) {
-      this.options.mapList = selection;
+      this.options.mapList = selection
     },
     onreserved() {
       this.$router.push({
-        path: "/bar2_addSteelInbound"
-      });
+        path: '/bar2_addSteelInbound'
+      })
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/views/WMS/components/steel/steel_inbound.vue

@@ -4,9 +4,8 @@
     <div class="sache">
       <el-form :inline="true">
         <el-form-item>
-          <span class="text">扫码时间：</span>
+          <span class="text">入库时间：</span>
           <el-date-picker
-            disabled
             v-model="startTime"
             type="datetime"
             placeholder="选择日期"
@@ -15,7 +14,6 @@
           </el-date-picker>
           <span class="text">至</span>
           <el-date-picker
-            disabled
             v-model="endTime"
             type="datetime"
             placeholder="选择日期"
@@ -55,137 +53,137 @@
 </template>
 
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       tableShow: false,
-      selectionType: "",
-      inputText: "",
+      selectionType: '',
+      inputText: '',
       startTime: null,
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
         // selectionType: "select",
         // mapList: [],
       }
-    };
+    }
   },
   mounted() {
-    var date = new Date();
-    let dateStr = this.formatDate(date, "yyyy-MM-dd hh:mm:ss");
+    var date = new Date()
+    let dateStr = this.formatDate(date, 'yyyy-MM-dd hh:mm:ss')
 
-    this.startTime = Date.parse(new Date(dateStr));
-    this.endTime = new Date(this.startTime + 86400000);
+    this.startTime = Date.parse(new Date(dateStr))
+    this.endTime = new Date(this.startTime + 86400000)
 
     this.options.requestUrl =
-      "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+      '/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=' +
       3 +
-      "&startTime=" +
+      '&startTime=' +
       sjTime(this.startTime) +
-      "&endTime=" +
-      sjTime(this.endTime);
-    this.tableShow = true;
+      '&endTime=' +
+      sjTime(this.endTime)
+    this.tableShow = true
   },
   methods: {
     formatDate(date, fmt) {
       if (/(y+)/.test(fmt)) {
         fmt = fmt.replace(
           RegExp.$1,
-          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
-        );
+          (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+        )
       }
       let o = {
-        "M+": date.getMonth() + 1,
-        "d+": date.getDate(),
-        "h+": 0,
-        "m+": 0,
-        "s+": 0
-      };
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': 0,
+        'm+': 0,
+        's+': 0
+      }
       for (let k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
-          let str = o[k] + "";
+          let str = o[k] + ''
           fmt = fmt.replace(
             RegExp.$1,
             RegExp.$1.length === 1 ? str : this.padLeftZero(str)
-          );
+          )
         }
       }
-      return fmt;
+      return fmt
     },
     padLeftZero(str) {
-      return ("00" + str).substr(str.length);
+      return ('00' + str).substr(str.length)
     },
     querySearch(queryString, cb) {
       var restaurants = [
-        { value: "螺纹钢" },
-        { value: "盘螺" },
-        { value: "乱尺" }
-      ];
+        { value: '螺纹钢' },
+        { value: '盘螺' },
+        { value: '乱尺' }
+      ]
       var results = queryString
         ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
+        : restaurants
       // 调用 callback 返回建议列表的数据
-      cb(results);
+      cb(results)
     },
     createFilter(queryString) {
       return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1
-        );
-      };
+        )
+      }
     },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick() {
-      let startTime = null;
-      let endTime = null;
+      let startTime = null
+      let endTime = null
       if (this.startTime) {
-        startTime = sjTime(this.startTime);
+        startTime = sjTime(this.startTime)
       }
       if (this.endTime) {
-        endTime = sjTime(this.endTime);
+        endTime = sjTime(this.endTime)
       }
       if (startTime && endTime) {
         if (startTime < endTime) {
           this.options.requestUrl =
-            "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" +
+            '/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=' +
             3 +
-            "&startTime=" +
+            '&startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&i=" +
-            new Date();
+            '&i=' +
+            new Date()
           this.options.requestQuery = {
             materialNames: this.inputText
-          };
+          }
           // this.selectionType="select";
         } else {
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning("开始时间要比结束时间早");
+          this.startTime = null
+          this.endTime = null
+          this.$message.warning('开始时间要比结束时间早')
         }
       } else {
-        this.$message.warning("没有选择时间段");
+        this.$message.warning('没有选择时间段')
         // this.getRequestUrl()
       }
     },
     selectionChange(selection) {
-      this.options.mapList = selection;
+      this.options.mapList = selection
     },
     handleSelect(item) {
-      console.log(item);
+      console.log(item)
     },
     onreserved() {
       this.$router.push({
-        path: "/addSteelInbound"
-      });
+        path: '/addSteelInbound'
+      })
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -201,8 +201,6 @@
         @row-click="rowClick"
         :cell-style="cellStyle"
         @filter-change="filterChange"
-        icoreFilterFlag="true"
-        @icoreFilterChange="icoreFilterChange"
         :key="saleSteelKey"
         id="salesLogisticsStat_saleSteelReports_table"
         individual-panel
@@ -269,14 +267,13 @@
         <el-table-column
           prop="consigneeName"
           label="客户"
-          width="220px"
+          width="250px"
           align="center"
           column-key="consigneeName"
           key="consigneeName"
-          :filters="filterConsigneeList"
           show-overflow-tooltip
-          sortable
           v-if="!columnNoRoutList.includes('客户')"
+          :render-header="renderHeaderConsignee"
         >
         </el-table-column>
         <el-table-column
@@ -2006,7 +2003,19 @@ export default {
         { text: '未上报', value: '未上报' },
         { text: '反审批', value: '反审批' }
       ],
-      filterMap: {},
+      filterMap: {
+        consigneeNameList: [],
+        truckRemarkList: [],
+        saleRemarkList: [],
+        saleOrderStatusList: [],
+        materialSpeList: [],
+        addressPlaceList: [],
+        orderStatusList: [],
+        saleAreaList: [],
+        materialNameList: [],
+        carrierList: [],
+        capacityList: []
+      },
       //权限控制
       notRoutList: [],
       remarkPic: false,
@@ -2084,7 +2093,8 @@ export default {
       isShowOperateYeWuYuan: false,
       headColumnList: [],
       columnAllData: [],
-      columnHiddenData: []
+      columnHiddenData: [],
+      consigneeCheckList: []
     }
   },
   created() {
@@ -2270,6 +2280,118 @@ export default {
   },
   computed: {},
   methods: {
+    renderHeaderConsignee(h, { column }) {
+      let arr = []
+      if (column.label === '客户') {
+      }
+      return h(
+        'div',
+        {
+          style: {
+            height: 'auto',
+            color:
+              this.filterMap.consigneeNameList.length > 0 ? '#409EFF' : '#ffff',
+            fontWeight: '700',
+            fontSize: '15px'
+          }
+        },
+        [
+          h(
+            'el-popover',
+            {
+              props: {
+                placement: 'bottom-start',
+
+                trigger: 'click'
+              },
+              style: {
+                width: 'auto'
+              }
+            },
+            [
+              h('span', {
+                slot: 'reference',
+                style: 'margin-top:20px',
+                domProps: {
+                  innerHTML:
+                    column.label + '  ' + '<i class="el-icon-search""/>'
+                }
+              }),
+              h(
+                'el-select',
+                {
+                  style: {
+                    'margin-bottom': '10px',
+                    'border-bottom': '1px solid #efefef',
+                    'padding-bottom': '10px',
+                    width: '250px'
+                  },
+                  props: {
+                    filterable: true,
+                    multiple: true,
+                    collapseTags: true,
+                    value: this.filterMap.consigneeNameList
+                  },
+                  on: {
+                    change: val => {
+                      console.log(val)
+                      if (val) {
+                        // this.consigneeCheckList.push(val)
+                        this.filterMap.consigneeNameList = [...new Set(val)]
+                      } else {
+                        let i = this.filterMap.consigneeNameList.findIndex(
+                          row => row == val
+                        )
+                        this.filterMap.consigneeNameList.splice(i, 1)
+                      }
+                    }
+                  }
+                },
+                [
+                  this.filterConsigneeList.map((item, index) => {
+                    return h('el-option', {
+                      props: {
+                        label: item.text,
+                        value: item.text,
+                        key: index
+                      }
+                    })
+                  })
+                ]
+              ),
+              h('el-button', {
+                props: {
+                  size: 'mini'
+                },
+                on: {
+                  click: _ => {
+                    this.filterMap.consigneeNameList = []
+                    this.onclick(this.filterMap)
+                  }
+                },
+                domProps: {
+                  innerHTML: '重置'
+                }
+              }),
+              h('el-button', {
+                props: {
+                  size: 'mini',
+                  type: 'primary'
+                },
+                on: {
+                  click: _ => {
+                    this.onclick(this.filterMap)
+                  }
+                },
+                domProps: {
+                  innerHTML: '筛选'
+                }
+              })
+            ]
+          )
+        ]
+      )
+    },
     ctrlColumnShow() {
       this.axios
         .post('/api/v1/uc/getColumnShowHidden', {
@@ -2318,7 +2440,19 @@ export default {
     clearFilter() {
       this.$refs.tableRef.clearFilter()
       this.headColumnList = []
-      this.filterMap = {}
+      this.filterMap = {
+        consigneeNameList: [],
+        truckRemarkList: [],
+        saleRemarkList: [],
+        saleOrderStatusList: [],
+        materialSpeList: [],
+        addressPlaceList: [],
+        orderStatusList: [],
+        saleAreaList: [],
+        materialNameList: [],
+        carrierList: [],
+        capacityList: []
+      }
       this.onclick()
     },
     creatQrCode(text) {
@@ -4877,6 +5011,11 @@ export default {
       width: 10px;
       background-color: transparent;
     }
+
+    /deep/ .scrollBarClass {
+      max-height: 200px;
+      width: 220px;
+    }
   }
 
   .batchCarrierClass {