From c774bb908fb61cdab89373bb60bb2ccf7f61479c Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 4 Sep 2024 14:07:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[update=20=E8=A7=A3=E8=AF=BB=E8=A1=A8]=20?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=AF=E4=BB=A5=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StandardResolutionSheet.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 32140a7..b94c16c 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -223,7 +223,7 @@
-
+
From a6b29986d21b7fa73b9c2501224d2aa84964e155 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 5 Sep 2024 14:32:41 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[update]=20=E6=8B=86=E5=88=86=E7=9A=84DFEMA?= =?UTF-8?q?=E6=94=B9=E4=B8=BADEFMA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/en.js | 2 +- src/common/lang/workCenter/zh.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index ce184c8..174c155 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -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..8246be8 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -111,7 +111,7 @@ module.exports = { technicalAgreementTemplate: '技术协议模板', verificationReportTemplate: '校核报告模板/checklist', dvpTemplate: 'DVP模板', - dfema: 'DFEMA', + dfema: 'DEFMA', specialListTemplate: '关键技术分解表', otherFilesOrTemplates: '其它文件或模板', investigationStage: '排查阶段', From 6c70244e859987800ba18d3d5eb1738d3c8d2863 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 6 Sep 2024 09:30:07 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[update]=20=E5=B8=82=E5=9C=BA=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MenuCorrespondingFileReadme.md | 2 +- fileDescriptionReadme.md | 6 +++--- src/api/workCenter.js | 2 +- src/common/lang/workCenter/en.js | 2 +- src/common/lang/workCenter/zh.js | 4 ++-- src/components/ProcessDetailList.vue | 2 +- src/enums/commonEnums.js | 8 ++++---- src/views/dashboard/modules/ToDoTaskCard.vue | 2 +- .../marketRegulationsList/MarketRegulationsList.vue | 4 ++-- .../modules/StandardMasterPlanModal.vue | 2 +- src/views/workCenter/NewProcess.vue | 2 +- src/views/workCenter/processCenter/table/DoneList.vue | 2 +- src/views/workCenter/processCenter/table/DraftList.vue | 2 +- src/views/workCenter/processCenter/table/MonitorList.vue | 2 +- src/views/workCenter/processCenter/table/SentList.vue | 2 +- src/views/workCenter/processCenter/table/TodoList.vue | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) 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/workCenter/en.js b/src/common/lang/workCenter/en.js index 174c155..5470069 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -59,7 +59,7 @@ 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', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 8246be8..975f80e 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,7 +59,7 @@ module.exports = { pleaseSelectDesignEngineer: '请选择设计工程师', atLeastSelectOneDesignEngineer: '请至少选择一条数据的设计工程师' }, - // 市场清单发布流程 + // 市场法规清单发布流程 marketListReleaseProcess: { englishName: '英文名称', newProductionVehicleImplementationDate: '新生产车实施日期', 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/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/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue index db0ddcb..3e85f73 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue @@ -300,7 +300,7 @@ export default { } marketRegulationDetailPublish({ id: this.selectedRowKeys[0] }).then(res => { if (res.success) { - // 跳转市场清单发布流程 + // 跳转市场法规清单发布流程 this.$router.push({ path: '/workCenter/MarketListReleaseProcess', query: { @@ -345,7 +345,7 @@ export default { handlePublish (record) { marketRegulationDetailPublish({ id: record.id }).then(res => { if (res.success) { - // 跳转市场清单发布流程 + // 跳转市场法规清单发布流程 this.$router.push({ path: '/workCenter/MarketListReleaseProcess', query: { diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue index ff87636..76fc549 100644 --- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue +++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue @@ -918,7 +918,7 @@ export default { case ProcessType.REGULATORY_COMPLIANCE_CHECK.value: processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value break - // 市场清单发布流程 + // 市场法规清单发布流程 case ProcessType.MARKET_LIST_RELEASE.value: processKey = ProcessKey.MARKET_LIST_RELEASE.value break diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index ce77a85..59bcc35 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -37,7 +37,7 @@ export default { path: '/workCenter/RegulatoryComplianceCheckProcess', permission: 'workCenter:newProcess:regulatoryComplianceCheckProcess' }, - { // 市场清单发布流程 + { // 市场法规清单发布流程 title: this.$t('workCenter.newProcess.marketListReleaseProcess'), path: '/workCenter/MarketListReleaseProcess', permission: 'workCenter:newProcess:marketListReleaseProcess' diff --git a/src/views/workCenter/processCenter/table/DoneList.vue b/src/views/workCenter/processCenter/table/DoneList.vue index d24ae65..9daf1d3 100644 --- a/src/views/workCenter/processCenter/table/DoneList.vue +++ b/src/views/workCenter/processCenter/table/DoneList.vue @@ -215,7 +215,7 @@ export default { case ProcessType.REGULATORY_COMPLIANCE_CHECK.value: processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value break - // 市场清单发布流程 + // 市场法规清单发布流程 case ProcessType.MARKET_LIST_RELEASE.value: processKey = ProcessKey.MARKET_LIST_RELEASE.value break diff --git a/src/views/workCenter/processCenter/table/DraftList.vue b/src/views/workCenter/processCenter/table/DraftList.vue index cddab45..adf7ee2 100644 --- a/src/views/workCenter/processCenter/table/DraftList.vue +++ b/src/views/workCenter/processCenter/table/DraftList.vue @@ -158,7 +158,7 @@ export default { case '3': path = '/workCenter/RegulatoryComplianceCheckProcess' break - // 市场清单发布流程 + // 市场法规清单发布流程 case '4': path = '/workCenter/MarketListReleaseProcess' break diff --git a/src/views/workCenter/processCenter/table/MonitorList.vue b/src/views/workCenter/processCenter/table/MonitorList.vue index 75a9069..53e96fe 100644 --- a/src/views/workCenter/processCenter/table/MonitorList.vue +++ b/src/views/workCenter/processCenter/table/MonitorList.vue @@ -195,7 +195,7 @@ export default { case ProcessType.REGULATORY_COMPLIANCE_CHECK.value: processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value break - // 市场清单发布流程 + // 市场法规清单发布流程 case ProcessType.MARKET_LIST_RELEASE.value: processKey = ProcessKey.MARKET_LIST_RELEASE.value break diff --git a/src/views/workCenter/processCenter/table/SentList.vue b/src/views/workCenter/processCenter/table/SentList.vue index fe0cabe..7235398 100644 --- a/src/views/workCenter/processCenter/table/SentList.vue +++ b/src/views/workCenter/processCenter/table/SentList.vue @@ -202,7 +202,7 @@ export default { case ProcessType.REGULATORY_COMPLIANCE_CHECK.value: processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value break - // 市场清单发布流程 + // 市场法规清单发布流程 case ProcessType.MARKET_LIST_RELEASE.value: processKey = ProcessKey.MARKET_LIST_RELEASE.value break diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 8b8fbf8..7417cfd 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -165,7 +165,7 @@ export default { ], // 法规符合性排查流程 [ProcessType.REGULATORY_COMPLIANCE_CHECK.value]: [RegulatoryComplianceCheckNodes.initiated.value], - // 市场清单发布流程 + // 市场法规清单发布流程 [ProcessType.MARKET_LIST_RELEASE.value]: [MarketListReleaseNodes.initiated.value] }, disableMixinCreated: true @@ -239,7 +239,7 @@ export default { case '3': path = '/workCenter/RegulatoryComplianceCheckProcess' break - // 市场清单发布流程 + // 市场法规清单发布流程 case '4': path = '/workCenter/MarketListReleaseProcess' break From 03e5a7ce8228219f735823dcfa6dd72db1bce2f7 Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 6 Sep 2024 09:50:59 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[update=20=E6=B5=81=E7=A8=8B=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BF=A1=E6=81=AF]=20=E5=A4=87=E6=B3=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=A4=84=E7=90=86=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/en-us.js | 2 ++ src/common/lang/zh-cn.js | 2 ++ .../marketListReleaseProcess/MarketListReleaseProcess.vue | 8 ++++---- .../NewRegulationIntroductionProcess.vue | 8 ++++---- .../RegulatoryComplianceCheckProcess.vue | 8 ++++---- .../StandardInterpretationProcess.vue | 8 ++++---- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 94535a7..1b2bbee 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', @@ -253,6 +254,7 @@ module.exports = { dataInfo: 'Data Information', updatePerson: 'Regenerator', updateTime: 'Update Time', + handlingSuggestions: 'Handling Suggestions', // 标准字段 standardField: { standardEnglishName: 'Regulation English Name', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 52edd41..e8ebc06 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: '请选择要分发的数据', @@ -253,6 +254,7 @@ module.exports = { dataInfo: '数据信息', updatePerson: '更新人', updateTime: '更新时间', + handlingSuggestions: '处理意见', // 标准字段 standardField: { standardEnglishName: '标准英文名称', diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index 96fbb9c..7d8bfca 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -130,8 +130,8 @@
{{ $t('processApprovalInformation') }}
- - + { diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue index 5b6e5fc..7046eb2 100644 --- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue +++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue @@ -75,8 +75,8 @@
{{ $t('processApprovalInformation') }}
- - + { diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue index 24f7148..cc88bdd 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -106,8 +106,8 @@
{{ $t('processApprovalInformation') }}
- - + { diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue index 7560056..b42b714 100644 --- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue +++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue @@ -90,8 +90,8 @@
{{ $t('processApprovalInformation') }}
- - + Date: Fri, 6 Sep 2024 09:51:03 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[update]=20=E9=AB=98=E7=BA=A7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AF=91=E6=96=87=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/dashboard/en.js | 1 + src/common/lang/dashboard/zh.js | 1 + src/views/dashboard/search/AdvancedSearch.vue | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index 6487685..8b867fe 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -52,6 +52,7 @@ module.exports = { termNo: 'Article No.', termTitle: 'Article Title', termContent: 'Article Content', + translation: 'Translation', applicableComponents: 'Applicable Components', newProduceVehiclesImplementationDate: 'New Certified Vehicle Implementation Date', newAuthVehiclesImplementationDate: 'New Production Vehicle Implementation Date', diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index 7cec826..95e6743 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -52,6 +52,7 @@ module.exports = { termNo: '条款号', termTitle: '条款标题', termContent: '条款内容', + translation: '译文', applicableComponents: '适用零部件', newProduceVehiclesImplementationDate: '新生产车实施日期', newAuthVehiclesImplementationDate: '新认证车实施日期', diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 30063c5..070c2ac 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -211,6 +211,13 @@
{{ global.emptyLine }}
+ + @@ -394,6 +401,13 @@ export default { dataIndex: 'item_content', scopedSlots: { customRender: 'item_content' } }, + { // 译文 + title: this.$t('dashboard.advancedSearch.translation'), + align: 'center', + width: 180, + dataIndex: 'translation', + scopedSlots: { customRender: 'translation' } + }, // { // 适用零部件 // title: this.$t('dashboard.advancedSearch.applicableComponents'), // align: 'center', From aba41648ab34ec10cc842498e1da8f1c6da914d0 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 6 Sep 2024 09:54:50 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Revert=20"[update]=20=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AF=91=E6=96=87=E5=88=97"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 280b7844 --- src/common/lang/dashboard/en.js | 1 - src/common/lang/dashboard/zh.js | 1 - src/views/dashboard/search/AdvancedSearch.vue | 14 -------------- 3 files changed, 16 deletions(-) diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index 8b867fe..6487685 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -52,7 +52,6 @@ module.exports = { termNo: 'Article No.', termTitle: 'Article Title', termContent: 'Article Content', - translation: 'Translation', applicableComponents: 'Applicable Components', newProduceVehiclesImplementationDate: 'New Certified Vehicle Implementation Date', newAuthVehiclesImplementationDate: 'New Production Vehicle Implementation Date', diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index 95e6743..7cec826 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -52,7 +52,6 @@ module.exports = { termNo: '条款号', termTitle: '条款标题', termContent: '条款内容', - translation: '译文', applicableComponents: '适用零部件', newProduceVehiclesImplementationDate: '新生产车实施日期', newAuthVehiclesImplementationDate: '新认证车实施日期', diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 070c2ac..30063c5 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -211,13 +211,6 @@
{{ global.emptyLine }}
- - @@ -401,13 +394,6 @@ export default { dataIndex: 'item_content', scopedSlots: { customRender: 'item_content' } }, - { // 译文 - title: this.$t('dashboard.advancedSearch.translation'), - align: 'center', - width: 180, - dataIndex: 'translation', - scopedSlots: { customRender: 'translation' } - }, // { // 适用零部件 // title: this.$t('dashboard.advancedSearch.applicableComponents'), // align: 'center', From 6992657cce916a6063810abdbb7e6ae9f8a55ce0 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 6 Sep 2024 11:51:48 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=E4=B8=BB=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E4=BA=BA=E5=88=86=E6=89=B9=E4=B8=8B=E5=8F=91=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=8E=92=E6=9F=A5=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E4=B8=8B?= =?UTF-8?q?=E5=8F=91label=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/MainFinderDistributesBaseInfo.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue index ae3cb54..04c8e6c 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue @@ -7,7 +7,7 @@
-
+
* {{ $t('workCenter.regulatoryComplianceCheckProcess.checkWhetherTheTaskIsDelivered') }} @@ -893,4 +893,7 @@ export default { .form-add { margin-top: 20px; } +.title-text-long { + width: 140px !important; +} From a3df6f77b240063c669a2dc31b9b9101b38a9bab Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 6 Sep 2024 14:58:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=A4=96=E6=9D=A5=E6=A0=87=E5=87=86=E5=92=8C?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A2=9E=E5=8A=A0=E5=B7=A6=E4=BE=A7=E6=A0=91?= =?UTF-8?q?=E6=94=B6=E8=B5=B7=E5=B1=95=E5=BC=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/EnterpriseStandardList.vue | 133 ++++++++++------- .../foreignStandard/ForeignStandardList.vue | 139 +++++++++++------- 2 files changed, 169 insertions(+), 103 deletions(-) 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 @@