diff --git a/MenuCorrespondingFileReadme.md b/MenuCorrespondingFileReadme.md index 5903316..45528a6 100644 --- a/MenuCorrespondingFileReadme.md +++ b/MenuCorrespondingFileReadme.md @@ -38,7 +38,7 @@ 9.新法规导入流程 —— src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue 10.标准解读流程 —— src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue 11.法规符合性排查流程 —— src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue - 12.市场清单发布流程 —— src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue + 12.市场法规清单发布流程 —— src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue 六、资料中心 —— src/views/standardRegulationLibrary/profileCenter/ProfileCenterList.vue diff --git a/fileDescriptionReadme.md b/fileDescriptionReadme.md index ac2d4f2..5d6d4c5 100644 --- a/fileDescriptionReadme.md +++ b/fileDescriptionReadme.md @@ -308,10 +308,10 @@ `工作中心` ------workCenter --------NewProcess.vue ————新建流程 ---------marketListReleaseProcess ————市场清单发布流程 -----------MarketListReleaseProcess.vue ————市场清单发布流程页面 +--------marketListReleaseProcess ————市场法规清单发布流程 +----------MarketListReleaseProcess.vue ————市场法规清单发布流程页面 ----------modules -------------BaseInfoForm.vue ————市场清单发布流程业务基本信息部分 +------------BaseInfoForm.vue ————市场法规清单发布流程业务基本信息部分 --------newRegulationIntroductionProcess ————新法规导入流程 ----------NewRegulationIntroductionProcess.vue ————新法规导入流程页面 ----------modules diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 294b13e..2cd5cb2 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -50,7 +50,7 @@ const selectStandardFromSplit = (params) => getAction('', params) // 生成 const regulatoryComplianceCheckGenerate = (params) => postAction('/process/standardComplianceCheck/generate', params) -// 市场清单发布流程 +// 市场法规清单发布流程 // 保存 const marketListReleaseSave = (params) => postAction('/process/marketStandardRelease/save', params) // 发起 diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 8563838..4a3a264 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -172,6 +172,7 @@ module.exports = { mergeStandardInformation: 'Merge standard information', pleaseEnterPersonnelInfo: 'Please fill in the personnel information completely', pleaseEnterRemarks: 'Please fill in remarks', + pleaseHandlingSuggestions: 'Please fill in the handling suggestion', lookDetail: 'View Details', batchReject: 'Batch Rejection', pleaseSelectDistributeData: 'Select the data you want to distribute', @@ -254,13 +255,14 @@ module.exports = { dataInfo: 'Data Information', updatePerson: 'Regenerator', updateTime: 'Update Time', + handlingSuggestions: 'Handling Suggestions', // 标准字段 standardField: { standardEnglishName: 'Regulation English Name', 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 ce184c8..575de7b 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -59,12 +59,12 @@ module.exports = { pleaseSelectDesignEngineer: 'Please select Design Engineer', atLeastSelectOneDesignEngineer: 'Please select at least one design engineer' }, - // 市场清单发布流程 + // 市场法规清单发布流程 marketListReleaseProcess: { 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', @@ -111,7 +111,7 @@ module.exports = { technicalAgreementTemplate: 'Technical Agreement Template(s)', verificationReportTemplate: 'Checklist Template(s)', dvpTemplate: 'DVP Template(s)', - dfema: 'DFEMA', + dfema: 'DEFMA', specialListTemplate: 'Key Technology Breakdown Table', otherFilesOrTemplates: 'Other Files or Template(s)', investigationStage: 'Applicable Gate', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 5a02826..ac59c4b 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -9,7 +9,7 @@ module.exports = { newRegulationIntroductionProcess: '新法规导入流程', standardInterpretationProcess: '标准解读流程', regulatoryComplianceCheckProcess: '法规符合性排查流程', - marketListReleaseProcess: '市场清单发布流程' + marketListReleaseProcess: '市场法规清单发布流程' }, // 新法规导入流程 newRegulationImportProcess: { @@ -59,12 +59,12 @@ module.exports = { pleaseSelectDesignEngineer: '请选择设计工程师', atLeastSelectOneDesignEngineer: '请至少选择一条数据的设计工程师' }, - // 市场清单发布流程 + // 市场法规清单发布流程 marketListReleaseProcess: { englishName: '英文名称', newProductionVehicleImplementationDate: '新生产车实施日期', newCertifiedVehicleImplementationDate: '新认证车实施日期', - applicableCountryRegion: '适用国家/地区', + applicableCountryRegion: '适用市场', applicableVehicleType: '适用车型', authenticationObject: '认证对象', certifiedDeliverables: '认证交付物', @@ -111,7 +111,7 @@ module.exports = { technicalAgreementTemplate: '技术协议模板', verificationReportTemplate: '校核报告模板/checklist', dvpTemplate: 'DVP模板', - dfema: 'DFEMA', + dfema: 'DEFMA', specialListTemplate: '关键技术分解表', otherFilesOrTemplates: '其它文件或模板', investigationStage: '排查阶段', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 3bae283..bd6d612 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -172,6 +172,7 @@ module.exports = { mergeStandardInformation: '合并标准信息', pleaseEnterPersonnelInfo: '请完整填写人员信息', pleaseEnterRemarks: '请填写备注', + pleaseHandlingSuggestions: '请填写处理意见', lookDetail: '查看详情', batchReject: '批量驳回', pleaseSelectDistributeData: '请选择要分发的数据', @@ -254,13 +255,14 @@ module.exports = { dataInfo: '数据信息', updatePerson: '更新人', updateTime: '更新时间', + handlingSuggestions: '处理意见', // 标准字段 standardField: { standardEnglishName: '标准英文名称', newProductionVehicleImplementationDate: '新生产车实施日期', newCertifiedVehicleImplementationDate: '新认证车实施日期', dateOfRegistration: '注册日期', - applicableCountryRegion: '适用国家/地区', + applicableCountryRegion: '适用市场', applicableVehicleType: '适用车型' }, // 树右键 diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 34baf2a..b676657 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -422,7 +422,7 @@ export default { case ProcessKey.REGULATORY_COMPLIANCE_CHECK.value: path = '/workCenter/RegulatoryComplianceCheckProcess' break - // 市场清单发布流程 + // 市场法规清单发布流程 case ProcessKey.MARKET_LIST_RELEASE.value: path = '/workCenter/MarketListReleaseProcess' break diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 426af5c..a53c9d6 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -223,7 +223,7 @@
-
+
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 685bfae..0d09ec9 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -138,7 +138,7 @@ export const ProcessKey = { STANDARD_INTERPRETATION_PROCESS: { text: 'standard_interpret', value: 'standard_interpret' }, // 法规符合性排查流程 REGULATORY_COMPLIANCE_CHECK: { text: 'laws-evaluation-main', value: 'laws-evaluation-main' }, - // 市场清单发布流程 + // 市场法规清单发布流程 MARKET_LIST_RELEASE: { text: 'market_standard_publish', value: 'market_standard_publish' } } @@ -150,8 +150,8 @@ export const ProcessType = { STANDARD_INTERPRETATION_PROCESS: { text: '标准解读流程', value: '2' }, // 法规符合性排查流程 REGULATORY_COMPLIANCE_CHECK: { text: '法规符合性排查流程', value: '3' }, - // 市场清单发布流程 - MARKET_LIST_RELEASE: { text: '市场清单发布流程', value: '4' } + // 市场法规清单发布流程 + MARKET_LIST_RELEASE: { text: '市场法规清单发布流程', value: '4' } } // 新法规导入流程节点 @@ -177,7 +177,7 @@ export const RegulatoryComplianceCheckNodes = new EsEnums({ mainFinderTwiceDistributes: { text: '主排查人分批下发(二次分发)', value: 'sid-3D1BFC0F-9074-4868-891F-2F76D00A21C7' } }) -// 市场清单发布流程节点 +// 市场法规清单发布流程节点 export const MarketListReleaseNodes = new EsEnums({ initiated: { text: '法规工程师发起', value: 'SID-8B22BF1A-383D-48E0-B9C4-24DFFEA1C9D0' }, countersign: { text: '会签', value: 'SID-3CBC410D-D866-4DCA-ACBC-5F667BC376E6' }, diff --git a/src/views/dashboard/modules/ToDoTaskCard.vue b/src/views/dashboard/modules/ToDoTaskCard.vue index 1b14868..78845af 100644 --- a/src/views/dashboard/modules/ToDoTaskCard.vue +++ b/src/views/dashboard/modules/ToDoTaskCard.vue @@ -67,7 +67,7 @@ export default { case '3': path = '/workCenter/RegulatoryComplianceCheckProcess' break - // 市场清单发布流程 + // 市场法规清单发布流程 case '4': path = '/workCenter/MarketListReleaseProcess' break diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index 1334509..d33d27b 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -1,55 +1,60 @@