From bcc5bda80f4d00f588efc311bb82002538ae889d Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 19 Jul 2024 14:39:32 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=B8=A6=E5=85=A5=E4=B8=BB=E8=B5=B7=E8=8D=89=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ContactEnterSendTaskModal.vue        | 10 +++++-----
 .../modules/ApprovalBaseInfo.vue                 | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index 005da362..b6acd84a 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -864,11 +864,11 @@ export default {
       // 初始化主起草人信息
       formInline.mainDraftingUser = userInfo.id
       formInline.mainDraftingUser_dictText = userInfo.realname + '(' + userInfo.username + ')'
-      // 初始化主起草单位信息,需要翻译当前登录用户的部门，因为表格回显
-      if (userInfo.departIds && userInfo.departIds.split(',').length === 1) {
-        formInline.mainDraftingUnit = userInfo.departIds
-        formInline.mainDraftingUnit_dictText = userInfo.departIds_dictText
-      }
+      // 初始化主起草单位信息,需要翻译当前登录用户的部门，因为表格回显，2024-07-19周变更不带入
+      // if (userInfo.departIds && userInfo.departIds.split(',').length === 1) {
+      //   formInline.mainDraftingUnit = userInfo.departIds
+      //   formInline.mainDraftingUnit_dictText = userInfo.departIds_dictText
+      // }
       // 初始化起草单位负责人 todo： 看怎么获取当前登录人的上级
       // 初始化年代号
       formInline.decadeCode = new Date().getFullYear() + ''
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index 0b899312..1577f275 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -660,10 +660,10 @@ export default {
       // 初始化主起草人信息
       formInline.mainDraftingUser = userInfo.id
       formInline.mainDraftingUser_dictText = userInfo.realname
-      // 初始化主起草单位信息,只有一个部门时才带入
-      if (userInfo.departIds && userInfo.departIds.split(',').length === 1) {
-        formInline.mainDraftingUnit = userInfo.departIds
-      }
+      // 初始化主起草单位信息,只有一个部门时才带入，2024-07-19周变更，不带入
+      // if (userInfo.departIds && userInfo.departIds.split(',').length === 1) {
+      //   formInline.mainDraftingUnit = userInfo.departIds
+      // }
       // 重置年代号
       formInline.decadeCode = new Date().getFullYear() + ''
       formInline.enStandardSystem = []
@@ -987,10 +987,10 @@ export default {
       // 初始化主起草人信息
       formInline.mainDraftingUser = userInfo.id
       formInline.mainDraftingUser_dictText = userInfo.realname
-      // 初始化主起草单位信息
-      if (userInfo.departIds && userInfo.departIds.split(',').length === 1) {
-        formInline.mainDraftingUnit = userInfo.departIds
-      }
+      // 初始化主起草单位信息，2024-07-19周变更不带入
+      // if (userInfo.departIds && userInfo.departIds.split(',').length === 1) {
+      //   formInline.mainDraftingUnit = userInfo.departIds
+      // }
       // 初始化年代号
       formInline.decadeCode = new Date().getFullYear() + ''
       this.formInline = Object.assign({}, formInline)