[update] 修改UAT问题:市场法规清单的适用国家/地区修改为适用市场
This commit is contained in:
@@ -261,7 +261,7 @@ module.exports = {
|
|||||||
newProductionVehicleImplementationDate: 'New Certified Vehicle Implementation Date',
|
newProductionVehicleImplementationDate: 'New Certified Vehicle Implementation Date',
|
||||||
newCertifiedVehicleImplementationDate: 'New Production Vehicle Implementation Date',
|
newCertifiedVehicleImplementationDate: 'New Production Vehicle Implementation Date',
|
||||||
dateOfRegistration: 'Registration Date',
|
dateOfRegistration: 'Registration Date',
|
||||||
applicableCountryRegion: 'Country/Region',
|
applicableCountryRegion: 'Applicable Market',
|
||||||
applicableVehicleType: 'Vehicle Catagory'
|
applicableVehicleType: 'Vehicle Catagory'
|
||||||
},
|
},
|
||||||
// 树右键
|
// 树右键
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ module.exports = {
|
|||||||
newProductionVehicleImplementationDate: 'New Production Vehicle Implementation Date',
|
newProductionVehicleImplementationDate: 'New Production Vehicle Implementation Date',
|
||||||
newCertifiedVehicleImplementationDate: 'New Certified Vehicle Implementation Date',
|
newCertifiedVehicleImplementationDate: 'New Certified Vehicle Implementation Date',
|
||||||
dateOfRegistration: 'Registration Date',
|
dateOfRegistration: 'Registration Date',
|
||||||
applicableCountryRegion: 'Country/Region',
|
applicableCountryRegion: 'Applicable Market',
|
||||||
applicableVehicleType: 'Vehicle Catagory',
|
applicableVehicleType: 'Vehicle Catagory',
|
||||||
authenticationObject: 'Certification Item',
|
authenticationObject: 'Certification Item',
|
||||||
certifiedDeliverables: 'Verification',
|
certifiedDeliverables: 'Verification',
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ module.exports = {
|
|||||||
newProductionVehicleImplementationDate: '新生产车实施日期',
|
newProductionVehicleImplementationDate: '新生产车实施日期',
|
||||||
newCertifiedVehicleImplementationDate: '新认证车实施日期',
|
newCertifiedVehicleImplementationDate: '新认证车实施日期',
|
||||||
dateOfRegistration: '注册日期',
|
dateOfRegistration: '注册日期',
|
||||||
applicableCountryRegion: '适用国家/地区',
|
applicableCountryRegion: '适用市场',
|
||||||
applicableVehicleType: '适用车型',
|
applicableVehicleType: '适用车型',
|
||||||
authenticationObject: '认证对象',
|
authenticationObject: '认证对象',
|
||||||
certifiedDeliverables: '认证交付物',
|
certifiedDeliverables: '认证交付物',
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ module.exports = {
|
|||||||
englishName: 'English Name',
|
englishName: 'English Name',
|
||||||
newProductionVehicleImplementationDate: 'New Certified Vehicle Implementation Date',
|
newProductionVehicleImplementationDate: 'New Certified Vehicle Implementation Date',
|
||||||
newCertifiedVehicleImplementationDate: 'New Production Vehicle Implementation Date',
|
newCertifiedVehicleImplementationDate: 'New Production Vehicle Implementation Date',
|
||||||
applicableCountryRegion: 'Country/Region',
|
applicableCountryRegion: 'Applicable Market',
|
||||||
applicableVehicleType: 'Vehicle Catagory',
|
applicableVehicleType: 'Vehicle Catagory',
|
||||||
authenticationObject: 'Certification Item',
|
authenticationObject: 'Certification Item',
|
||||||
certifiedDeliverables: 'Verification',
|
certifiedDeliverables: 'Verification',
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ module.exports = {
|
|||||||
englishName: '英文名称',
|
englishName: '英文名称',
|
||||||
newProductionVehicleImplementationDate: '新生产车实施日期',
|
newProductionVehicleImplementationDate: '新生产车实施日期',
|
||||||
newCertifiedVehicleImplementationDate: '新认证车实施日期',
|
newCertifiedVehicleImplementationDate: '新认证车实施日期',
|
||||||
applicableCountryRegion: '适用国家/地区',
|
applicableCountryRegion: '适用市场',
|
||||||
applicableVehicleType: '适用车型',
|
applicableVehicleType: '适用车型',
|
||||||
authenticationObject: '认证对象',
|
authenticationObject: '认证对象',
|
||||||
certifiedDeliverables: '认证交付物',
|
certifiedDeliverables: '认证交付物',
|
||||||
|
|||||||
@@ -261,7 +261,7 @@ module.exports = {
|
|||||||
newProductionVehicleImplementationDate: '新生产车实施日期',
|
newProductionVehicleImplementationDate: '新生产车实施日期',
|
||||||
newCertifiedVehicleImplementationDate: '新认证车实施日期',
|
newCertifiedVehicleImplementationDate: '新认证车实施日期',
|
||||||
dateOfRegistration: '注册日期',
|
dateOfRegistration: '注册日期',
|
||||||
applicableCountryRegion: '适用国家/地区',
|
applicableCountryRegion: '适用市场',
|
||||||
applicableVehicleType: '适用车型'
|
applicableVehicleType: '适用车型'
|
||||||
},
|
},
|
||||||
// 树右键
|
// 树右键
|
||||||
|
|||||||
+2
-2
@@ -278,7 +278,7 @@ export default {
|
|||||||
}
|
}
|
||||||
// scopedSlots: { customRender: 'text' }
|
// scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
{ // 适用国家/地区
|
{ // 适用市场
|
||||||
title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'),
|
title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
@@ -652,7 +652,7 @@ export default {
|
|||||||
newAuthImplDateCol: item.id === newAuthImplDateArr[0].id ? newAuthImplDateArr.length : 0,
|
newAuthImplDateCol: item.id === newAuthImplDateArr[0].id ? newAuthImplDateArr.length : 0,
|
||||||
// 注册日期行合并
|
// 注册日期行合并
|
||||||
registrationDateCol: item.id === registrationDateArr[0].id ? registrationDateArr.length : 0,
|
registrationDateCol: item.id === registrationDateArr[0].id ? registrationDateArr.length : 0,
|
||||||
// 适用国家/地区行合并
|
// 适用市场行合并
|
||||||
countryCol: item.id === countryArr[0].id ? countryArr.length : 0,
|
countryCol: item.id === countryArr[0].id ? countryArr.length : 0,
|
||||||
// 适用车型行合并
|
// 适用车型行合并
|
||||||
applicableVehicleCol: item.id === applicableVehicleArr[0].id ? applicableVehicleArr.length : 0,
|
applicableVehicleCol: item.id === applicableVehicleArr[0].id ? applicableVehicleArr.length : 0,
|
||||||
|
|||||||
+2
-2
@@ -362,7 +362,7 @@ export default {
|
|||||||
dataIndex: 'registrationDate',
|
dataIndex: 'registrationDate',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
{ // 适用国家/地区
|
{ // 适用市场
|
||||||
title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'),
|
title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
@@ -626,7 +626,7 @@ export default {
|
|||||||
form.newProductImplDate = result.new_product_impl_date // 新生产车实施日期
|
form.newProductImplDate = result.new_product_impl_date // 新生产车实施日期
|
||||||
form.newAuthImplDate = result.new_auth_impl_date // 新认证车实施日期
|
form.newAuthImplDate = result.new_auth_impl_date // 新认证车实施日期
|
||||||
form.registrationDate = result.registration_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.mainDept = result.main_dept // 主控部门
|
||||||
form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块
|
form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块
|
||||||
form.associateDept = result.associate_dept // 关联部门
|
form.associateDept = result.associate_dept // 关联部门
|
||||||
|
|||||||
+7
-7
@@ -59,7 +59,7 @@
|
|||||||
field-name="registrationDate"
|
field-name="registrationDate"
|
||||||
v-decorator.trim="[ 'registrationDate', validatorRules.registrationDate ]" />
|
v-decorator.trim="[ 'registrationDate', validatorRules.registrationDate ]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!-- 适用国家/地区 -->
|
<!-- 适用市场 -->
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.applicableCountryRegion')">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.applicableCountryRegion')">
|
||||||
<s-tree-select
|
<s-tree-select
|
||||||
v-decorator.trim="[ 'country', validatorRules.country ]"
|
v-decorator.trim="[ 'country', validatorRules.country ]"
|
||||||
@@ -178,7 +178,7 @@ export default {
|
|||||||
confirmLoading: false,
|
confirmLoading: false,
|
||||||
form: this.$form.createForm(this),
|
form: this.$form.createForm(this),
|
||||||
model: {},
|
model: {},
|
||||||
countryOptions: [], // 适用国家/地区下拉框
|
countryOptions: [], // 适用市场下拉框
|
||||||
labelCol: {
|
labelCol: {
|
||||||
xs: { span: 24 },
|
xs: { span: 24 },
|
||||||
sm: { span: 6 }
|
sm: { span: 6 }
|
||||||
@@ -228,7 +228,7 @@ export default {
|
|||||||
}],
|
}],
|
||||||
validateTrigger: 'change'
|
validateTrigger: 'change'
|
||||||
},
|
},
|
||||||
// 适用国家/地区
|
// 适用市场
|
||||||
country: {
|
country: {
|
||||||
rules: [{
|
rules: [{
|
||||||
required: true,
|
required: true,
|
||||||
@@ -292,7 +292,7 @@ export default {
|
|||||||
this.visible = true
|
this.visible = true
|
||||||
this.manifestId = manifestId
|
this.manifestId = manifestId
|
||||||
this.model = Object.assign({}, record)
|
this.model = Object.assign({}, record)
|
||||||
// 处理适用国家/地区格式
|
// 处理适用市场格式
|
||||||
if (this.model.country) {
|
if (this.model.country) {
|
||||||
this.model.country = this.model.country.split(',').map(item => {
|
this.model.country = this.model.country.split(',').map(item => {
|
||||||
return { value: item }
|
return { value: item }
|
||||||
@@ -332,7 +332,7 @@ export default {
|
|||||||
form.registrationDate = result.registration_date // 注册日期
|
form.registrationDate = result.registration_date // 注册日期
|
||||||
form.country = result.applicable_market ? (result.applicable_market.split(',').map(item => {
|
form.country = result.applicable_market ? (result.applicable_market.split(',').map(item => {
|
||||||
return { value: item }
|
return { value: item }
|
||||||
})) : [] // 适用国家/地区
|
})) : [] // 适用市场
|
||||||
form.mainDept = result.main_dept // 主控部门
|
form.mainDept = result.main_dept // 主控部门
|
||||||
form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块
|
form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块
|
||||||
form.associateDept = result.associate_dept // 关联部门
|
form.associateDept = result.associate_dept // 关联部门
|
||||||
@@ -359,7 +359,7 @@ export default {
|
|||||||
form.newProductImplDate = '' // 新生产车实施日期
|
form.newProductImplDate = '' // 新生产车实施日期
|
||||||
form.newAuthImplDate = '' // 新认证车实施日期
|
form.newAuthImplDate = '' // 新认证车实施日期
|
||||||
form.registrationDate = '' // 注册日期
|
form.registrationDate = '' // 注册日期
|
||||||
form.country = [] // 适用国家/地区
|
form.country = [] // 适用市场
|
||||||
form.mainDept = '' // 主控部门
|
form.mainDept = '' // 主控部门
|
||||||
form.mainDeptProfMode = undefined // 主控部门专业模块
|
form.mainDeptProfMode = undefined // 主控部门专业模块
|
||||||
form.associateDept = '' // 关联部门
|
form.associateDept = '' // 关联部门
|
||||||
@@ -382,7 +382,7 @@ export default {
|
|||||||
if (!err) {
|
if (!err) {
|
||||||
this.confirmLoading = true
|
this.confirmLoading = true
|
||||||
const param = Object.assign({}, values)
|
const param = Object.assign({}, values)
|
||||||
// 处理适用国家/地区格式
|
// 处理适用市场格式
|
||||||
param.country = param.country.map(item => item.value).join(',')
|
param.country = param.country.map(item => item.value).join(',')
|
||||||
// 基础信息id
|
// 基础信息id
|
||||||
param.manifestId = this.manifestId
|
param.manifestId = this.manifestId
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ export default {
|
|||||||
dataIndex: 'newAuthImplDate',
|
dataIndex: 'newAuthImplDate',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
{ // 适用国家/地区
|
{ // 适用市场
|
||||||
title: this.$t('workCenter.marketListReleaseProcess.applicableCountryRegion'),
|
title: this.$t('workCenter.marketListReleaseProcess.applicableCountryRegion'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
|
|||||||
Reference in New Issue
Block a user