From fa7573a9bef85294a98a6d5a2733bf0ab84c66b8 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 18 Jan 2024 10:19:58 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug79978?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/zh-cn.js                      |  5 +-
 .../EnterpriseStandardInitChange.vue          | 66 +++++++++----------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 8aecb18..ba46cb4 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -84,7 +84,7 @@ module.exports = {
     authorizationDepart: '授权部门',
     principalDrafter: '主起草人',
     mainDraftUnit: '主起草单位',
-    headOfMainDraftingUnit: '起草单位负责人',
+    headOfMainDraftingUnit: '主起草单位负责人',
     standardPusher: '标准推进人',
     suitUnit: '配合单位',
     projectStatement: '立项说明',
@@ -108,7 +108,8 @@ module.exports = {
     mergeStandardInformation: '合并标准信息',
     typeOfRevision: '制修订类型',
     superintendent: '所长',
-    relatedPersonnel: '相关人员'
+    relatedPersonnel: '相关人员',
+    affiliatedWorkingGroup: '隶属工作组'
   },
   // 年度制修订计划（各部门主动上报）
   revisionPlanActivelyReport: {
diff --git a/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue b/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue
index c48f227..e56c155 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue
@@ -198,6 +198,30 @@
                 <file-display v-if="baseInfoForm[0].compilationDescription" :file-ids="baseInfoForm[0].compilationDescription" />
               </template>
             </van-field>
+            <!--   草稿计划完成日期  -->
+            <calendar-field
+              :label="$t('esInitChange.draftPlanFinishDate')"
+              :placeholder="global.emptyLine"
+              v-model="baseInfoForm[0].draftPlannedCompleteDate"
+              type="date"
+              readonly
+            />
+            <!--    征求意见稿计划完成日期  -->
+            <calendar-field
+              :label="$t('esInitChange.exposureDraftPlanFinishDate')"
+              :placeholder="global.emptyLine"
+              v-model="baseInfoForm[0].solicitationDraftPlanCompleteDate"
+              type="date"
+              readonly
+            />
+            <!--    计划报批日期  -->
+            <calendar-field
+              :label="$t('esInitChange.planSubmissionDate')"
+              :placeholder="global.emptyLine"
+              v-model="baseInfoForm[0].planApprovalDate"
+              type="date"
+              readonly
+            />
           </template>
           <!--   项目类别为完成时间变更的显示  -->
           <template v-if="baseInfoForm[0].projectType === ProjectType.COMPLETE_TIME_CHANGE.value">
@@ -301,34 +325,6 @@
         </div>
         <!--   申请类型为立项时的显示  -->
         <template v-if="baseInfoForm[0].applicationCategory === ApplicationCategory.INITIATION.value">
-          <!--   完成日期  -->
-          <div class="process-part">
-            <div class="process-part-title">{{ $t('finishDate') }}</div>
-            <!--   草稿计划完成日期  -->
-            <calendar-field
-              :label="$t('esInitChange.draftPlanFinishDate')"
-              :placeholder="global.emptyLine"
-              v-model="baseInfoForm[0].draftPlannedCompleteDate"
-              type="date"
-              readonly
-            />
-            <!--    征求意见稿计划完成日期  -->
-            <calendar-field
-              :label="$t('esInitChange.exposureDraftPlanFinishDate')"
-              :placeholder="global.emptyLine"
-              v-model="baseInfoForm[0].solicitationDraftPlanCompleteDate"
-              type="date"
-              readonly
-            />
-            <!--    计划报批日期  -->
-            <calendar-field
-              :label="$t('esInitChange.planSubmissionDate')"
-              :placeholder="global.emptyLine"
-              v-model="baseInfoForm[0].planApprovalDate"
-              type="date"
-              readonly
-            />
-          </div>
           <!--   适用范围  -->
           <div class="process-part">
             <div class="process-part-title">{{ $t('rangeOfApplication') }}</div>
@@ -395,6 +391,15 @@
               rows="1"
               autosize
               v-model="baseInfoForm[0].cooperationUnit_dictText" />
+            <!--  隶属工作组   -->
+            <van-field
+              :label="$t('esInitChange.affiliatedWorkingGroup')"
+              :placeholder="global.emptyLine || $t('pleaseEnter') + $t('esInitChange.affiliatedWorkingGroup')"
+              readonly
+              type="textarea"
+              rows="1"
+              autosize
+              v-model="baseInfoForm[0].workGroup_dictText" />
           </div>
           <!--   立项说明  -->
           <div class="process-part">
@@ -485,7 +490,6 @@
         </template>
         <!--   项目类别为合并的显示  -->
         <template v-if="baseInfoForm[0].projectType === ProjectType.MERGE.value">
-          <!--   完成日期  -->
           <div class="process-part">
             <div class="process-part-title">{{ $t('esInitChange.mergeStandardInformation') }}</div>
             <!--  企标编号1  -->
@@ -623,10 +627,6 @@
               dict-code="standard_grade_classify"
               readonly
               v-model="baseInfoForm[0].enStandardClassification" />
-          </div>
-          <!--   完成日期  -->
-          <div class="process-part">
-            <div class="process-part-title">{{ $t('finishDate') }}</div>
             <!--   草稿计划完成日期  -->
             <calendar-field
               :label="$t('esInitChange.draftPlanFinishDate')"