修改

build/utils.js

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

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -508,58 +508,68 @@
           </el-tab-pane>
           <el-tab-pane label="修改装卸货信息" name="tenth">
             <div class="admin2">
-              <el-form  class="load" label-width="80px" style="margin-left:33%">
-                  <el-form-item label="运输订单号:">
-                    <el-input class="inline-input" v-model="loadDetail.orderNumber" @change="selectLoadingIdRemark"></el-input>
-                  </el-form-item>
-                  <el-form-item label="物资:">
-                    <el-autocomplete
-                      class="inline-input"
-                      v-model="loadDetail.materialName"
-                      :fetch-suggestions="querySearchMaterial"
-                      placeholder="物资名"
-                      :trigger-on-focus="false"
-                      @select="handleSelectMaterial"
-                    >
-                      <template slot-scope="{ item }">
-                        <div class="name">{{ item.materialName }}</div>
-                      </template>
-                    </el-autocomplete>
-                  </el-form-item>
-                  <el-form-item label="装货点:">
-                    <el-autocomplete
-                      class="inline-input"
-                      v-model="loadDetail.loadingName"
-                      :fetch-suggestions="querySearchWareHouse"
-                      placeholder="装货点"
-                      :trigger-on-focus="false"
-                      @select="handleSelectLoading"
-                    >
-                      <template slot-scope="{ item }">
-                        <div class="name">{{ item.warehouseName }}</div>
-                      </template>
-                    </el-autocomplete>
-                  </el-form-item>
-                  <el-form-item label="卸货点:">
-                    <el-autocomplete
-                      class="inline-input"
-                      v-model="loadDetail.unloadingName"
-                      :fetch-suggestions="querySearchWareHouse"
-                      placeholder="卸货点"
-                      :trigger-on-focus="false"
-                      @select="handleSelectUnloading"
-                    >
-                      <template slot-scope="{ item }">
-                        <div class="name">{{ item.warehouseName }}</div>
-                      </template>
-                    </el-autocomplete>
-                  </el-form-item>
-                   <el-form-item label="装机备注:">
-                    <el-input  class="inline-input" v-model="loadDetail.capacityRemark"></el-input>
-                  </el-form-item>
-                   <el-form-item label="备注:">
-                    <el-input class="inline-input"  v-model="loadDetail.insertUpdateRemark"></el-input>
-                  </el-form-item>
+              <el-form class="load" label-width="80px" style="margin-left:33%">
+                <el-form-item label="运输订单号:">
+                  <el-input
+                    class="inline-input"
+                    v-model="loadDetail.orderNumber"
+                    @change="selectLoadingIdRemark"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="物资:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="loadDetail.materialName"
+                    :fetch-suggestions="querySearchMaterial"
+                    placeholder="物资名"
+                    :trigger-on-focus="false"
+                    @select="handleSelectMaterial"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.materialName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+                <el-form-item label="装货点:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="loadDetail.loadingName"
+                    :fetch-suggestions="querySearchWareHouse"
+                    placeholder="装货点"
+                    :trigger-on-focus="false"
+                    @select="handleSelectLoading"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.warehouseName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+                <el-form-item label="卸货点:">
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="loadDetail.unloadingName"
+                    :fetch-suggestions="querySearchWareHouse"
+                    placeholder="卸货点"
+                    :trigger-on-focus="false"
+                    @select="handleSelectUnloading"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.warehouseName }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+                <el-form-item label="装机备注:">
+                  <el-input
+                    class="inline-input"
+                    v-model="loadDetail.capacityRemark"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="备注:">
+                  <el-input
+                    class="inline-input"
+                    v-model="loadDetail.insertUpdateRemark"
+                  ></el-input>
+                </el-form-item>
               </el-form>
             </div>
             <div class="button_box">
