diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 1b2bbee..de4937e 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -261,7 +261,7 @@ module.exports = { newProductionVehicleImplementationDate: 'New Certified Vehicle Implementation Date', newCertifiedVehicleImplementationDate: 'New Production Vehicle Implementation Date', dateOfRegistration: 'Registration Date', - applicableCountryRegion: 'Country/Region', + applicableCountryRegion: 'Applicable Market', applicableVehicleType: 'Vehicle Catagory' }, // 树右键 diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index 9ca3aa0..c58fb05 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -87,7 +87,7 @@ module.exports = { newProductionVehicleImplementationDate: 'New Production Vehicle Implementation Date', newCertifiedVehicleImplementationDate: 'New Certified Vehicle Implementation Date', dateOfRegistration: 'Registration Date', - applicableCountryRegion: 'Country/Region', + applicableCountryRegion: 'Applicable Market', applicableVehicleType: 'Vehicle Catagory', authenticationObject: 'Certification Item', certifiedDeliverables: 'Verification', diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index fb498e2..634a48c 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -87,7 +87,7 @@ module.exports = { newProductionVehicleImplementationDate: '新生产车实施日期', newCertifiedVehicleImplementationDate: '新认证车实施日期', dateOfRegistration: '注册日期', - applicableCountryRegion: '适用国家/地区', + applicableCountryRegion: '适用市场', applicableVehicleType: '适用车型', authenticationObject: '认证对象', certifiedDeliverables: '认证交付物', diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index 5470069..575de7b 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -64,7 +64,7 @@ module.exports = { englishName: 'English Name', newProductionVehicleImplementationDate: 'New Certified Vehicle Implementation Date', newCertifiedVehicleImplementationDate: 'New Production Vehicle Implementation Date', - applicableCountryRegion: 'Country/Region', + applicableCountryRegion: 'Applicable Market', applicableVehicleType: 'Vehicle Catagory', authenticationObject: 'Certification Item', certifiedDeliverables: 'Verification', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 975f80e..ac59c4b 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -64,7 +64,7 @@ module.exports = { englishName: '英文名称', newProductionVehicleImplementationDate: '新生产车实施日期', newCertifiedVehicleImplementationDate: '新认证车实施日期', - applicableCountryRegion: '适用国家/地区', + applicableCountryRegion: '适用市场', applicableVehicleType: '适用车型', authenticationObject: '认证对象', certifiedDeliverables: '认证交付物', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index e8ebc06..c112a8a 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -261,7 +261,7 @@ module.exports = { newProductionVehicleImplementationDate: '新生产车实施日期', newCertifiedVehicleImplementationDate: '新认证车实施日期', dateOfRegistration: '注册日期', - applicableCountryRegion: '适用国家/地区', + applicableCountryRegion: '适用市场', applicableVehicleType: '适用车型' }, // 树右键 diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue index a42a05f..024c98a 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue @@ -278,7 +278,7 @@ export default { } // scopedSlots: { customRender: 'text' } }, - { // 适用国家/地区 + { // 适用市场 title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'), align: 'center', width: 180, @@ -652,7 +652,7 @@ export default { newAuthImplDateCol: item.id === newAuthImplDateArr[0].id ? newAuthImplDateArr.length : 0, // 注册日期行合并 registrationDateCol: item.id === registrationDateArr[0].id ? registrationDateArr.length : 0, - // 适用国家/地区行合并 + // 适用市场行合并 countryCol: item.id === countryArr[0].id ? countryArr.length : 0, // 适用车型行合并 applicableVehicleCol: item.id === applicableVehicleArr[0].id ? applicableVehicleArr.length : 0, diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index 18574ea..45e3ebf 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -362,7 +362,7 @@ export default { dataIndex: 'registrationDate', scopedSlots: { customRender: 'text' } }, - { // 适用国家/地区 + { // 适用市场 title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'), align: 'center', width: 180, @@ -626,7 +626,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/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue index 78ea43f..835f376 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue @@ -59,7 +59,7 @@ field-name="registrationDate" v-decorator.trim="[ 'registrationDate', validatorRules.registrationDate ]" /> - + { return { value: item } @@ -332,7 +332,7 @@ export default { form.registrationDate = result.registration_date // 注册日期 form.country = result.applicable_market ? (result.applicable_market.split(',').map(item => { return { value: item } - })) : [] // 适用国家/地区 + })) : [] // 适用市场 form.mainDept = result.main_dept // 主控部门 form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块 form.associateDept = result.associate_dept // 关联部门 @@ -359,7 +359,7 @@ export default { form.newProductImplDate = '' // 新生产车实施日期 form.newAuthImplDate = '' // 新认证车实施日期 form.registrationDate = '' // 注册日期 - form.country = [] // 适用国家/地区 + form.country = [] // 适用市场 form.mainDept = '' // 主控部门 form.mainDeptProfMode = undefined // 主控部门专业模块 form.associateDept = '' // 关联部门 @@ -382,7 +382,7 @@ export default { if (!err) { this.confirmLoading = true const param = Object.assign({}, values) - // 处理适用国家/地区格式 + // 处理适用市场格式 param.country = param.country.map(item => item.value).join(',') // 基础信息id param.manifestId = this.manifestId diff --git a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue index 94ddbb7..c1fa1ae 100644 --- a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue @@ -225,7 +225,7 @@ export default { dataIndex: 'newAuthImplDate', scopedSlots: { customRender: 'text' } }, - { // 适用国家/地区 + { // 适用市场 title: this.$t('workCenter.marketListReleaseProcess.applicableCountryRegion'), align: 'center', width: 180,