[update] 企标计划增加了一些字段的翻译，企标计划立项、变更流程的合并选计划增加了查询条件，排除掉另一个选择的计划

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' }
         },
         { // 草稿计划完成日期

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">

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">

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>