From f4121f89b2f29838417154e18801e2a323dca842 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Fri, 5 Jul 2024 09:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=91=A8=E6=8A=A5=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weekly/ExpenseClaimApply.vue              | 60 ++++++++++++-------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
index 3e96d60..beeb345 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
@@ -85,37 +85,53 @@
         if (userId === '0') {
           this.isSuper = true;
         }
-        this.pageLoading = true;
+        // this.pageLoading = true;
         Api.ProjectManagements.getWeekly().then(result=>{
-          console.log("周报填报列表",result)
-        })
-        Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
-          this.pageLoading = false;
           this.tableRowsData = [];
+          this.pageLoading = false;
+          console.log("周报填报列表",result)
           if (result.status === 0) {
-            this.isEdit = result.data.isEdit;
-            this.tableTotalPage = result.data.total
             let dataList = result.data.ls;
             for (let i=0; i<dataList.length; i++) {
-              let deptName = '';
-              for (let j=0; j<dataList[i].userInfo.dept.length; j++) {
-                deptName += dataList[i].userInfo.dept[j].orgName;
-                if (j < dataList[i].userInfo.dept.length - 1) {
-                  deptName += '>';
-                }
-              }
               this.tableRowsData.push({
-                status: dataList[i].status,
-                id: dataList[i].id,
-                userInfoName: dataList[i].userInfo.userInfoName,
-                category: '报销',
-                deptName: deptName
+                projectNo: dataList[i].projectNo,
+                projectName: dataList[i].projectName,
+                userName: dataList[i].userName,
+                workload: dataList[i].workload,
+                thisWeek: dataList[i].thisWeek,
+                nextWeek: dataList[i].nextWeek
               })
             }
-          } else {
-            this.$message.error(`${result.msg}`);
+            console.log("tableRowsData",this.tableRowsData)
           }
         })
+        // Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
+        //   this.pageLoading = false;
+        //   this.tableRowsData = [];
+        //   if (result.status === 0) {
+        //     this.isEdit = result.data.isEdit;
+        //     this.tableTotalPage = result.data.total
+        //     let dataList = result.data.ls;
+        //     for (let i=0; i<dataList.length; i++) {
+        //       let deptName = '';
+        //       for (let j=0; j<dataList[i].userInfo.dept.length; j++) {
+        //         deptName += dataList[i].userInfo.dept[j].orgName;
+        //         if (j < dataList[i].userInfo.dept.length - 1) {
+        //           deptName += '>';
+        //         }
+        //       }
+        //       this.tableRowsData.push({
+        //         status: dataList[i].status,
+        //         id: dataList[i].id,
+        //         userInfoName: dataList[i].userInfo.userInfoName,
+        //         category: '报销',
+        //         deptName: deptName
+        //       })
+        //     }
+        //   } else {
+        //     this.$message.error(`${result.msg}`);
+        //   }
+        // })
       },
       //初始化tableColumns
       initTableColumns () {
@@ -132,7 +148,7 @@
           },
           {
             label: '员工姓名',
-            prop: 'userNam',
+            prop: 'userName',
             show: true
           },
           {