From 1cb0a4c89daecacd9dff84030b108ca47f914653 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 17 May 2022 10:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=80=82=E7=94=A8=E5=A2=9E=E8=A1=A5=E4=BB=B6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 73 ++++++++++--------- jero-web/src/common/lang/zh-cn.js | 49 +++++++------ .../virtualList/components/editModel.vue | 21 ++++++ .../components/virtualListDetails.vue | 11 ++- 4 files changed, 92 insertions(+), 62 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68886a566..57e72ec00 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -797,40 +797,41 @@ module.exports = { red: 'red', blue: 'blue', yellow: 'yellow', - resultReported:'Result Reported', - TheDoesNotContainData:'The maintenance list of the virtual list does not contain data', - number:'No', - Deadline:'Deadline', - toBeConfirmed:'To be confirmed', - designComplianceReview:'Confirm design conformance', - preHomeConfirmation:'PreHomo confirmation', - verificationComplianceReview:'Verify conformance validation', - Deployment:'Deployment', - pleaseDesignConformityConfirmation:'Please complete the data of design conformity confirmation', - pleaseConfirmedByPrehomo:'Please complete the data confirmed by prehomo', - pleaseConformityVerification:'Please complete the data of Conformity verification', - virtualListDetails:'Virtual list details', - maintainVirtualList:'Maintain virtual list', - reasonsForRejection:'Reasons for rejection', - inconformity:'Non-Compliance', - toTrack:'To be tracked', - Launch:'Launch', - maintainProgress:'Maintain', - redSchedule:'Red: not in conformity, and there is no acceptable scheme and schedule', - yellowSchedule:'Yellow: non conformance / to be tracked, with acceptable scheme and schedule', - greenRequirements:'Green: confirm that it meets or meets the current requirements', - blueUndeterminedState:'Blue: undetermined state', - authenticationMessage:'Authentication Message', - accept:'Accept', - notLaunch:'Not Launch', - refuse:'Refuse', - taskTermination:'Task termination', - projectStatusAndProgress:'Project status and progress', - listConfirmationProgress:'List confirmation progress', - taskConfirmationProgress:'Task confirmation progress', - designComplianceConfirmationProgress:'Design Compliance Confirmation Progress', - preHomeConfirmProgress:'Pre-Home confirm progress', - verificationComplianceConfirmationProgress:'Verification compliance confirmation progress', - totalTable:'Total', - newlyAdded:'Newly Added', + resultReported: 'Result Reported', + TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data', + number: 'No', + Deadline: 'Deadline', + toBeConfirmed: 'To be confirmed', + designComplianceReview: 'Confirm design conformance', + preHomeConfirmation: 'PreHomo confirmation', + verificationComplianceReview: 'Verify conformance validation', + Deployment: 'Deployment', + pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', + pleaseConfirmedByPrehomo: 'Please complete the data confirmed by prehomo', + pleaseConformityVerification: 'Please complete the data of Conformity verification', + virtualListDetails: 'Virtual list details', + maintainVirtualList: 'Maintain virtual list', + reasonsForRejection: 'Reasons for rejection', + inconformity: 'Non-Compliance', + toTrack: 'To be tracked', + Launch: 'Launch', + maintainProgress: 'Maintain', + redSchedule: 'Red: not in conformity, and there is no acceptable scheme and schedule', + yellowSchedule: 'Yellow: non conformance / to be tracked, with acceptable scheme and schedule', + greenRequirements: 'Green: confirm that it meets or meets the current requirements', + blueUndeterminedState: 'Blue: undetermined state', + authenticationMessage: 'Authentication Message', + accept: 'Accept', + notLaunch: 'Not Launch', + refuse: 'Refuse', + taskTermination: 'Task termination', + projectStatusAndProgress: 'Project status and progress', + listConfirmationProgress: 'List confirmation progress', + taskConfirmationProgress: 'Task confirmation progress', + designComplianceConfirmationProgress: 'Design Compliance Confirmation Progress', + preHomeConfirmProgress: 'Pre-Home confirm progress', + verificationComplianceConfirmationProgress: 'Verification compliance confirmation progress', + totalTable: 'Total', + newlyAdded: 'Newly Added', + applicableSupplement: 'Applicable Supplement' } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2c8d7d0d5..c15b0411e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -56,7 +56,7 @@ module.exports = { no: '没有任何', click: '点击', add: '添加', - newlyAdded:'新增', + newlyAdded: '新增', FilterMatching: '过滤条件匹配', AllMatching: '（所有条件都要求匹配）', AnyOneMatches: '（条件中的任意一个匹配）', @@ -815,27 +815,28 @@ module.exports = { pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', - virtualListDetails:'虚拟清单详情', - maintainVirtualList:'维护虚拟清单', - reasonsForRejection:'驳回原因', - inconformity:'不符合', - toTrack:'待追踪', - Launch:'发起', - notLaunch:'未发起', - maintainProgress:'维护进度', - redSchedule:'红：不符合，且无可接受的方案和时间表', - yellowSchedule:'黄：不符合/待追踪，有可接受的方案和时间表', - greenRequirements:'绿：确认符合或满足当前要求', - blueUndeterminedState:'蓝：未判断状态', - authenticationMessage:'认证消息', - accept:'接受', - refuse:'拒绝', - taskTermination:'任务终止', - projectStatusAndProgress:'项目状态进度', - listConfirmationProgress:'清单确认进度', - taskConfirmationProgress:'任务确认进度', - designComplianceConfirmationProgress:'设计符合性确认进度', - preHomeConfirmProgress:'Pre-Home确认进度', - verificationComplianceConfirmationProgress:'验证符合性确认进度', - totalTable:'总数', + virtualListDetails: '虚拟清单详情', + maintainVirtualList: '维护虚拟清单', + reasonsForRejection: '驳回原因', + inconformity: '不符合', + toTrack: '待追踪', + Launch: '发起', + notLaunch: '未发起', + maintainProgress: '维护进度', + redSchedule: '红：不符合，且无可接受的方案和时间表', + yellowSchedule: '黄：不符合/待追踪，有可接受的方案和时间表', + greenRequirements: '绿：确认符合或满足当前要求', + blueUndeterminedState: '蓝：未判断状态', + authenticationMessage: '认证消息', + accept: '接受', + refuse: '拒绝', + taskTermination: '任务终止', + projectStatusAndProgress: '项目状态进度', + listConfirmationProgress: '清单确认进度', + taskConfirmationProgress: '任务确认进度', + designComplianceConfirmationProgress: '设计符合性确认进度', + preHomeConfirmProgress: 'Pre-Home确认进度', + verificationComplianceConfirmationProgress: '验证符合性确认进度', + totalTable: '总数', + applicableSupplement: '适用增补件' } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 39d0dd00b..b5ee1627d 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -260,6 +260,20 @@ + +
+
+ {{$t('applicableSupplement')}} +
+ + + +
+ @@ -539,6 +553,13 @@ trigger: 'blur' } ], + applicableSupplement:[ + { + max: 100, + message: this.$t('applicableSupplement') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], remark: [ { max: 300, diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index b189b8c31..edc07216c 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -271,7 +271,7 @@ exportData: '/dummy/dummyInventoryInfoEO/exportData', exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate', getSysCategoryTree: '/sys/category/getSysCategoryTree', - logList:'/dummy/dummyLogEO/page', + logList: '/dummy/dummyLogEO/page' }, loading: false, dataSource: [], @@ -370,6 +370,13 @@ dataIndex: 'attestationRank_dictText', scopedSlots: { customRender: 'titleName' } }, + { + title: this.$t('applicableSupplement'), + align: 'center', + width: 180, + dataIndex: 'applicableSupplement', + scopedSlots: { customRender: 'titleName' } + }, { title: this.$t('technicalField'), align: 'center', @@ -590,7 +597,7 @@ this.getList() }, UpdateLogClick() { - this.$refs.UpdateLogRef.getList({dummyInventoryBaseId:this.$route.query.id}) + this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id }) }, searchQuery() { this.getList()