diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java index 57367ddc9..77397cd88 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java @@ -21,6 +21,7 @@ public enum CertificationInventoryFlowStatusEnum { * 结果待审查 责任人提交后认证工程师未审查 * 审查通过 责任人提交后认证工程师审查通过 * 审查退回 责任人提交后认证工程师审查退回 + * 不涉及 2023-04-12修改UAT需求增加,如果交付物类型为 N/A的话,会将流程状态更新为 不涉及。 */ LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), @@ -33,6 +34,7 @@ public enum CertificationInventoryFlowStatusEnum { RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), REVIEW_AND_PASS("审查通过","Review and pass","Review and pass"), REVIEW_AND_RETURN("审查退回","Review and return","Review and return"), + UNINVOLVED("不涉及","NA","NA"), ; diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index d3aad6ab5..eea0c4d17 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1111,6 +1111,11 @@ let notConditions = [] for (let i = 0; i < this.selectedRowKeysList.length; i++) { if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' && + this.selectedRowKeysList[i].deliverableType == '1635545748968783874') || + (this.selectedRowKeysList[i].flowStatus == 'Certification returned' && + this.selectedRowKeysList[i].deliverableType == '1635545748968783874') ) { + ids.push(this.selectedRowKeysList[i].id) + } else if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' && this.selectedRowKeysList[i].endTime) || (this.selectedRowKeysList[i].flowStatus == 'Certification returned' && this.selectedRowKeysList[i].endTime)) { @@ -1921,7 +1926,7 @@ content: prompt, onOk() { if (NAId && NAId.length > 0) { - this.NASubmitTask(NAId, ids, notConditions, data) + _this.NASubmitTask(NAId, ids, notConditions, data) } if (ids && ids.length > 0) { let query = { @@ -1949,10 +1954,10 @@ NASubmitTask(NAId, ids, notConditions, data) { let _this = this let query = { - 'projectLibraryId': _this.$route.query.id, + 'flowStatus': 'NA', 'ids': NAId.join(',') } - postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => { + postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => { if (res.success) { if (ids && ids.length > 0) { } else {