2022.4.14

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

@@ -1860,9 +1860,9 @@
         }else{
             let sedate = new Date(this.date)
             let semonth = sedate.getMonth() + 1
-            // let seday = new Date(sedate.getFullYear(), semonth, 0).getDate()
+            let seday = new Date(sedate.getFullYear(), semonth, 0).getDate()
             let sedates1 = sedate.getFullYear() + '-' + (semonth < 10 ? '0' + semonth : semonth) + '-01'
-            let sedates2 = sedate.getFullYear() + '-' + (semonth < 10 ? '0' + semonth : semonth) + '-07'
+            let sedates2 = sedate.getFullYear() + '-' + (semonth < 10 ? '0' + semonth : semonth) + '-' + seday
             return [sedates1, sedates2]
         }
     },
@@ -1927,7 +1927,7 @@
           dom.addEventListener("scroll", function () {
           // scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
             const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
-            if (scrollDistance <= 1) {
+            if (scrollDistance < 2) {
               if (that.monthworkDateS.length < that.monthworkDateS1.length) {
                 that.monthTotalPage++; //当前页数自增
                 console.log(that.monthworkDateS1.length, that.monthworkDateS.length, that.monthTotalPage, that.monthTotalLages, that.monthTotalPage * that.monthTotalLages)