修改

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

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

@@ -144,7 +144,7 @@
             合并或拆分
           </el-button>
         </el-form-item>
-         <el-form-item v-if="isShowOperate">
+        <el-form-item v-if="isShowOperate">
           <el-button
             type="primary"
             @click="showSaleLog()"
@@ -235,11 +235,12 @@
         <el-table-column
           prop="consigneeName"
           label="客户"
-          width="180px"
+          width="200px"
           align="center"
           column-key="consigneeName"
           :filters="filterConsigneeList"
           sortable
+          show-overflow-tooltip
           v-if="!columnNoRoutList.includes('客户')"
         >
         </el-table-column>
@@ -505,8 +506,7 @@
         <el-table-column
           prop="isAccept"
           label="异地库接收标志"
-          width="80px"
-          show-overflow-tooltip
+          width="100px"
           align="center"
           v-if="!columnNoRoutList.includes('异地库接收标志')"
         >
@@ -1367,9 +1367,12 @@
         center
         title="操作日志"
       >
-        <el-form >
+        <el-form>
           <el-form-item label="请输入查询：">
-            <el-input v-model="optionSaleLog.requestQuery.con" style="width:300px"></el-input>
+            <el-input
+              v-model="optionSaleLog.requestQuery.con"
+              style="width:300px"
+            ></el-input>
           </el-form-item>
         </el-form>
         <dil-table v-bind.sync="optionSaleLog"></dil-table>
@@ -1391,12 +1394,12 @@ export default {
   },
   data() {
     return {
-      isShowSaleLog:false,
-      optionSaleLog:{
-        maxHeight:400,
-        requestUrl:"/api/v1/ams/selectAllLog?apiId=522",
-        requestQuery:{
-          con:null
+      isShowSaleLog: false,
+      optionSaleLog: {
+        maxHeight: 400,
+        requestUrl: '/api/v1/ams/selectAllLog?apiId=522',
+        requestQuery: {
+          con: null
         }
       },
       isCheckGPS: true,
@@ -1783,7 +1786,6 @@ export default {
       deep: true,
       handler(val) {
         this.$nextTick(() => {
-          console.time('aaa')
           if (
             val >=
             this.tableData.length * 30 -
@@ -1802,14 +1804,11 @@ export default {
             start,
             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')
         })
       }
     }
@@ -1822,7 +1821,11 @@ export default {
     this.$nextTick(() => {
       window.onresize = () => {
         return (() => {
-          this.maxHeight = window.innerHeight - 130
+          this.maxHeight = window.innerHeight - 146
+          console.log(
+            document.querySelector('.el-table__body-wrapper').offsetHeight,
+            'offset'
+          )
         })()
       }
     })
@@ -1844,14 +1847,14 @@ export default {
     })
   },
   activated() {
-    this.maxHeight = window.innerHeight - 130
+    this.maxHeight = window.innerHeight - 146
   },
   computed: {},
   methods: {
-    showSaleLog(){
-      this.isShowSaleLog=true;
+    showSaleLog() {
+      this.isShowSaleLog = true
       if (this.steelMap) {
-        this.optionSaleLog.requestQuery.con=this.steelMap.orderNo;
+        this.optionSaleLog.requestQuery.con = this.steelMap.orderNo
       }
     },
     //删除计量实绩
@@ -2982,7 +2985,7 @@ export default {
       console.log('我只想测')
       this.steelMap.capacityId = this.steelMap.newsCapacityId
       this.steelMap.driverTel = this.steelMap.capacityTel
-      this.steelMap.userId =getCookie("userId")
+      this.steelMap.userId = getCookie('userId')
       if (this.steelMap.newsCapacityId == null) {
         this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
         return
@@ -3689,19 +3692,35 @@ export default {
           this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
           this.filterSaleRemark = res.data.data[0].filterSaleRemark
           // this.getNodeNum(this.tableData)
+          if (
+            getCookie('orgCode') == 'shouhuokehu' &&
+            this.tableData[0].isGcKeHu == '0'
+          ) {
+            this.columnNoRoutList = this.columnNoRoutList.filter(e => {
+              return e != '净重'
+            })
+          }
+          let a = 1
+          if (
+            this.visibleList.length > 0 &&
+            this.visibleList.length < this.tableData.length
+          ) {
+            a = this.visibleList[0].rowKey
+          }
           this.visibleList = []
-          this.maxHeight = window.innerHeight - 130
+          this.maxHeight = window.innerHeight - 146
           this.visibleList = this.tableData.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
           this.getSpanArr(this.visibleList)
+          this.$refs.tableRef.bodyWrapper.scrollTop = 30 * (a - 1)
           // this.getTotalNum(this.tableData)
-          this.maxHeight = window.innerHeight - 130
           loading.close()
         })
         .catch(() => {
           loading.close()
+          this.maxHeight = window.innerHeight - 146
           this.$message.error('查询失败')
         })
     },
@@ -3810,9 +3829,7 @@ 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
@@ -3828,7 +3845,6 @@ export default {
           )
           this.getSpanArr(this.visibleList)
           this.$refs.tableRef.bodyWrapper.scrollTop = 30 * (a - 1)
-          // this.getTotalNum(this.tableData)
           loading.close()
         })
         .catch(() => {