diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index db9e8da99..bbbcdece6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1770,6 +1770,7 @@ module.exports = { theCurrentlySelectedDataContainsReviewed:'The currently selected data contains reviewed data. Are you sure to return it?', reviewTheReasonForReturn:'Review the reason for return', reasonForTaskRejection:'Reason for task rejection', + reasonForReturningToStudio:'Reason for returning to Studio', theDeliveryProcessCannotBeEmpty:'The delivery type of the design compliance process cannot be empty', theVerificationComplianceProcessCannotBeEmpty:'The delivery type of the verification compliance process cannot be empty', deadlineForConfirmationDesignComplianceResponsibility:'Deadline for Confirmation of Design Compliance Responsibility', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 07dbc2a18..4e9ace7af 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1872,6 +1872,7 @@ module.exports = { theCurrentlySelectedDataContainsReviewed:'当前选择的数据中包含审查通过的数据,确认退回吗?', reviewTheReasonForReturn:'审查退回原因', reasonForTaskRejection:'任务拒绝原因', + reasonForReturningToStudio:'退回至Studio原因', theDeliveryProcessCannotBeEmpty:'设计符合性流程的交付物类型不能为空', theVerificationComplianceProcessCannotBeEmpty:'验证符合性流程的交付物类型不能为空', deadlineForConfirmationDesignComplianceResponsibility:'设计符合性责任确认截止日期', diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/reasonForReturn.vue b/jero-web/src/views/projectManagement/components/certificationList/components/reasonForReturn.vue index 29a1eddcc..95aecf4cd 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/reasonForReturn.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/reasonForReturn.vue @@ -18,9 +18,9 @@ * {{ title }} - + @@ -39,15 +39,7 @@ visible: false, confirmLoading: false, formInline: {}, - rules: { - explanation: [ - { - max: 100, - message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'change' - } - ] - }, + rules: {}, value: '', text: '', ids: [], @@ -72,7 +64,7 @@ this.$nextTick(() => { this.$refs.ruleForm.clearValidate() this.rules = { - explanation: [ + reasonForReturn: [ { required: true, message: title + this.$t('cannotEmpty'), @@ -90,7 +82,7 @@ handleOk() { this.$refs.ruleForm.validate(valid => { if (valid) { - this.$emit('reasonForReturnForm', this.value, this.text, this.ids, this.notConditions, this.data) + this.$emit('reasonForReturnForm', this.value, this.text, this.ids, this.notConditions, this.data,this.formInline.reasonForReturn) this.confirmLoading = true } }) @@ -110,7 +102,7 @@ } .title-text { - width: 114px; + width: 124px; text-align: right; display: inline-block; font-weight: 500; @@ -130,7 +122,7 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 140px); display: inline-block; margin-top: 2px; margin-bottom: 14px; diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index eea0c4d17..e0d4b2485 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1698,7 +1698,8 @@ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusReturned') } if (ids && ids.length > 0) { - this.submitTask(value, prompt, ids, notConditions, data) + this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, this.$t('reasonForReturningToStudio')) + // this.submitTask(value, prompt, ids, notConditions, data) } else { this.failedMessage(data) } @@ -1877,12 +1878,13 @@ this.$message.warning(this.$t('selectLeastOne')) } }, - reasonForReturnForm(value, text, ids, notConditions, data) { + reasonForReturnForm(value, text, ids, notConditions, data,reasonForReturn) { let _this = this let query = { 'nodeKey': value, 'projectLibraryId': _this.$route.query.id, - 'ids': ids.join(',') + 'ids': ids.join(','), + reasonForReturn:reasonForReturn } postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e36b83c5a..921e0824f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -408,7 +408,7 @@ - +
@@ -431,7 +431,7 @@
- +
@@ -644,6 +644,8 @@ toggleSearchStatus: false, visibleQuestion: false, confirmLoadingQuestion: false, + isDesignCompliance: false, + isVerifyingCompliance: false, pageNo: 1, pageSize: 50, total: 0, @@ -908,13 +910,13 @@ trigger: 'change' } ], - deadlineDueDate:[ + deadlineDueDate: [ { required: true, message: this.$t('deadlineForVerifyingComplianceResponsibilityConfirmation') + this.$t('cannotEmpty'), trigger: 'change' } - ], + ] }, queryParam: {}, fileTitle: '', @@ -1398,7 +1400,8 @@ JTextLoading: false, questionIdList: [], questionWarning: [], - startProcessList: [] + startProcessList: [], + updateFlowStatusList: [] } }, @@ -2459,8 +2462,11 @@ this.detailedSuccessList = [] this.detailedWarningList = [] }) - }else{ + } else { this.confirmLoading = true + if (this.updateFlowStatusList && this.updateFlowStatusList.length > 0) { + this.updateFlowStatusBatch() + } for (let i = 0; i < this.startProcessList.length; i++) { this.startProcess(this.startProcessList[i].dataList, this.startProcessList[i].type, this.startProcessList[i].requestsNum) } @@ -2488,7 +2494,7 @@ this.confirmLoading = false this.JTextLoading = false this.getList() - if(this.detailedWarningList && this.detailedWarningList.length > 0){ + if (this.detailedWarningList && this.detailedWarningList.length > 0) { this.promptInformation(this.detailedWarningList) } } @@ -2555,6 +2561,7 @@ if (idList && idList.length > 0) { if (num == 0) { this.startProcessList = [] + this.updateFlowStatusList = [] this.submitClick(this.rowKeysSuccessList) } else { this.visibleComment = true @@ -2576,9 +2583,13 @@ this.requestsNum = 0 // this.JTextLoading = true for (let i = 0; i < dataList.length; i++) { - if(dataList[i].designDeliverableType == '1645667531513237506'){ - - }else if (dataList[i].designDeliverableType) { + if ((dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') && + dataList[i].designDeliverableType == '1645667531513237506') { + this.updateFlowStatusList.push({ + id: dataList[i].id, + operateType: 'lawsInventoryDesignUpdateFlowStatus' + }) + } else if (dataList[i].designDeliverableType) { if (!dataList[i].designDutyId) { _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForDesignCannotBeBlank') } < /div>) @@ -2591,8 +2602,12 @@ _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('theDeliveryProcessCannotBeEmpty') } < /div>) } - if (dataList[i].verifyDeliverableType == '1645667531513237506'){ - + if ((dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') && + dataList[i].verifyDeliverableType == '1645667531513237506') { + this.updateFlowStatusList.push({ + id: dataList[i].id, + operateType: ' lawsInventoryVerifyUpdateFlowStatus' + }) } else if (dataList[i].verifyDeliverableType) { if (!dataList[i].verifyDueDate) { _this.detailedWarningList.push( @@ -2636,16 +2651,55 @@ } } if (this.requestsNum == 0) { - if (_this.detailedWarningList && _this.detailedWarningList.length > 0) { - _this.promptInformation(_this.detailedWarningList) + if (this.updateFlowStatusList.length > 0) { + this.updateFlowStatusBatch() + } else { + if (_this.detailedWarningList && _this.detailedWarningList.length > 0) { + _this.promptInformation(_this.detailedWarningList) + } } // this.JTextLoading = false } else { this.listTitle = this.$t('initiateTask') this.timeName = '任务' this.visible = true + this.isDesignCompliance = false + this.isVerifyingCompliance = false + for (let i = 0; i < this.startProcessList.length; i++) { + if (this.startProcessList[i].type == 2) { + this.isDesignCompliance = true + } else if (this.startProcessList[i].type == 4) { + this.isVerifyingCompliance = true + } + } } }, + updateFlowStatusBatch() { + let query = { + flowStatus: 'NA', + lawsInventoryArray: this.updateFlowStatusList + } + postAction('/project/projectLawsInventoryEO/updateFlowStatusBatch', query).then((res) => { + if (res.success) { + if (this.requestsNum == 0) { + this.visible = false + this.selectedRowKeys = [] + this.$message.success(this.$t('OperationSuccessful')) + this.confirmLoading = false + this.JTextLoading = false + this.getList() + if (this.detailedWarningList && this.detailedWarningList.length > 0) { + this.promptInformation(this.detailedWarningList) + } + } + } else { + if (this.requestsNum == 0) { + this.confirmLoading = false + this.$message.warning(this.$t('operationFailed')) + } + } + }) + }, handleOkComment() { this.$refs.ruleFormComment.validate(valid => { if (valid) { @@ -2825,7 +2879,7 @@ download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, - profileClick(){ + profileClick() { let _this = this this.$confirm({ width: 760, @@ -2846,7 +2900,7 @@ }) } }) - }, + } } }