From 3fc8d8c85b7354112c09eceab98ea86aa718c6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 24 Apr 2023 11:28:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++ jero-web/src/common/lang/zh-cn.js | 4 ++ .../components/certificationList/index.vue | 66 ++++++++++++++++++- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1bdd0684d..625954e6d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1801,4 +1801,8 @@ module.exports = { verifytheconformancedeliverabletype:'Verify the conformance deliverable type', designaconformancedeliverabletype:'Design a conformance deliverable type', reasonForReturnOfCompliance:'Reason for compliance return', + supplementarySubmission:'Supplementary Submission', + confirmSupplementarySubmission:'Confirm Supplementary Submission ?', + onlyProcessStatusOfApprovedCanBeSelected:'Only data with a process status of approved can be selected', + andTheOperatorCurrentData:' And the operator is the responsible person for the current data', } \ 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 4a7f90656..829a4533c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1903,4 +1903,8 @@ module.exports = { verifytheconformancedeliverabletype:'验证符合性交付物类型', designaconformancedeliverabletype:'设计符合性交付物类型', reasonForReturnOfCompliance: '符合性退回原因', + supplementarySubmission:'补充提交', + confirmSupplementarySubmission:'确认补充提交?', + onlyProcessStatusOfApprovedCanBeSelected:'只能选择流程状态为审查通过的数据', + andTheOperatorCurrentData:',并且登录人为当前数据的责任人', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 523b0f69f..9aa533fb4 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -227,6 +227,14 @@ {{ $t('reviewAndReturn') }} + +
+ + {{ $t('supplementarySubmission') }} +
+
0) { + let ids = [] + let notConditions = [] + let _this = this + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') { + if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { + ids.push(this.selectedRowKeysList[i].id) + } else if (this.roleSwitchingCode == 21) { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } + } + let data = '' + if (notConditions && notConditions.length > 0) { + if (this.roleSwitchingCode == 20) { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusOfApprovedCanBeSelected') + this.$t('andTheOperatorCurrentData') + } else { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusOfApprovedCanBeSelected') + } + } + if (ids && ids.length > 0) { + this.$confirm({ + content: _this.$t('confirmSupplementarySubmission'), + onOk() { + let query = { + ids: ids.join(','), + 'flowStatus': 'Results to be submitted' + } + postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + _this.selectedRowKeys = [] + _this.selectedRowKeysList = [] + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + } else { + this.failedMessage(data) + } + } else { + this.$message.warning(this.$t('selectLeastOne')) + } } } }