diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue index 95f9e7c..92a74e6 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue @@ -246,22 +246,22 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'country_dictText' : 'country_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'country_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 适用车型 title: this.$t('standardRegulationLibrary.marketListField.applicableVehicleType'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'applicableVehicle_dictText' : 'applicableVehicle_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'applicableVehicle_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 认证对象 title: this.$t('standardRegulationLibrary.marketListField.authenticationObject'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'authenticationObject_dictText' : 'authenticationObject_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'authenticationObject_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 认证交付物 title: this.$t('standardRegulationLibrary.marketListField.certifiedDeliverables'), @@ -274,15 +274,15 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.type'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'type_dictText' : 'type_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'type_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 动力类型 title: this.$t('standardRegulationLibrary.marketListField.dynamicType'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'dynamicType_dictText' : 'dynamicType_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'dynamicType_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 主控部门 title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'), @@ -295,8 +295,8 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'mainDeptProfMode_dictText' : 'mainDeptProfMode_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'mainDeptProfMode_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 关联部门 title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'), @@ -309,29 +309,29 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'associateDeptProfMode_dictText' : 'associateDeptProfMode_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'associateDeptProfMode_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 批量限制 title: this.$t('standardRegulationLibrary.marketListField.batchRestriction'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'batchLimit_dictText' : 'batchLimit_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'batchLimit_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 自动驾驶等级 title: this.$t('standardRegulationLibrary.marketListField.automaticDrivingLevel'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'autopilotLevel_dictText' : 'autopilotLevel_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'autopilotLevel_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 要求类型 title: this.$t('standardRegulationLibrary.marketListField.requirementType'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'requireType_dictText' : 'requireType_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'requireType_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 备注 title: this.$t('standardRegulationLibrary.marketListField.remarks'), diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index d0574cb..7c84805 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -365,22 +365,22 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.applicableCountryRegion'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'country_dictText' : 'country_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'country_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 适用车型 title: this.$t('standardRegulationLibrary.marketListField.applicableVehicleType'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'applicableVehicle_dictText' : 'applicableVehicle_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'applicableVehicle_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 认证对象 title: this.$t('standardRegulationLibrary.marketListField.authenticationObject'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'authenticationObject_dictText' : 'authenticationObject_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'authenticationObject_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 认证交付物 title: this.$t('standardRegulationLibrary.marketListField.certifiedDeliverables'), @@ -393,15 +393,15 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.type'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'type_dictText' : 'type_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'type_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 动力类型 title: this.$t('standardRegulationLibrary.marketListField.dynamicType'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'dynamicType_dictText' : 'dynamicType_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'dynamicType_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 主控部门 title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'), @@ -414,8 +414,8 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'mainDeptProfMode_dictText' : 'mainDeptProfMode_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'mainDeptProfMode_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 关联部门 title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'), @@ -428,29 +428,29 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'associateDeptProfMode_dictText' : 'associateDeptProfMode_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'associateDeptProfMode_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 批量限制 title: this.$t('standardRegulationLibrary.marketListField.batchRestriction'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'batchLimit_dictText' : 'batchLimit_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'batchLimit_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 自动驾驶等级 title: this.$t('standardRegulationLibrary.marketListField.automaticDrivingLevel'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'autopilotLevel_dictText' : 'autopilotLevel_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'autopilotLevel_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 要求类型 title: this.$t('standardRegulationLibrary.marketListField.requirementType'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'requireType_dictText' : 'requireType_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'requireType_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 备注 title: this.$t('standardRegulationLibrary.marketListField.remarks'), diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue index 0e7b493..fee0493 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue @@ -152,8 +152,8 @@ export default { title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'country_dictText' : 'country_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'country_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 清单编号 title: this.$t('standardRegulationLibrary.marketRegulationsList.listNumber'), @@ -173,8 +173,8 @@ export default { title: this.$t('standardRegulationLibrary.marketRegulationsList.drivingPosition'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'drivePosition_dictText' : 'drivePosition_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'drivePosition_dictText', + scopedSlots: { customRender: 'dictText' } }, { // 清单版本 title: this.$t('standardRegulationLibrary.marketRegulationsList.listVersion'), @@ -201,8 +201,8 @@ export default { title: this.$t('standardRegulationLibrary.marketRegulationsList.listState'), align: 'center', width: 180, - dataIndex: this.isChinese() ? 'manifestStatus_dictText' : 'manifestStatus_dictTextEn', - scopedSlots: { customRender: 'text' } + dataIndex: 'manifestStatus_dictText', + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('operation'), diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue index 1ce0e56..6a1ec77 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue @@ -304,7 +304,7 @@ export default { this.form.setFieldsValue(pick(this.model, 'standardNumber', 'standardName', 'standardEnglishName', 'type', 'newProductImplDate', 'newAuthImplDate', 'registrationDate', 'country', 'authenticationObject', 'certifyTheDeliverables', 'mainDept', 'mainDeptProfMode', 'associateDept', - 'associateDeptProfMode', 'applicableVehicle', 'dynamicType', 'batchLimit', 'autopilotLevel', 'requireType')) + 'associateDeptProfMode', 'applicableVehicle', 'dynamicType', 'batchLimit', 'autopilotLevel', 'requireType', 'remark')) }) }, getCountryOption () {