From 2f6519eef8e7c790c3cfba4ae615eea27a788b7c Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 15 Dec 2023 10:43:26 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/BaseInfoTableModal.vue                   | 12 +++++++++++-
 .../modules/EngineerInitBaseInfo.vue                 |  4 +---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index a5f9b9d9..9685945d 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -961,7 +961,17 @@ export default {
           if (formInline.enStandardCode) {
             formInline.enStandardCode_dictText = this.$refs.enStandardCodeRef.dictOptions.find(item => item.value === formInline.enStandardCode).text
           }
-          // 主起草单位的回显需要在登录信息中有当前登录人部门的翻译 ？？
+          // 处理标准体系
+          if (formInline.enStandardSystem && formInline.enStandardSystem.length > 0) {
+            formInline.enStandardSystem = formInline.enStandardSystem.map(item => item.value).join(',')
+          } else {
+            formInline.enStandardSystem = ''
+          }
+          // 主起草单位如果没有翻译字段，说明就是当前登录人没有重新选
+          const currentUser = Vue.ls.get(USER_INFO)
+          if (!formInline.mainDraftingUnit_dictText) {
+            formInline.mainDraftingUnit_dictText = currentUser.departIds_dicText
+          }
           this.$emit('ok', formInline)
           this.close()
           this.confirmLoading = false
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
index c1288742..264cdf3e 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
@@ -309,9 +309,7 @@ export default {
       // 校验表格是否每行都有数据，每行的联络人是否都有
       let data = {}
       if (this.dataSource && this.dataSource.length > 0) {
-        data.dataSource = this.dataSource.map(item => {
-          return { ...item, enStandardSystem: item.enStandardSystem ? item.enStandardSystem.join(',') : ''}
-        })
+        data.dataSource = this.dataSource
         let hasErr = false
         for (const item of this.dataSource) {
           if (!item.contactUser) {