From 8cbdc88595f886aedb348fd08b1447897fb5aa80 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 20 Oct 2023 15:04:06 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E7=BF=BB=E8=AF=91=EF=BC=8C=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9=E3=80=81=E5=8F=98=E6=9B=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E5=90=88=E5=B9=B6=E9=80=89=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E9=99=A4=E6=8E=89=E5=8F=A6=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseStandardLibrary/plan/PlanList.vue    | 14 +++++++-------
 .../plan/detail/PlanDetail.vue                     |  8 ++++----
 .../standard/modules/EnterpriseStandardModal.vue   |  3 ++-
 .../modules/MergeBaseInfo.vue                      |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
index df179877..ba03d384 100644
--- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue
+++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
@@ -271,49 +271,49 @@ export default {
           title: this.$t('enterpriseStandardLibrary.plan.authDepartment'),
           align: 'center',
           width: 180,
-          dataIndex: 'authDeparts',
+          dataIndex: 'authDept_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 企业标准代号
           title: this.$t('enterpriseStandardLibrary.plan.enterpriseStandardCode'),
           align: 'center',
           width: 180,
-          dataIndex: 'enStandardCode',
+          dataIndex: 'enStandardCode_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 配合单位
           title: this.$t('enterpriseStandardLibrary.plan.suitUnit'),
           align: 'center',
           width: 180,
-          dataIndex: 'cooperateDeparts',
+          dataIndex: 'cooperationUnit_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 主起草人
           title: this.$t('enterpriseStandardLibrary.plan.principalDrafter'),
           align: 'center',
           width: 180,
-          dataIndex: 'mainDraftingUser',
+          dataIndex: 'mainDraftingUser_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 主起草单位
           title: this.$t('enterpriseStandardLibrary.plan.mainDraftingUnit'),
           align: 'center',
           width: 180,
-          dataIndex: 'mainDraftingUnit',
+          dataIndex: 'mainDraftingUnit_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 主起草单位负责人
           title: this.$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit'),
           align: 'center',
           width: 180,
-          dataIndex: 'mainDraftingUnitResponsiblePerson',
+          dataIndex: 'mainDraftingUnitResponsiblePerson_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准推进人
           title: this.$t('enterpriseStandardLibrary.plan.standardPusher'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardPromoter',
+          dataIndex: 'standardPromoter_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 草稿计划完成日期
diff --git a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue
index d9bb671b..d6092f77 100644
--- a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue
+++ b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue
@@ -86,22 +86,22 @@
         <!--  主起草人  -->
         <div class="detail-page-part-form-item">
           <label>{{ $t('enterpriseStandardLibrary.plan.principalDrafter') }}</label>
-          <span>{{ form.mainDraftingUser || global.emptyLine }}</span>
+          <span>{{ form.mainDraftingUser_dictText || global.emptyLine }}</span>
         </div>
         <!--  主起草单位  -->
         <div class="detail-page-part-form-item">
           <label>{{ $t('enterpriseStandardLibrary.plan.mainDraftingUnit') }}</label>
-          <span>{{ form.mainDraftingUnit || global.emptyLine }}</span>
+          <span>{{ form.mainDraftingUnit_dictText || global.emptyLine }}</span>
         </div>
         <!--  企标体系  -->
         <div class="detail-page-part-form-item">
           <label>{{ $t('enterpriseStandardLibrary.plan.enterpriseStandardSystem') }}</label>
-          <span>{{ form.enStandardSystem || global.emptyLine }}</span>
+          <span>{{ form.enStandardSystem_dictText || global.emptyLine }}</span>
         </div>
         <!--  零部件名称  -->
         <div class="detail-page-part-form-item">
           <label>{{ $t('enterpriseStandardLibrary.plan.partName') }}</label>
-          <span>{{ form.componentName || global.emptyLine }}</span>
+          <span>{{ form.componentName_dictText || global.emptyLine }}</span>
         </div>
         <!--  标准适用范围  -->
         <div class="detail-page-part-form-item">
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
index 82fc2399..9b361310 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
@@ -20,7 +20,8 @@
                   :get-document-info-func="getDocumentInfoFunc"
                   @submitFormData="submitFormData" />
         <div class="header-text-btn">
-          <p class="header-text">稽查内容</p>
+          <!--  稽查内容  -->
+          <p class="header-text">{{ $t('enterpriseStandardLibrary.standard.auditContent') }}</p>
           <a-button icon="plus" type="primary" @click="handleAdd">{{ $t('newlyAdded') }}</a-button>
         </div>
         <div class="check-content-table">
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
index 61015dd4..a4f7fce5 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
@@ -25,7 +25,7 @@
                                        v-model="formInline.standardIdOne"
                                        :standard-number="formInline.standardNoOne"
                                        :disabled="disabled"
-                                       :searchParam="{ projectType: projectType }"
+                                       :searchParam="{ projectType: projectType, excludeIds: formInline.standardIdTwo }"
                                        @standardNumberChange="standardNumberChangeOne"
                                        @listChange="listChangeOne"/>
           </a-form-model-item>
@@ -75,7 +75,7 @@
                                        v-model="formInline.standardIdTwo"
                                        :disabled="disabled"
                                        :standard-number="formInline.standardNoTwo"
-                                       :searchParam="{ projectType: projectType }"
+                                       :searchParam="{ projectType: projectType, excludeIds: formInline.standardIdOne }"
                                        @standardNumberChange="standardNumberChangeTwo"
                                        @listChange="listChangeTwo"/>
           </a-form-model-item>