diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0f184b54f..2173516e1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1283,4 +1283,6 @@ module.exports = { rejectReason:'Reject Reason', collectionLegislativeComments:'Collection of Legislative Comments', regulatoryAndTechnicalAssessment:'Regulatory and technical assessment', + listConfirmationRejectionReason:'List confirmation rejection reason', + taskConfirmationRejectionReason:'Task confirmation rejection reason' } \ 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 45c33af9a..aef1cdb45 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1385,5 +1385,6 @@ module.exports = { rejectReason:'拒绝原因', collectionLegislativeComments:'法规意见收集', regulatoryAndTechnicalAssessment:'法规技术评估', - + listConfirmationRejectionReason:'清单确认驳回原因', + taskConfirmationRejectionReason:'任务确认驳回原因' } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index ec731f550..41fa34ad3 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -189,8 +189,8 @@ rejectUserId:this.userInfo().id, rejectTime:rejectTime, rejectCause:rejectCause, - projectLawsInventoryId:ids.join(','), - rejectType:'0', + projectLawsInventoryId:ids, + rejectType:'1', } postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { @@ -198,9 +198,9 @@ }, completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) - // if (json.flag == '1'){ - // this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) - // } + if (json.flag == '1'){ + this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) + } Object.keys(json).forEach(res => { if (json[res] && typeof json[res] == 'string') { json[res] = json[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 9d45f7dec..15205e741 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -805,8 +805,9 @@