修改

build/utils.js

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

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

@@ -1907,24 +1907,27 @@ export default {
             val >=
             this.tableData.length * 30 -
               document.querySelector('.el-table__body-wrapper').offsetHeight -
-              20
+              30
           ) {
+            console.log('val', val)
             val =
               this.tableData.length * 30 -
-              document.querySelector('.el-table__body-wrapper').offsetHeight
+              document.querySelector('.el-table__body-wrapper').offsetHeight -
+              20
           }
           if (val <= 0) {
             val = 0
           }
-          document.querySelector(
-            '.el-table__body-wrapper .el-table__body'
-          ).style.transform = `translateY(${val}px)`
+          console.log(val, 'val')
           const start = Math.floor(val / this.itemHeight)
           this.visibleList = this.tableData.slice(
             start,
             start + Math.floor(this.maxHeight / this.itemHeight) + 1
           )
           this.getSpanArr(this.visibleList)
+          document.querySelector(
+            '.el-table__body-wrapper .el-table__body'
+          ).style.transform = `translateY(${val}px)`
         })
       }
     }
@@ -1947,9 +1950,17 @@ export default {
       if (this.debounceS) return
       this.debounceS = true
       this.scrollTop = e.target.scrollTop
+      console.log(
+        document.querySelector('.el-table__body-wrapper .el-table__body').style
+          .transform,
+        'yyyyy'
+      )
       setTimeout(() => {
         this.debounceS = false
-      }, 70)
+      }, 60)
+      // document.querySelector(
+      //   '.el-table__body-wrapper .el-table__body'
+      // ).style.transform = `translateY(0px)`
     })
   },
   activated() {
@@ -3670,6 +3681,21 @@ export default {
           loading.close()
         })
     },
+    //将序号确定下来
+    getNodeNum(data) {
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          data[i].group = i
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+            data[i].group = data[i - 1].group
+          } else {
+            data[i].group = data[i - 1].group + 1
+          }
+        }
+      }
+    },
     //记录每一行的合并数
     getSpanArr(data) {
       //每次调用方法初始化
@@ -3677,18 +3703,18 @@ export default {
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
           this.spanArr.push(1)
-          data[i].group = i
+          // data[i].group = i
           this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
             this.spanArr[this.pos] += 1
-            data[i].group = data[i - 1].group
+            // data[i].group = data[i - 1].group
             this.spanArr.push(0)
           } else {
             this.spanArr.push(1)
             this.pos = i
-            data[i].group = data[i - 1].group + 1
+            // data[i].group = data[i - 1].group + 1
           }
         }
       }
@@ -3895,6 +3921,7 @@ export default {
         )
         .then(res => {
           this.tableData = res.data.data
+          this.getNodeNum(this.tableData)
           this.totalHeight += this.itemHeight
           this.totalHeight += this.itemHeight
           this.visibleList = []
@@ -4003,15 +4030,14 @@ export default {
           this.totalHeight += this.itemHeight
           this.visibleList = []
           this.maxHeight = window.innerHeight - 130
+          this.getNodeNum(this.tableData)
           this.visibleList = this.tableData.slice(
             0,
             Math.floor(this.maxHeight / this.itemHeight) + 1
           )
-          console.log(this.visibleList)
           this.getSpanArr(this.visibleList)
+          console.log(this.visibleList)
           this.getTotalNum(this.tableData)
-
-          console.log(this.maxHeight, 'this.maxHeight')
           loading.close()
         })
         .catch(() => {