diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 533f02122..83b73c96f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1834,4 +1834,5 @@ module.exports = { deliveryTime:'Delivery Time', expectedDeliveryTime:'Expected Delivery Time', changeAuthor:'Change Author', + theProcessThatNeedsToBeReset:'The process that needs to be reset', } \ 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 e9e2d3a19..1b65de92b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1935,4 +1935,5 @@ module.exports = { deliveryTime:'交付时间', expectedDeliveryTime:'预计交付时间', changeAuthor:'更改作者', + theProcessThatNeedsToBeReset:'需要重置的流程', } \ 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 a184b8a39..fe17baa7c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -616,6 +616,43 @@ + + + {{$t('NoteConfirmTheChange')}} + + + + + + + * + {{ $t('processReset') }} + + + + + + {{ item.name }} + + + + + + + + + { + this.$refs.ruleFormReset.clearValidate() + }) + // this.changeInterface(selectedRowKeys) + this.visibleReset = true } } else { this.$message.warning(this.$t('selectLeastOne')) } }, - + handleOkReset() { + this.$refs.ruleFormReset.validate(valid => { + if (valid) { + let _this = this + let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectLawsInventoryEO/change', { + ids: idList.join(','), + projectLibraryId: _this.$route.query.id, + operateType: _this.formInlineReset.operateType + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.pageNo = 1 + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + }, + handleCancelReset() { + this.visibleReset = false + }, //流程重置接口 changeInterface() { let _this = this @@ -2858,9 +2950,9 @@ } if (dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') { if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) { - if (dataList[i].designDeliverableType == '1645667531513237506'){ + if (dataList[i].designDeliverableType == '1645667531513237506') { - }else{ + } else { this.requestsNum++ this.startProcessList.push({ dataList: dataList[i], @@ -2876,9 +2968,9 @@ } if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') { if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { - if (dataList[i].verifyDeliverableType == '1645667531513237506'){ + if (dataList[i].verifyDeliverableType == '1645667531513237506') { - }else{ + } else { this.requestsNum++ this.startProcessList.push({ dataList: dataList[i], @@ -3457,6 +3549,11 @@ .operator-text-title:last-child { margin-bottom: 0; } + + .noteConfirm { + font-size: 14px; + margin-bottom: 10px; + }