From 4de1c67d0209f441e20e23252283e9c1281afb51 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Sat, 12 Oct 2024 14:45:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E9=97=A8=E5=91=A8=E6=8A=A5=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E5=90=8E=E5=88=B7=E6=96=B0=E4=B8=8B=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=202.=E5=85=A8=E6=89=80=E5=91=A8=E6=8A=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../departmentWeekly/DepartmentWeeklyList.vue              | 1 +
 .../wholeFirmWeekly/WholeFirmWeeklyEdit.vue                | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
index fdc2c3d..0c4df86 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
@@ -312,6 +312,7 @@
         })
         this.disabledButtons.push(row.id);
         localStorage.setItem('disabledButtons', JSON.stringify(this.disabledButtons));
+        this.init()
       },
       isButtonDisabled (id) {
         return this.disabledButtons.includes(id);
diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
index 31da2bc..9dcfd86 100644
--- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
@@ -55,7 +55,7 @@
             <el-form-item>
               <div style="float: right">
                 <el-button @click="cancel()" type="default">取消</el-button>
-                <el-button @click="save('formName')" type="primary" :disabled="formAll.userId !== formAll.ls[0].ext.projectAdmin">修改</el-button>
+                <el-button @click="save('formName')" type="primary" :disabled="userId !== formAll.ls[0].ext.projectAdmin">修改</el-button>
               </div>
             </el-form-item>
           </el-form>
@@ -74,6 +74,7 @@ import app from '../../../assets/js/common/app.js'
 import {baseUrl} from '../../../config/env.js'
 import verifyButton from '../../../components/verifyButton.vue'
 import FlowRecordTable from '../../../components/FlowRecordTable.vue'
+import {getItem} from '../../../config/mUtils'
 
 export default {
   beforeRouteEnter (to, from, next) {
@@ -146,11 +147,13 @@ export default {
       canEditReimburseCategory: false, //标识是否能改报销分类
       canEditBudgetCategory: false, //标识是否能改预算类别
       isVerify: false,
-      isNotVerifyReady: false     // 是否未审核
+      isNotVerifyReady: false,     // 是否未审核
     }
   },
   created () {
     this.taskId = this.$route.params.taskId
+    this.userId=getItem("userId")
+    console.log("userId",this.userId)
     if (this.$route.name === 'ExpenseClaimApplyEdit') {
       this.isEdit = true
       this.flowId = this.$route.params.id