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 @@
- {{ form.mainDraftingUser || global.emptyLine }} + {{ form.mainDraftingUser_dictText || global.emptyLine }}
- {{ form.mainDraftingUnit || global.emptyLine }} + {{ form.mainDraftingUnit_dictText || global.emptyLine }}
- {{ form.enStandardSystem || global.emptyLine }} + {{ form.enStandardSystem_dictText || global.emptyLine }}
- {{ form.componentName || global.emptyLine }} + {{ form.componentName_dictText || global.emptyLine }}
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" />
-

稽查内容

+ +

{{ $t('enterpriseStandardLibrary.standard.auditContent') }}

{{ $t('newlyAdded') }}
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"/> @@ -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"/>