From e546efd604f8682af61072212e0f381e330aeecb Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 12 Sep 2024 14:36:32 +0800 Subject: [PATCH] =?UTF-8?q?[fix=20uat126]=E5=85=A8=E5=B1=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=20=E2=80=9C=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E8=AF=95=E7=94=A8=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/standardRegulationLibrary/zh-cn.js | 2 +- src/common/lang/zh-cn.js | 2 +- .../MarketRegulationsListSelectionModal.vue | 4 ++-- src/views/dashboard/modules/SearchAndWarningCard.vue | 2 +- .../MarketRegulationsDetailPage.vue | 2 +- .../MarketRegulationsFormPage.vue | 10 +++++----- .../marketRegulationsList/MarketRegulationsList.vue | 4 ++-- .../standardMasterPlan/StandardMasterPlanList.vue | 2 +- .../MarketListReleaseProcess.vue | 12 ++++++------ .../modules/BaseInfoForm.vue | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index 176e62d..c230e45 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -63,7 +63,7 @@ module.exports = { marketRegulationsList: { listNumber: '清单编号', listName: '清单名称', - countryRegion: '国家/地区', + countryRegion: '适用市场', drivingPosition: '驾驶位置', author: '作者', exportName: '市场法规清单表', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index bd6d612..4fdd7b2 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -212,7 +212,7 @@ module.exports = { maximumSelectFive: '最多选择五条记录！', listNumber: '清单编号', listName: '清单名称', - countryRegion: '国家/地区', + countryRegion: '适用市场', ccPerson: '抄送人员', startDate: '开始日期', endDate: '结束日期', diff --git a/src/components/selection/MarketRegulationsListSelectionModal.vue b/src/components/selection/MarketRegulationsListSelectionModal.vue index d7d1de1..e4c36be 100644 --- a/src/components/selection/MarketRegulationsListSelectionModal.vue +++ b/src/components/selection/MarketRegulationsListSelectionModal.vue @@ -30,7 +30,7 @@ - +
- + {{ (isChinese() ? model.country_dictText : model.country_dictTextEn) || global.emptyLine }} diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index a01f680..249041d 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -8,7 +8,7 @@
- + { if (res.success) { @@ -597,7 +597,7 @@ export default { this.pageLoading = true const param = {} param.manifest = Object.assign({}, values) - // 国家/地区是树选择，需要处理格式 + // 适用市场是树选择，需要处理格式 param.manifest.country = param.manifest.country.map(item => item.value).join(',') let func if (this.model && this.model.id) { @@ -657,7 +657,7 @@ export default { form.newProductImplDate = result.new_product_impl_date // 新生产车实施日期 form.newAuthImplDate = result.new_auth_impl_date // 新认证车实施日期 form.registrationDate = result.registration_date // 注册日期 - form.country = this.model.country.map(item => item.value).join(',') // 适用市场，带入清单基本信息的国家/地区 + form.country = this.model.country.map(item => item.value).join(',') // 适用市场，带入清单基本信息的适用市场 form.mainDept = result.main_dept // 主控部门 form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块 form.associateDept = result.associate_dept // 关联部门 diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue index 3e85f73..68f797d 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue @@ -23,7 +23,7 @@ - + { if (res.success) { diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index 2583f2d..c607ea9 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -83,7 +83,7 @@ v-decorator="['manifestName', validatorRules.manifestName]" /> - + { if (res.success) { @@ -405,7 +405,7 @@ export default { processInfo.manifestName = this.model.businessInfoDTO.manifestName // 清单说明 processInfo.manifestDesc = this.model.businessInfoDTO.manifestDesc - // 国家/地区 + // 适用市场 processInfo.country = this.model.businessInfoDTO.country.split(',').map(item => { return { value: item } }) @@ -428,7 +428,7 @@ export default { processInfo.manifestName = this.draftModel.businessInfoDTO.manifestName // 清单说明 processInfo.manifestDesc = this.draftModel.businessInfoDTO.manifestDesc - // 国家/地区 + // 适用市场 processInfo.country = this.draftModel.businessInfoDTO.country.split(',').map(item => { return { value: item } }) diff --git a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue index dd5be6a..7768bef 100644 --- a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue @@ -36,7 +36,7 @@ :placeholder="disabled ? '' : $t('autoTakeout')" />
- +
@@ -365,7 +365,7 @@ export default { formInline.file = result.file // 版本号 formInline.manifestVersion = result.manifestVersion - // 国家/地区 + // 适用市场 if (result.country) { formInline.country = result.country.split(',').map(item => { return { value: item } @@ -478,7 +478,7 @@ export default { formInline.file = result.file // 版本号 formInline.manifestVersion = result.manifestVersion - // 国家/地区 + // 适用市场 if (result.country) { formInline.country = result.country.split(',').map(item => { return { value: item }