2022.4.29

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

@@ -1410,22 +1410,49 @@
             },
             searchScreen(e){
                 if(e){
-                    this.monthNotWorkDateS = []
+                    
+                    this.monthNotWorkDateS1 = []
                     for (let i = 0; i < this.monthNotWorkDate.length; i++) {
                         if(this.monthNotWorkDate[i].name.indexOf(this.searchKeyword) != -1){
-                            this.monthNotWorkDateS.push(this.monthNotWorkDate[i])
+                            this.monthNotWorkDateS1.push(this.monthNotWorkDate[i])
                         }
                     }
+                    if (this.monthworkDateS1.length > 20) {
+                this.monthworkDateS = this.monthworkDateS1.slice(0,20);
+            }else{
+                this.monthworkDateS = this.monthworkDateS1 
+            }
+            
+            // this.monthworkDateS = infoList
+            // 判断
+            if (this.monthworkDateS1.length > 0) {
+                setTimeout(() => {
+                    this.tableListener()
+                }, 1000);
+            }
                     // this.$nextTick(()=>{
                     //     this.$refs.hasworkTbl2.doLayout();
                     // });
                 }else{
-                    this.monthworkDateS = []
+                    this.monthworkDateS1 = []
                     for (let i = 0; i < this.monthworkDate.length; i++) {
                         if(this.monthworkDate[i].name.indexOf(this.searchKeyword) != -1){
-                            this.monthworkDateS.push(this.monthworkDate[i])
+                            this.monthworkDateS1.push(this.monthworkDate[i])
                         }
                     }
+                    if (this.monthworkDateS1.length > 20) {
+                this.monthworkDateS = this.monthworkDateS1.slice(0,20);
+            }else{
+                this.monthworkDateS = this.monthworkDateS1 
+            }
+            
+            // this.monthworkDateS = infoList
+            // 判断
+            if (this.monthworkDateS1.length > 0) {
+                setTimeout(() => {
+                    this.tableListener()
+                }, 1000);
+            }
                     // this.$nextTick(()=>{
                     //     this.$refs.hasworkTbl.doLayout();
                     // });