@@ -610,7 +620,7 @@ export default {
       enFactoryGatepost: null,
       gatePostId: null,
       orderStatus: null,
-      loadDetail:{}
+      loadDetail: {}
     }
   },
   created() {
@@ -621,18 +631,23 @@ export default {
     this.information()
   },
   methods: {
-    selectLoadingIdRemark(){
-      if(this.loadDetail.orderNumber && this.loadDetail.orderNumber.length == 21){
-        this.axios.post("/api/v1/tms/selectLoadingIdRemark",this.loadDetail).then(res=>{
-          console.log(res);
-          if(res.data.status=="succeed"){
-            this.loadDetail=res.data.data;
-          }else{
-            this.$message.error(res.data.data);
-          }
-        })
-      }else{
-        this.loadDetail={};
+    selectLoadingIdRemark() {
+      if (
+        this.loadDetail.orderNumber &&
+        this.loadDetail.orderNumber.length == 21
+      ) {
+        this.axios
+          .post('/api/v1/tms/selectLoadingIdRemark', this.loadDetail)
+          .then(res => {
+            console.log(res)
+            if (res.data.status == 'succeed') {
+              this.loadDetail = res.data.data
+            } else {
+              this.$message.error(res.data.data)
+            }
+          })
+      } else {
+        this.loadDetail = {}
       }
     },
     querySearchMaterial(queryString, cb) {
@@ -647,10 +662,10 @@ export default {
           }
         })
     },
-    handleSelectMaterial(item){
-      console.log("material:",item);
-      this.loadDetail.materialId=item.materialId;
-      this.loadDetail.materialName=item.materialName;
+    handleSelectMaterial(item) {
+      console.log('material:', item)
+      this.loadDetail.materialId = item.materialId
+      this.loadDetail.materialName = item.materialName
     },
     querySearchWareHouse(queryString, cb) {
       if (queryString.length < 1) {
@@ -664,32 +679,33 @@ export default {
           }
         })
     },
-    handleSelectLoading(item){
-      console.log("load:",item);
-      this.loadDetail.loadingId=item.warehouseId;
-      this.loadDetail.loadingName=item.warehouseName;
+    handleSelectLoading(item) {
+      console.log('load:', item)
+      this.loadDetail.loadingId = item.warehouseId
+      this.loadDetail.loadingName = item.warehouseName
     },
-    handleSelectUnloading(item){
-      console.log("unload:",item);
-      this.loadDetail.unloadingId=item.warehouseId;
-      this.loadDetail.unloadingName=item.warehouseName;
+    handleSelectUnloading(item) {
+      console.log('unload:', item)
+      this.loadDetail.unloadingId = item.warehouseId
+      this.loadDetail.unloadingName = item.warehouseName
     },
     //修改装卸货信息
-    updateLoadingIdRemark(){
-      console.log(this.loadDetail);
-      if(!this.loadDetail.orderNumber || !this.loadDetail.loadResultId || !this.loadDetail.unloadResultId){
-        this.$message.warning("请填写正确的运输订单号");
-      }else if(!this.loadDetail.materialId || !this.loadDetail.loadingId || !this.loadDetail.unloadingId){
-        this.$message.warning("请填写物资、装卸点");
-      }else {
-        this.axios.post("/api/v1/tms/updateLoadingIdRemark",this.loadDetail).then(res=>{
-        if(res.data.status=="succeed"){
-              this.$message.success("修改成功！");
-            }else{
-              this.$message.error(res.data.data);
-            }
-        });
-      }
+    updateLoadingIdRemark() {
+      console.log(this.loadDetail)
+      // if(!this.loadDetail.orderNumber || !this.loadDetail.loadResultId || !this.loadDetail.unloadResultId){
+      //   this.$message.warning("请填写正确的运输订单号");
+      // }else if(!this.loadDetail.materialId || !this.loadDetail.loadingId || !this.loadDetail.unloadingId){
+      //   this.$message.warning("请填写物资、装卸点");
+      // }else {
+      this.axios
+        .post('/api/v1/tms/updateLoadingIdRemark', this.loadDetail)
+        .then(res => {
+          if (res.data.status == 'succeed') {
+            this.$message.success('修改成功！')
+          } else {
+            this.$message.error(res.data.data)
+          }
+        })
     },
     linkageDeleteTransportOrder() {
       let good = ''

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

@@ -1597,12 +1597,17 @@ export default {
       filterCarrierList: [],
       filterCapacityList: [],
       filtermaterialNameList: [],
-      filterSaleAreaList: [],
       filterorderStatus: [],
       filteraddressPlace: [],
       filtermaterialSpe: [],
       filterSaleRemark: [],
-      filterSaleOrderStatus: [],
+      filterSaleOrderStatus: [
+        { text: '关闭', value: '关闭' },
+        { text: '提交', value: '提交' },
+        { text: '审核', value: '审核' },
+        { text: '未上报', value: '未上报' },
+        { text: '反审批', value: '反审批' }
+      ],
       filterMap: {},
       //权限控制
       notRoutList: [],
@@ -1724,30 +1729,29 @@ export default {
     }, 1500)
     this.cellMouse1 = this.debounce((row, column, cell) => {
       this.cellMouse(row, column, cell)
-    }, 100)
+    }, 200)
     this.cellLeave1 = this.debounce((row, column, cell) => {
       this.cellLeave(row, column, cell)
-    }, 100)
+    }, 200)
     this.exceptionHandleMakeSure = this.debounce(() => {
       this.exceptionHandleMakeSure1()
     }, 500)
     this.getSteelReport()
   },
   watch: {
-    tableData: {
-      handler(oldVal, newVal) {
-        this.filterListChange()
-      },
-      deep: true,
-      immediate: true
-    },
+    // tableData: {
+    //   handler(oldVal, newVal) {
+    //     this.filterListChange()
+    //   },
+    //   deep: true,
+    //   immediate: true
+    // },
     scrollTop: {
       immediate: true,
       deep: true,
       handler(val) {
         this.$nextTick(() => {
-          //   debugger
-
+          console.time('aaa')
           if (
             val >=
             this.tableData.length * 30 -
@@ -1761,16 +1765,19 @@ export default {
           if (val <= 0) {
             val = 0
           }
-          const start = Math.floor(val / this.itemHeight)
+          const start = Math.floor(val / 30)
           this.visibleList = this.tableData.slice(
             start,
-            start + Math.floor(this.maxHeight / this.itemHeight) + 1
+            start + Math.floor(this.maxHeight / 30) + 1
           )
+
           this.getSpanArr(this.visibleList)
+
           document.querySelector(
             '.el-table__body-wrapper .el-table__body'
           ).style.transform = `translateY(${val}px)`
           this.debounceS = false
+          console.timeEnd('aaa')
         })
       }
     }
@@ -1780,7 +1787,6 @@ export default {
   },
   computed: {},
   mounted() {
-    let that = this
     this.$nextTick(() => {
       window.onresize = () => {
         return (() => {
@@ -1793,15 +1799,12 @@ export default {
       if (this.debounceS) return
       this.debounceS = true
       this.scrollTop = e.target.scrollTop
-      let upDownLenght = this.scrollTop - this.scrollTopUpDownLenght
+      // let upDownLenght = this.scrollTop - this.scrollTopUpDownLenght
       // if (upDownLenght < 0) {
-      //   setTimeout(() => {
-      //     this.debounceS = false
-      //   }, 40)
       // } else {
       //   setTimeout(() => {
       //     this.debounceS = false
-      //   }, 80)
+      //   }, 60)
       // }
       // document.querySelector(
       //   '.el-table__body-wrapper .el-table__body'
@@ -2453,144 +2456,144 @@ export default {
       this.onclick(this.filterMap)
     },
     //控制筛选数组变化
-    filterListChange() {
-      //客户筛选数组
-      let consigneeNameList = this.tableData
-        .map(e => {
-          return e.consigneeName
-        })
-        .sort()
-      //承运商筛选数组
-      let carrierNameList = this.tableData
-        .map(e => {
-          return e.carrierName
-        })
-        .sort()
-      //车牌号筛选数组
-      let capacityList = this.tableData
-        .map(e => {
-          return e.newCapacityNo
-        })
-        .sort()
-      //物资筛选数组
-      let materialNameList = this.tableData
-        .map(e => {
-          return e.materialName
-        })
-        .filter(e => {
-          return e != null
-        })
-        .sort()
-      //销售片区筛选数组
-      let saleAreaList = this.tableData
-        .map(e => {
-          return e.areaName
-        })
-        .filter(e => {
-          return e != null
-        })
-      let addressPlaceList = this.tableData
-        .map(e => {
-          return e.addressPlace
-        })
-        .filter(e => {
-          return e != null
-        })
-        .sort()
-      let orderStatusList = this.tableData
-        .map(e => {
-          return e.orderStatus
-        })
-        .filter(e => {
-          return e != null
-        })
-      let materialSpeList = this.tableData
-        .map(e => {
-          return e.materialSpe
-        })
-        .filter(e => {
-          return e != null
-        })
-        .sort()
-      let saleOrderStatusList = this.tableData.map(e => {
-        return e.saleOrderStatus
-      })
-      let saleRemarkList = this.tableData
-        .map(e => {
-          return e.saleRemark
-        })
-        .sort()
-      this.filterConsigneeList = []
-      this.filterCarrierList = []
-      this.filterCapacityList = []
-      this.filtermaterialNameList = []
-      this.filterSaleAreaList = []
-      this.filterorderStatus = []
-      this.filteraddressPlace = []
-      this.filtermaterialSpe = []
-      this.filterSaleOrderStatus = []
-      this.filterSaleRemark = []
-      Array.from(new Set(consigneeNameList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterConsigneeList.push(map)
-      })
-      Array.from(new Set(carrierNameList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterCarrierList.push(map)
-      })
-      Array.from(new Set(capacityList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterCapacityList.push(map)
-      })
-      Array.from(new Set(materialNameList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filtermaterialNameList.push(map)
-      })
-      Array.from(new Set(saleAreaList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterSaleAreaList.push(map)
-      })
-      Array.from(new Set(addressPlaceList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filteraddressPlace.push(map)
-      })
-      Array.from(new Set(orderStatusList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterorderStatus.push(map)
-      })
-      Array.from(new Set(materialSpeList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filtermaterialSpe.push(map)
-      })
-      Array.from(new Set(saleOrderStatusList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterSaleOrderStatus.push(map)
-      })
-      Array.from(new Set(saleRemarkList)).forEach(e => {
-        let map = {}
-        map.text = e
-        map.value = e
-        this.filterSaleRemark.push(map)
-      })
-    },
+    // filterListChange() {
+    //   //客户筛选数组
+    //   // let consigneeNameList = this.tableData
+    //   //   .map(e => {
+    //   //     return e.consigneeName
+    //   //   })
+    //   //   .sort()
+    //   //承运商筛选数组
+    //   // let carrierNameList = this.tableData
+    //   //   .map(e => {
+    //   //     return e.carrierName
+    //   //   })
+    //   //   .sort()
+    //   //车牌号筛选数组
+    //   // let capacityList = this.tableData
+    //   //   .map(e => {
+    //   //     return e.newCapacityNo
+    //   //   })
+    //   //   .sort()
+    //   //物资筛选数组
+    //   // let materialNameList = this.tableData
+    //   //   .map(e => {
+    //   //     return e.materialName
+    //   //   })
+    //   //   .filter(e => {
+    //   //     return e != null
+    //   //   })
+    //   //   .sort()
+    //   //销售片区筛选数组
+    //   let saleAreaList = this.tableData
+    //     .map(e => {
+    //       return e.areaName
+    //     })
+    //     .filter(e => {
+    //       return e != null
+    //     })
+    //   let addressPlaceList = this.tableData
+    //     .map(e => {
+    //       return e.addressPlace
+    //     })
+    //     .filter(e => {
+    //       return e != null
+    //     })
+    //     .sort()
+    //   let orderStatusList = this.tableData
+    //     .map(e => {
+    //       return e.orderStatus
+    //     })
+    //     .filter(e => {
+    //       return e != null
+    //     })
+    //   let materialSpeList = this.tableData
+    //     .map(e => {
+    //       return e.materialSpe
+    //     })
+    //     .filter(e => {
+    //       return e != null
+    //     })
+    //     .sort()
+    //   let saleOrderStatusList = this.tableData.map(e => {
+    //     return e.saleOrderStatus
+    //   })
+    //   let saleRemarkList = this.tableData
+    //     .map(e => {
+    //       return e.saleRemark
+    //     })
+    //     .sort()
+    //   // this.filterConsigneeList = []
+    //   // this.filterCarrierList = []
+    //   // this.filterCapacityList = []
+    //   // this.filtermaterialNameList = []
+    //   this.filterSaleAreaList = []
+    //   this.filterorderStatus = []
+    //   this.filteraddressPlace = []
+    //   this.filtermaterialSpe = []
+    //   this.filterSaleOrderStatus = []
+    //   this.filterSaleRemark = []
+    //   // Array.from(new Set(consigneeNameList)).forEach(e => {
+    //   //   let map = {}
+    //   //   map.text = e
+    //   //   map.value = e
+    //   //   this.filterConsigneeList.push(map)
+    //   // })
+    //   Array.from(new Set(carrierNameList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filterCarrierList.push(map)
+    //   })
+    //   Array.from(new Set(capacityList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filterCapacityList.push(map)
+    //   })
+    //   Array.from(new Set(materialNameList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filtermaterialNameList.push(map)
+    //   })
+    //   Array.from(new Set(saleAreaList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filterSaleAreaList.push(map)
+    //   })
+    //   Array.from(new Set(addressPlaceList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filteraddressPlace.push(map)
+    //   })
+    //   Array.from(new Set(orderStatusList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filterorderStatus.push(map)
+    //   })
+    //   Array.from(new Set(materialSpeList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filtermaterialSpe.push(map)
+    //   })
+    //   Array.from(new Set(saleOrderStatusList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filterSaleOrderStatus.push(map)
+    //   })
+    //   Array.from(new Set(saleRemarkList)).forEach(e => {
+    //     let map = {}
+    //     map.text = e
+    //     map.value = e
+    //     this.filterSaleRemark.push(map)
+    //   })
+    // },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
         column.property == 'arrivalAddress' ||
@@ -3001,15 +3004,11 @@ export default {
                   this.operation(this.steelMap)
                 }
               })
-              // this.operation(this.steelMap)
-              // this.getSteelReport()
               loading.close()
             }
           })
           .catch(() => {
             this.$message.success('变更失败，请联系管理员')
-            this.operation(this.steelMap)
-            this.getSteelReport()
             loading.close()
           })
       } else {
@@ -3396,23 +3395,23 @@ export default {
         })
     },
     //将序号确定下来
-    getNodeNum(data) {
-      // for (var i = 0; i < data.length; i++) {
-      //   if (i === 0) {
-      //     data[i].group = i
-      //     data[i].rowKey = i
-      //   } else {
-      //     // 判断当前元素与上一个元素是否相同
-      //     if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
-      //       data[i].group = data[i - 1].group
-      //       data[i].rowKey = i
-      //     } else {
-      //       data[i].group = data[i - 1].group + 1
-      //       data[i].rowKey = i
-      //     }
-      //   }
-      // }
-    },
+    // getNodeNum(data) {
+    //   for (var i = 0; i < data.length; i++) {
+    //     if (i === 0) {
+    //       data[i].group = i
+    //       data[i].rowKey = i
+    //     } else {
+    //       // 判断当前元素与上一个元素是否相同
+    //       if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+    //         data[i].group = data[i - 1].group
+    //         data[i].rowKey = i
+    //       } else {
+    //         data[i].group = data[i - 1].group + 1
+    //         data[i].rowKey = i
+    //       }
+    //     }
+    //   }
+    // },
     //记录每一行的合并数
     getSpanArr(data) {
       //每次调用方法初始化
@@ -3447,24 +3446,23 @@ export default {
       }
     },
     //计算总件数和总车数
-    getTotalNum(data) {
-      //通过车序号的个数来计算车数
-      let arr = []
-      arr = data.map(e => {
-        if (
-          e.capacityNo != '取消' &&
-          e.saleOrderStatus != '关闭' &&
-          e.saleOrderStatus != '反审批' &&
-          e.orderStatus != '已关闭'
-        ) {
-          return e.saleOrderMaterialId
-        }
-      })
-      this.totalCapacity = Array.from(new Set(arr)).length
-      this.totalNumber = data.reduce(function(prev, item) {
-        return prev + item.materialNum
-      }, 0)
-    },
+    // getTotalNum(data) {
+    //   //通过车序号的个数来计算车数
+    //   let arr = []
+    //   arr = data.map(e => {
+    //     if (
+    //       e.capacityNo != '取消' &&
+    //       e.saleOrderStatus != '反审批' &&
+    //       e.orderStatus != '已关闭'
+    //     ) {
+    //       return e.saleOrderMaterialId
+    //     }
+    //   })
+    //   this.totalCapacity = Array.from(new Set(arr)).length
+    //   this.totalNumber = data.reduce(function(prev, item) {
+    //     return prev + item.materialNum
+    //   }, 0)
+    // },
     //减少物资件数
     updateBillOrder(row) {
       const loading = this.$loading({
@@ -3635,11 +3633,23 @@ export default {
             '&easPrimaryId=' +
             easPrimaryId,
           obj,
-          { timeout: 5000000 }
+          {
+            timeout: 10 * 60 * 1000
+          }
         )
         .then(res => {
           this.tableData = res.data.data
-          this.getNodeNum(this.tableData)
+          this.totalNumber = res.data.data[0].totalNumber
+          this.totalCapacity = res.data.data[0].totalCapacity
+          this.filterConsigneeList = res.data.data[0].filterConsigneeList
+          this.filterCarrierList = res.data.data[0].filterCarrierList
+          this.filterCapacityList = res.data.data[0].filterCapacityList
+          this.filtermaterialNameList = res.data.data[0].filtermaterialNameList
+          this.filterorderStatus = res.data.data[0].filterorderStatus
+          this.filteraddressPlace = res.data.data[0].filteraddressPlace
+          this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
+          this.filterSaleRemark = res.data.data[0].filterSaleRemark
+          // this.getNodeNum(this.tableData)
           this.visibleList = []
           this.maxHeight = window.innerHeight - 130
           this.visibleList = this.tableData.slice(
@@ -3647,10 +3657,14 @@ export default {
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
           this.getSpanArr(this.visibleList)
-          this.getTotalNum(this.tableData)
+          // this.getTotalNum(this.tableData)
           this.maxHeight = window.innerHeight - 130
           loading.close()
         })
+        .catch(() => {
+          loading.close()
+          this.$message.error('查询失败')
+        })
     },
     //重新获取表格数据
     refresh() {
@@ -3672,7 +3686,6 @@ export default {
       let carrierSsoId = null
       let carrierName = null
       let consigneeName = null
-      let consigneeSsoId = null
       let consigneeLoginName = null
       let capacityNo = null
       let remark = null
@@ -3736,10 +3749,20 @@ export default {
             '&capacityNo=' +
             capacityNo,
           this.filterMap,
-          { timeout: 600000 }
+          { timeout: 6000000 }
         )
         .then(res => {
           this.tableData = res.data.data
+          this.totalNumber = res.data.data[0].totalNumber
+          this.totalCapacity = res.data.data[0].totalCapacity
+          this.filterConsigneeList = res.data.data[0].filterConsigneeList
+          this.filterCarrierList = res.data.data[0].filterCarrierList
+          this.filterCapacityList = res.data.data[0].filterCapacityList
+          this.filtermaterialNameList = res.data.data[0].filtermaterialNameList
+          this.filterorderStatus = res.data.data[0].filterorderStatus
+          this.filteraddressPlace = res.data.data[0].filteraddressPlace
+          this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
+          this.filterSaleRemark = res.data.data[0].filterSaleRemark
           if (
             getCookie('orgCode') == 'shouhuokehu' &&
             this.tableData[0].isGcKeHu == '0'
@@ -3748,15 +3771,25 @@ export default {
               return e != '净重'
             })
           }
+          // console.log(this.visibleList[0].rowKey)
+          let a = 1
+          // console.log(a, 'a')
+          if (
+            this.visibleList.length > 0 &&
+            this.visibleList.length < this.tableData.length
+          ) {
+            a = this.visibleList[0].rowKey
+          }
           this.visibleList = []
           this.maxHeight = window.innerHeight - 130
-          this.getNodeNum(this.tableData)
+          // this.getNodeNum(this.tableData)
           this.visibleList = this.tableData.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
           this.getSpanArr(this.visibleList)
-          this.getTotalNum(this.tableData)
+          this.$refs.tableRef.bodyWrapper.scrollTop = 30 * (a - 1)
+          // this.getTotalNum(this.tableData)
           loading.close()
         })
         .catch(() => {

src/views/statisticalReport/router/index.js

@@ -255,7 +255,8 @@ const constantRouterMap = [
         path: 'saleSteelReports',
         name: 'saleSteelReports',
         meta: {
-          code: 'xtpzgl-yhgl'
+          code: 'xtpzgl-yhgl',
+          keepAlive: true
         },
         component: saleSteelReports
       },