From 028155c08478ea3319742c892bbc05cf6a160502 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 23 May 2022 09:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 50 ++++++++++--------- jero-web/src/common/lang/zh-cn.js | 2 + .../components/listOfRegulations.vue | 49 +++++++++++++++++- 3 files changed, 76 insertions(+), 25 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 727b31efc..35ab6bf06 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -844,28 +844,30 @@ module.exports = { totalTable: 'Total', newlyAdded: 'Newly Added', applicableSupplement: 'Applicable Supplement', - taskDescription:'Task description', - descriptionDeliverables:'Description of deliverables', - startMonth:'Start Month', - endMonth:'End Month', - Importing:'Importing...', - projectDeliveryDescription:'Project delivery description', - cancelConfirm:'Cancel Confirm', - currentInformation:'Current Information', - deliveryHistory:'Delivery History', - projectDeliveryRequirements:'Project delivery requirements', - personLiableConfirm:'PersonLiable Confirm', - complianceResults:'Compliance results', - noData:'No data', - confirmOperation:'Confirm Operation', - sponsorReview:'Sponsor review', - fillInProjectDelivery:'Fill in project delivery', - Resubmit:'Resubmit', - Quantity:'Quantity', - pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results', - pleaseReviewTask:'Please add the engineering confirmation information for this review task', - pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', - pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status', - modelName:'Model Name', - modelYear:'Model year', + taskDescription: 'Task description', + descriptionDeliverables: 'Description of deliverables', + startMonth: 'Start Month', + endMonth: 'End Month', + Importing: 'Importing...', + projectDeliveryDescription: 'Project delivery description', + cancelConfirm: 'Cancel Confirm', + currentInformation: 'Current Information', + deliveryHistory: 'Delivery History', + projectDeliveryRequirements: 'Project delivery requirements', + personLiableConfirm: 'PersonLiable Confirm', + complianceResults: 'Compliance results', + noData: 'No data', + confirmOperation: 'Confirm Operation', + sponsorReview: 'Sponsor review', + fillInProjectDelivery: 'Fill in project delivery', + Resubmit: 'Resubmit', + Quantity: 'Quantity', + pleaseConfirmationResults: 'Please select the compliance status according to the engineering confirmation results', + pleaseReviewTask: 'Please add the engineering confirmation information for this review task', + pleaseWillBeReturned: 'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', + pleaseSubmitStatus: 'Please submit the data confirmed by the project in the confirmation status', + 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', + onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed' } \ 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 d90e9d8f9..f8101c2f2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -873,4 +873,6 @@ module.exports = { pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交', modelName:'车型名称', modelYear:'年款', + NoteConfirmTheChange:'注意：变更后该条清单变为未审查状态，将从内部审查工作开始从头进行，历史数据都将丢弃是否确认变更', + onlyDataChanged:'只能变更任务确认状态为接受的数据', } \ 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 2a3d8d034..c1096885d 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -54,7 +54,7 @@ {{ $t('initiateTaskConfirmation') }} -
+
{{ $t('alteration') }}
@@ -793,6 +793,53 @@ } } }, + alterationClick() { + if (this.selectedRowKeys.length > 0) { + let _this = this + let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + let isTrue + 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].taskAffirmStatus == 'Accepted') { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.$t('onlyDataChanged')) + return + } + } + } + } + if (isTrue) { + this.changeInterface(selectedRowKeys) + } + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, + changeInterface() { + let _this = this + this.$confirm({ + width:760, + content: _this.$t('NoteConfirmTheChange'), + onOk() { + let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + getAction('/project/projectLawsInventoryEO/change', { + ids: idList.join(','), + projectLibraryId: _this.$route.query.id + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + }, handleAdd() { this.$refs.addModelRef.addModel() },