From 490dcf13021234668e248199aecf30e25eeb4bfd Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Mon, 22 Jul 2024 16:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E5=85=A8=E6=89=80?=
 =?UTF-8?q?=E5=91=A8=E6=8A=A5=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=92=8C=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2bug=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../departmentWeekly/DepartmentWeeklyList.vue | 28 ++++++---------
 .../wholeFirmWeekly/WholeFirmWeeklyList.vue   | 35 ++++++++-----------
 2 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
index bcab12c..7cdd929 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
@@ -228,38 +228,30 @@
       changeSize (size) {
         console.log(size)
         this.pageSize = size
+        this.fetchData(1)
+      },
+      fetchData (pageNo = 1) {
+        console.log('翻页。。。' + pageNo)
+        // 异步获取远程数据（ajax）
+        this.pageNo = pageNo
         let projectWeeklyFindReq = {
           pageNo: this.pageNo,
           pageSize: this.pageSize
         }
         // this.pageLoading = true;
         Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{
-          this.tableRowsData = [];
-          this.pageLoading = false;
-          console.log("周报填报列表",result)
-          if (result.status === 0) {
             this.dataList = result.data.ls;
             this.total = result.data.total;
-            for (let i=0; i<this.dataList.length; i++) {
-              this.tableRowsData.push({
-                projectNo: this.dataList[i].projectNo,
-                projectName: this.dataList[i].projectName,
-                userName: this.dataList[i].userName,
-                workload: this.dataList[i].workload,
-                thisWeek: this.dataList[i].thisWeek,
-                nextWeek: this.dataList[i].nextWeek
-              })
-            }
-            console.log("tableRowsData",this.tableRowsData)
-          }
         })
       },
       onSubmit (searchForm) {
+        let projectName = searchForm.projectName.trim() !== '' ? searchForm.projectName : null;
+        let week = searchForm.week.trim() !== '' ? searchForm.week : null;
         let projectWeeklyFindReq = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          projectName: searchForm.projectName,
-          week: searchForm.week
+          projectName: projectName,
+          week: week
         }
         Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result => {
           this.tableRowsData = [];
diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue
index 0237deb..a508cfd 100644
--- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue
@@ -237,39 +237,32 @@ export default {
     changeSize (size) {
       console.log(size)
       this.pageSize = size
+      this.fetchData(1)
+    },
+    fetchData (pageNo = 1) {
+      console.log('翻页。。。' + pageNo)
+      // 异步获取远程数据（ajax）
+      this.pageNo = pageNo
       let projectWeeklyFindReq = {
         pageNo: this.pageNo,
         pageSize: this.pageSize
       }
       // this.pageLoading = true;
       Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{
-        this.tableRowsData = [];
-        this.pageLoading = false;
-        console.log("周报填报列表",result)
-        if (result.status === 0) {
-          this.dataList = result.data.ls;
-          this.total = result.data.total;
-          for (let i=0; i<this.dataList.length; i++) {
-            this.tableRowsData.push({
-              projectNo: this.dataList[i].projectNo,
-              projectName: this.dataList[i].projectName,
-              userName: this.dataList[i].userName,
-              workload: this.dataList[i].workload,
-              thisWeek: this.dataList[i].thisWeek,
-              nextWeek: this.dataList[i].nextWeek
-            })
-          }
-          console.log("tableRowsData",this.tableRowsData)
-        }
+        this.dataList = result.data.ls;
+        this.total = result.data.total;
       })
     },
     onSubmit (searchForm) {
+      let projectName = searchForm.projectName.trim() !== '' ? searchForm.projectName : null;
+      let week = searchForm.week.trim() !== '' ? searchForm.week : null;
+      let deptName = searchForm.deptName.trim() !== '' ? searchForm.deptName : null;
       let projectWeeklyFindReq = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        projectName: searchForm.projectName,
-        week: searchForm.week,
-        deptName: searchForm.deptName
+        projectName: projectName,
+        week: week,
+        deptName: deptName
       }
       Api.ProjectManagements.getWholeFirmWeekly(projectWeeklyFindReq).then(result => {
         this.tableRowsData = [];