2022.4.14已填未填工时列表调整

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1321,7 +1321,11 @@
                 monthTotal: 0,
                 monthTotalPage: 0,
                 monthTotalLages: 20,
-                monthworkDateS1: []
+                monthworkDateS1: [],
+                monthnotTotal: 0,
+                monthnotTotalPage: 0,
+                monthnotTotalLages: 20,
+                monthnotworkDateS1: []
             };
         },
         filters: {
@@ -1904,9 +1908,10 @@
                 }, 1000);
             }
 
-            this.$nextTick(function(){
-                this.$refs.hasworkTbl.doLayout();
-            });
+            // this.$nextTick(function(){
+            //     this.$refs.hasworkTbl.doLayout();
+            // });
+            this.$forceUpdate()
           }
         },
         (error) => {
@@ -1959,9 +1964,29 @@
           if (res.code == "ok") {
               this.tbload = false
             this.monthNotWorkDate = res.data;
-            this.monthNotWorkDateS = this.monthNotWorkDate
-            this.$forceUpdate();
+            // this.monthNotWorkDateS = this.monthNotWorkDate
+            
             // console.log("monthNotWorkDate", this.monthNotWorkDate);
+            this.monthnotworkDateS1 = res.data
+            this.monthnotTotal = res.data.length
+            // console.log('列表的总数据', this.monthworkDateS)
+            var infoList = []
+
+            if (this.monthnotworkDateS1.length > 20) {
+                this.monthnotworkDateS1.forEach((val ,i) => {
+                if (i < 20) {
+                    infoList.push(val)
+                }
+                })
+            }
+            this.monthNotWorkDateS = infoList
+            // 判断
+            if (this.monthnotworkDateS1.length > 0) {
+                setTimeout(() => {
+                    this.tableListenernot()
+                }, 1000);
+            }
+            this.$forceUpdate();
           }
         },
         (error) => {
@@ -1973,6 +1998,31 @@
         }
       );
     },
+    tableListenernot(){
+      let that = this;
+      // this.$refs.maTable.bodyWarpper 
+      let dom2 = that.$refs.hasworkTbl2.bodyWrapper;
+      console.log(dom2)
+      	  // 添加scroll监听事件
+          dom2.addEventListener("scroll", function () {
+          // scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
+            const scrollDistance2 = dom2.scrollHeight - dom2.scrollTop - dom2.clientHeight;
+            if (scrollDistance2 < 2) {
+              if (that.monthNotWorkDateS.length < that.monthnotworkDateS1.length) {
+                that.monthnotTotalPage++; //当前页数自增
+                console.log(that.monthnotworkDateS1.length, that.monthNotWorkDateS.length, that.monthnotTotalPage, that.monthnotTotalLages, that.monthnotTotalPage * that.monthnotTotalLages)
+                var arrList = JSON.parse(JSON.stringify(that.monthnotworkDateS1))
+                var infoList = arrList.splice(
+                  that.monthnotTotalPage * that.monthnotTotalLages,
+                  that.monthnotTotalLages
+                );
+                console.log(infoList, '将要合并的数据')
+                // 数据添加
+                that.monthNotWorkDateS = that.monthNotWorkDateS.concat(infoList);
+              }
+            }
+          })
+    },
     // 获取默认这zhou日期参数 222
     getLastWeek(e){
       let newdate = new Date()