From cee0685660308f30f63a328df226b569dfdb940f Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Mon, 15 Jul 2024 15:52:59 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9+=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../departmentWeekly/DepartmentWeeklyEdit.vue | 19 +++++++++++++++----
 .../departmentWeekly/DepartmentWeeklyList.vue |  7 +++----
 .../src/server/projectManagements/index.js    |  4 ++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
index 832dfd0..3084d2d 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
@@ -82,6 +82,9 @@ export default {
       projectName: '',
       money: '',
       projectNo: '',
+      NowUserId: '',
+      draftManId: '',
+      projectManagerData: '',
       expandRight: false,
       app: app,
       reimburseId: '',
@@ -168,6 +171,9 @@ export default {
           this.formModel = dataList
           this.formModel.userInfoId = dataList.ext.userName
           this.formModel.deptId = dataList.ext.deptName
+          this.NowUserId = result.data.userId
+          this.draftManId = dataList.ext.draftManId
+          this.projectManagerData = dataList.ext.projectManagerData
         }
       })
     },
@@ -333,6 +339,11 @@ export default {
       this.$router.go(-1)
     },
     save (formName) {
+      if (this.NowUserId === this.draftManId && this.NowUserId === this.projectManagerData) {
+        this.isSave = true
+      } else {
+        this.isSave = false
+      }
       console.log('formName', formName)
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -348,15 +359,15 @@ export default {
                 projectName: this.formModel.projectName,
                 projectNo: this.formModel.projectNo,
                 deptName: this.formModel.deptId,
-                userName: this.formModel.userInfoId
+                userName: this.formModel.userInfoId,
+                draftManId: this.formModel.draftManId,
+                projectManagerData: this.formModel.projectManagerData
               }
             }
           }
-          this.isSave = false
           Api.ProjectManagements.addWeekly(data.projectWeeklyAddReq).then(result => {
-            this.isSave = true
             if (result.status === 0) {
-              this.$message.info(result.data)
+              this.$message.success(result.data)
               this.$router.push({name: 'DepartmentWeeklyList'})
             } else {
               this.$message.error(result.data)
diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
index 6c20a27..e012834 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
@@ -41,7 +41,6 @@
       </template>
     </el-table-column>
   </el-table>
-
       <!-- 分页组件 -->
       <el-pagination
         :current-page="pageNo"
@@ -114,7 +113,7 @@
         formDataInfo: false,
         // 分页
         pageNo: 1, // 默认页码
-        pageSize: 1, // 每页记录数
+        pageSize: 10, // 每页记录数
         total: null,
         tableTotalPage: 1,
         tableColumnsData: [],
@@ -241,10 +240,10 @@
           params: {id}
         })
       },
-      updateWorkload (id) {
+      updateWorkload (index) {
         this.$router.push({
           name: "DepartmentWorkloadEdit",
-          params: {id}
+          params: {id: this.tableRowsData[index].id}
         })
       }
       },
diff --git a/kehui-oa-front/src/server/projectManagements/index.js b/kehui-oa-front/src/server/projectManagements/index.js
index 695d5b0..9cb5922 100644
--- a/kehui-oa-front/src/server/projectManagements/index.js
+++ b/kehui-oa-front/src/server/projectManagements/index.js
@@ -62,7 +62,7 @@ export default {
   /**
    * 部门周报填报管理
    * */
-  getDepartmentWeekly: (param) => Ax('post', '/api/project/departmentWeekly', param.data),
-  getWorkLoad: (id) => Ax('get', `/api/project/departmentWeekly/showById/${id}`, id)
+  getDepartmentWeekly: (param) => Ax('post', '/api/project/departmentWeekly', param),
+  getWorkLoad: (id) => Ax('get', `/api/project/departmentWeekly/showById/${id}`, id),
   deptDepartmentWeekly: (param) => Ax('post', '/api/project/departmentWeekly/update', param)
 }