From 6974020e5124e76fcd1a02a460792b5eaf0d9290 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Sun, 29 Sep 2024 10:29:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=8E=87=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=202.=E9=83=A8=E9=97=A8=E5=91=A8=E6=8A=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=88=A4=E6=96=AD=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?flag=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=88=A4=E6=96=AD=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=98=AF=E9=83=A8=E9=97=A8/=E5=85=A8=E6=89=80?=
 =?UTF-8?q?=E5=91=A8=E6=8A=A5=E4=BF=AE=E6=94=B9=203.=E5=85=A8=E6=89=80?=
 =?UTF-8?q?=E5=91=A8=E6=8A=A5=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weekly/projectBudget/ProjectBudgetApply.vue             | 6 ++++++
 .../wholeFirmWeekly/WholeFirmWeeklyEdit.vue                 | 6 ++++--
 .../wholeFirmWeekly/WholeFirmWeeklyList.vue                 | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue
index 7d867d2..bc0e90e 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue
@@ -99,6 +99,7 @@ export default {
               id: dataList[i].id,
               projectNo: dataList[i].projectNo,
               projectName: dataList[i].projectName,
+              deptName: dataList[i].deptName,
               week: dataList[i].week,
               budget: dataList[i].budget,
               execute: dataList[i].execute,
@@ -172,6 +173,11 @@ export default {
           prop: 'projectName',
           show: true
         },
+        {
+          label: "执行部门",
+          prop: 'deptName',
+          show: true
+        },
         {
           label: '周数',
           prop: 'week',
diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
index 69cca89..31da2bc 100644
--- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
@@ -105,6 +105,7 @@ export default {
       expandRight: false,
       app: app,
       reimburseId: '',
+      flag: '',
       actionUrl: `${baseUrl}/api/common/file-upload`,     // 上传路径
       baseUrl: baseUrl,
       formAll: [],
@@ -173,12 +174,13 @@ export default {
   methods: {
     init () {
       this.reimburseId = this.$route.params.id
+      this.flag = this.$route.params.flag
       this.getWeekly()
-
     },
     getWeekly () {
       let ProjectWeekly = {
-        id: this.reimburseId
+        id: this.reimburseId,
+        flag: this.flag
       }
       Api.ProjectManagements.getDepartmentWeekly(ProjectWeekly).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 97ca988..ffec8b3 100644
--- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue
@@ -294,7 +294,10 @@ export default {
     updateById (id) {
       this.$router.push({
         name: "WholeFirmWeeklyEdit",
-        params: {id}
+        params: {
+          id,
+          flag: '1'
+        }
       })
     },
     updateWorkload (id) {