From baf53ed07a93900c2c6b58e5561f5791e9c97a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 11:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86\=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E7=A1=AE=E8=AE=A4=E6=89=B9=E9=87=8F=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 15 ++--- jero-web/src/common/lang/zh-cn.js | 16 ++--- .../components/listOfRegulations.vue | 41 ++++++++++--- .../components/settingList.vue | 19 ++++++ .../components/confirmationDrawer.vue | 58 ++++++++++++------- .../reviewedByThePersonInCharge.vue | 3 +- 6 files changed, 107 insertions(+), 45 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index dc512c442..b419bea40 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -600,7 +600,7 @@ module.exports = { selectSplitListDisplay: 'Please select whether to split the document list for display', selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', - VirtualListName: 'Virtual List Name', + VirtualListName: 'Market List Name', CertificationListName:'Certification List Name', listStatus: 'List Status', creater: 'Creater', @@ -857,7 +857,7 @@ module.exports = { cannotExceed: 'Cannot Exceed', Characters: 'Characters', standardInformation: 'Standard Information', - VirtualList: 'VirtualList', + VirtualList: 'MarketList', importTemplate: 'Import Template', verificationConfirmationDeadline: 'Verification compliance confirmation deadline', technicalEvaluationResults: 'Technical Evaluation Results', @@ -875,7 +875,7 @@ module.exports = { reminder: 'Reminder', adopt: 'Adopt', reviewedByThePersonInCharge: 'Reviewed by the person in charge', - onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted', + onlyDeleted: 'Only data that has not started or ended the process can be deleted', experimentPassed: 'Test Passed', experimentFailed: 'Test Failed', toBeStarted: 'Not Start', @@ -897,10 +897,10 @@ module.exports = { pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', pleaseConformityVerification: 'Please complete the data of Conformity verification', - virtualListDetails: 'Virtual List Details', + virtualListDetails: 'Market List Details', virtualAuthenticationListDetails: 'Virtual Authentication List Details', VirtualAuthenticationList: 'Virtual Authentication List', - maintainVirtualList: 'Maintain Virtual List', + maintainVirtualList: 'Maintain Market List', certificationListMaintenance: 'Certification List Maintenance', reasonsForRejection: 'Reasons For Rejection', inconformity: 'Non-Compliance', @@ -950,7 +950,7 @@ module.exports = { pleaseSubmitStatus: 'Please confirm all engineer data before submission.', modelName: 'Model Name', modelYear: 'Model Year', - NoteConfirmTheChange: 'Note: after the change, the list will be in the status of not being reviewed, which will start from the internal review, and the historical data will be discarded Confirm the change', + NoteConfirmTheChange: 'Note: After resetting, the selected item data will change to a list pending release status, and the historical data will disappear. Please confirm whether to perform a process reset', onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed', inquiry: 'Inquiry', ConfirmationDeadline: 'Confirmation Deadline', @@ -1699,6 +1699,7 @@ module.exports = { hardwaremanufacturer:'Hardware manufacturer', softwareversion:'Software version', returntofill:'Return to fill', - + thereAreCurrentlyNoRegulationsToHandle:'There are currently no regulations to handle', + certificationSubmission:'Certification Submission', } \ 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 8d7024f75..3552ba9c8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -608,9 +608,9 @@ module.exports = { selectSplitListDisplay: '请选择是否文档拆分列表展示', selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', - VirtualListName: '虚拟清单名称', + VirtualListName: '市场清单名称', CertificationListName:'认证清单名称', - VirtualList: '虚拟清单', + VirtualList: '市场清单', listStatus: '清单状态', creater: '创建人', withdraw: '撤回', @@ -890,7 +890,7 @@ module.exports = { reminder: '提醒', adopt: '通过', reviewedByThePersonInCharge: '负责人审核', - onlyDeleted: '只能删除清单确认状态为未发起或拒绝的数据', + onlyDeleted: '只能删除流程未开始和流程结束的数据', experimentPassed: '实验通过', experimentFailed: '实验失败', toBeStarted: '待开始', @@ -901,7 +901,7 @@ module.exports = { blue: '蓝', yellow: '黄', resultReported: '结果报告', - TheDoesNotContainData: '该虚拟清单的维护清单中没有数据,是否需要添加', + TheDoesNotContainData: '该市场清单的维护清单中没有数据,是否需要添加', number: '序号', Deadline: '截止时间', designComplianceReview: '设计符合性确认', @@ -910,10 +910,10 @@ module.exports = { pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', - virtualListDetails: '虚拟清单详情', + virtualListDetails: '市场清单详情', virtualAuthenticationListDetails: '虚拟认证清单详情', VirtualAuthenticationList: '虚拟认证清单', - maintainVirtualList: '维护虚拟清单', + maintainVirtualList: '维护市场清单', certificationListMaintenance: '认证清单维护', reasonsForRejection: '驳回原因', inconformity: '不符合', @@ -962,7 +962,7 @@ module.exports = { pleaseSubmitStatus: '请把工程确认的数据都点为确认状态进行提交', modelName: '车型名称', modelYear: '年款', - NoteConfirmTheChange: '注意：变更后该条清单变为未审查状态，将从内部审查工作开始从头进行，历史数据都将丢弃是否确认变更', + NoteConfirmTheChange: '注意：重置后所选条目数据将变为清单待发布状态，历史数据将消失，请确认是否进行流程重置', onlyDataChanged: '只能变更任务确认状态为接受的数据', inquiry: '询问', ConfirmationDeadline: '确认截止时间', @@ -1799,4 +1799,6 @@ module.exports = { returntofill:'返回填写', onlyDataInTheReminderProcessBanBeProcessed:'只能催办流程中的数据', expeditionProcess:'催办流程', + thereAreCurrentlyNoRegulationsToHandle:'当前没有可处理的法规', + certificationSubmission:'认证提交', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3da734972..333a2acdb 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -274,9 +274,18 @@ {{ $t('deleteLib') }} @@ -1220,7 +1229,11 @@ TaskKey = 'zrrqr' } else if (row.designFlowStatus == 'Results to be submitted') { TaskKey = 'zrrtjjfw' - } else if (row.designFlowStatus == 'Results to be reviewed') { + } else if (row.designFlowStatus == 'Results to be reviewed' || + row.designFlowStatus == 'Compliance' || + row.designFlowStatus == 'Non-Compliance' || + row.designFlowStatus == 'To be tracked' || + row.designFlowStatus == 'NA') { TaskKey = 'fggcssh' } query = { @@ -1246,7 +1259,11 @@ TaskKey = 'zrrqr' } else if (row.verifyFlowStatus == 'Results to be submitted') { TaskKey = 'zrrtjjfw' - } else if (row.verifyFlowStatus == 'Results to be reviewed') { + } else if (row.verifyFlowStatus == 'Results to be reviewed' || + row.verifyFlowStatus == 'Compliance' || + row.verifyFlowStatus == 'Non-Compliance' || + row.verifyFlowStatus == 'To be tracked' || + row.verifyFlowStatus == 'NA') { TaskKey = 'fggcssh' } query = { @@ -1711,8 +1728,18 @@ for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - if (this.dataSource[i].verifyFlowStatus == 'List to be released' || - this.dataSource[i].designFlowStatus == 'List to be released') { + if ( + (this.dataSource[i].verifyFlowStatus == 'List to be released' || + this.dataSource[i].verifyFlowStatus == 'Compliance' || + this.dataSource[i].verifyFlowStatus == 'Non-Compliance' || + this.dataSource[i].verifyFlowStatus == 'To be tracked' || + this.dataSource[i].verifyFlowStatus == 'NA') + && + (this.dataSource[i].designFlowStatus == 'List to be released' || + this.dataSource[i].designFlowStatus == 'Compliance' || + this.dataSource[i].designFlowStatus == 'Non-Compliance' || + this.dataSource[i].designFlowStatus == 'To be tracked' || + this.dataSource[i].designFlowStatus == 'NA')) { isTrue = true } else { isTrue = false diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 1fa78f812..e06252266 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -109,6 +109,25 @@
+ + + {{$t('certificationSubmission')}} +
+ + + +
+ + +
+
{{$t('certificationEnd')}} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue index 9b060963e..8d89b4242 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue @@ -56,9 +56,9 @@ {{$t('resultofhandling')}}
- + + v-model="formInline.flag"> {{$t('accept')}} @@ -130,6 +130,7 @@ import uploadFile from '@/components/uploadFile/file' import { getAction, postAction, putAction, deleteAction } from '@/api/manage' import { mapGetters } from 'vuex' + import moment from 'moment' export default { name: 'confirmationDrawer', @@ -226,12 +227,12 @@ ], processableList: [], noProcessableList: [], - loading:false, + loading: false, rules: { - disposeResult: [ + flag: [ { required: true, - message: this.$t('reviewResults') + this.$t('cannotEmpty'), + message: this.$t('resultofhandling') + this.$t('cannotEmpty'), trigger: 'change' } ], @@ -296,24 +297,37 @@ this.visible = false }, determineClick() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - let query = { - userid: this.userInfo().id, - taskId: this.queryData.taskId || this.queryData.taskIds, - } - postAction('/workFlow/completeTask', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.$emit('confirmationdrawerList') - } else { - this.loading = false - this.$message.warning(res.message) + if (this.processableList && this.processableList.length > 0) { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.loading = true + let taskIds = [] + this.processableList.forEach(res => { + taskIds.push(res.taskId) + }) + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + let query = { + ...this.formInline, + taskIds: taskIds.join(','), + userId: this.userInfo().id, + handlingTime: handlingTime } - }) - } - }) + postAction('/workFlow/completeTaskBatch', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.loading = false + this.$emit('confirmationdrawerList') + } else { + this.loading = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + } else { + this.$message.warning(this.$t('thereAreCurrentlyNoRegulationsToHandle')) + } }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index c5972a464..230759ce6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -120,7 +120,7 @@ disposeResult: [ { required: true, - message: this.$t('reviewResults') + this.$t('cannotEmpty'), + message: this.$t('resultofhandling') + this.$t('cannotEmpty'), trigger: 'change' } ], @@ -159,7 +159,6 @@ } }, mounted() { - console.log(this.query) this.formInline.approvalOpinion = '' this.formInline = { ...this.formInline } // this.query.isDisplay = JSON.parse(this.query.isDisplay)