From 64bf4ac5b32aab4086b41699cd72b210cf7ff968 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 13 Sep 2024 15:52:39 +0800 Subject: [PATCH] =?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?=E8=AF=84=E4=BC=B0=E5=BA=93=E5=88=97=E8=A1=A8=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=EF=BC=8C=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=BA=93=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryComplianceAssessmentDatabase/en.js | 7 +++++-- .../regulatoryComplianceAssessmentDatabase/zh.js | 7 +++++-- .../nonmatchItem/NonmatchItemList.vue | 14 ++++++++++++++ .../RegulatoryComplianceAssessmentList.vue | 2 +- .../modules/AssessmentLookModal.vue | 7 +++++++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js index 0d551a4..972bdfe 100644 --- a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js +++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js @@ -3,7 +3,8 @@ module.exports = { // 法规符合性评估库 assessmentLibrary: { applicableMarket: 'Applicable Market', - dateOfEvaluation: 'Date of Assessment', + evaluationSponsor: 'Evaluation sponsor', + dateOfEvaluation: 'Evaluation completion date', exportName: 'Non-conformance term Library Table', clauseNumber: 'Article No.', vehicleType: 'Vehicle Catagory', @@ -40,6 +41,8 @@ module.exports = { sharedWithOtherProjects: 'Commonality', costOfThisItemAfterSharing: 'Expenses After Sharing', isHaveClosed: 'Select the data whose rectification status is to be rectified and close it', - exportName: 'Non-conformance term Library table' + exportName: 'Non-conformance term Library table', + shutter: 'Shutter', + closingTime: 'Closing time' } } diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js index 297fa13..1603a54 100644 --- a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js +++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js @@ -3,7 +3,8 @@ module.exports = { // 法规符合性评估库 assessmentLibrary: { applicableMarket: '适用市场', - dateOfEvaluation: '评估日期', + evaluationSponsor: '评估发起人', + dateOfEvaluation: '评估完成日期', exportName: '法规符合性评估库表', clauseNumber: '条款号', vehicleType: '车型', @@ -40,6 +41,8 @@ module.exports = { sharedWithOtherProjects: '与其他项目共用性', costOfThisItemAfterSharing: '共用后本项目所需费用', isHaveClosed: '请选择整改状态为待整改的数据进行关闭', - exportName: '不符合项库表' + exportName: '不符合项库表', + shutter: '关闭人', + closingTime: '关闭时间' } } diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue index 0555a5f..2e1636f 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue @@ -259,6 +259,20 @@ export default { dataIndex: 'file', scopedSlots: { customRender: 'file' } }, + { // 关闭人 + title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.shutter'), + align: 'center', + width: 180, + dataIndex: 'closeUser_dictText', + scopedSlots: { customRender: 'text' } + }, + { // 关闭时间 + title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.closingTime'), + align: 'center', + width: 180, + dataIndex: 'closeTime', + scopedSlots: { customRender: 'text' } + }, { title: this.$t('operation'), scopedSlots: { customRender: 'action' }, diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue index bb2c45d..bc7a9a8 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue @@ -146,7 +146,7 @@ export default { dataIndex: 'applicableMarket_dictText', scopedSlots: { customRender: 'dictText' } }, - { // 评估日期 + { // 评估完成日期 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.dateOfEvaluation'), align: 'center', width: 180, diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue index 43c4b02..7ae5cef 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue @@ -207,6 +207,13 @@ export default { dataIndex: 'result_dictText', scopedSlots: { customRender: 'dictText' } }, + { // 评估发起人 + title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.evaluationSponsor'), + align: 'center', + width: 180, + dataIndex: 'assessorInitiator_dictText', + scopedSlots: { customRender: 'text' } + }, { // 不满足要求的现状 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.theStatusNotMeetRequirements'), align: 'center',