From db6ef3d3a2015ea474230b6c366ce5e0c9682f48 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 19 Jun 2024 16:49:13 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=A4=96=E6=9D=A5?= =?UTF-8?q?=E6=A0=87=E5=87=86=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/en-us.js | 1 + src/common/lang/zh-cn.js | 1 + src/components/selection/StandardSelectionModal.vue | 8 ++++---- src/enums/commonEnums.js | 6 ++---- .../foreignStandard/ForeignStandardList.vue | 4 ++-- .../foreignStandard/modules/ForeignStandardModal.vue | 2 +- .../modules/SelectionForeignStandardDrawer.vue | 6 +++--- src/views/system/QuartzJobList.vue | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index f35ba35..c2fb7f3 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -543,6 +543,7 @@ module.exports = { standardNumber: 'Standard number', standardName: 'Standard name', releaseDate: 'Release date', + materialDate: 'Implementation date', textState: 'Text state', evaluationState: 'Evaluation state' }, diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 2a9bc7a..1fd73c1 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -606,6 +606,7 @@ module.exports = { standardNumber: '标准编号', standardName: '标准名称', releaseDate: '发布日期', + materialDate: '实施日期', textState: '标准状态', evaluationState: '评估状态' }, diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index 1775cce..f730cd9 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -97,7 +97,7 @@ export default { type: [String, Array], required: false, default: () => { - return [StandardSource.DOMESTIC.value, StandardSource.OVERSEAS.value, StandardSource.ENTERPRISE.value] + return [StandardSource.FOREIGN.value, StandardSource.ENTERPRISE.value] } }, value: { @@ -172,10 +172,10 @@ export default { width: 150, scopedSlots: { customRender: 'toDetail' } }, - // 发布日期 + // 实施日期 { - title: this.$t('standardSelect.releaseDate'), - dataIndex: 'releaseDate', + title: this.$t('standardSelect.materialDate'), + dataIndex: 'implementationDate', align: 'center', width: 120, scopedSlots: { customRender: 'text' } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 876dc6d..287a1fc 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -58,10 +58,8 @@ export const ProjectSource = { // 标准来源 export const StandardSource = { - DOMESTIC: { text: '国内', value: '1' }, - OVERSEAS: { text: '海外', value: '2' }, - ENTERPRISE: { text: '企标', value: '3' }, - FOREIGN: { text: '外来标准', value: '4' } + FOREIGN: { text: '外来标准', value: '1' }, + ENTERPRISE: { text: '企标', value: '3' } } // 动态分类 diff --git a/src/views/standardRegulationLibrary/foreignStandard/ForeignStandardList.vue b/src/views/standardRegulationLibrary/foreignStandard/ForeignStandardList.vue index a303480..f1e0998 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/ForeignStandardList.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/ForeignStandardList.vue @@ -647,7 +647,7 @@ export default { this.$router.push({ path: '/workCenter/StandardEntryOrChangeProcess', query: { - source: StandardSource.Foreign.value, // 国内标准 + source: StandardSource.Foreign.value, // 外来标准 operateType: OperationType.ENTRY.value // 入库 } }) @@ -662,7 +662,7 @@ export default { this.$router.push({ path: '/workCenter/StandardEntryOrChangeProcess', query: { - source: StandardSource.Foreign.value, // 国内标准 + source: StandardSource.Foreign.value, // 外来标准 operateType: OperationType.CHANGE.value, // 变更 standardId: record.id // 标准id } diff --git a/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue b/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue index 1bc452d..150ebe8 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue @@ -21,7 +21,7 @@ :disabled-field-list="disabledField" :open-selected-all-field-list="openSelectedAllFieldList" :exclude-standard-fields="excludeStandardFields" - :flag-by-field="{associated_foreign_standards: StandardSource.OVERSEAS.value}" + :flag-by-field="{associated_foreign_standards: StandardSource.FOREIGN.value}" @submitFormData="submitFormData" /> diff --git a/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue b/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue index 77341b4..603c66a 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/modules/SelectionForeignStandardDrawer.vue @@ -129,10 +129,10 @@ export default { width: 150, scopedSlots: { customRender: 'detail' } }, - // 发布日期 + // 实施日期 { - title: this.$t('standardSelect.releaseDate'), - dataIndex: 'releaseDate', + title: this.$t('standardSelect.materialDate'), + dataIndex: 'implementationDate', align: 'center', width: 120, scopedSlots: { customRender: 'text' } diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue index 8201ab0..baf1ecd 100644 --- a/src/views/system/QuartzJobList.vue +++ b/src/views/system/QuartzJobList.vue @@ -95,8 +95,8 @@