From d6fbd52e1a129498c0913940d0b04382c46bc8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Tue, 6 Sep 2022 11:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 3 +- .../processForm/handshakeProcess/index.vue | 10 +-- .../components/listEditModel.vue | 62 ++++++++++++++++++- .../components/listOfRegulationsView.vue | 61 +++++++++++++++++- 5 files changed, 127 insertions(+), 11 deletions(-) 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 @@
- {{$t('reasonsForRejection')}} + {{$t('listConfirmationRejectionReason')}}
+
@@ -847,6 +848,51 @@
+ +
+ {{$t('taskConfirmationRejectionReason')}} +
+ +
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -881,6 +927,7 @@ visible: false, confirmLoading: false, rules: {}, + rejectCauseListOne: [], rulesData: { subtitle: [ { @@ -966,9 +1013,20 @@ } getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { if (res.success) { - this.rejectCauseList = res.result + this.rejectCauseList = [] + this.rejectCauseListOne = [] + if (res.result && res.result.length > 0) { + res.result.forEach(val => { + if (val.rejectType == '0') { + this.rejectCauseList.push(val) + } else if (val.rejectType == '1') { + this.rejectCauseListOne.push(val) + } + }) + } } else { this.rejectCauseList = [] + this.rejectCauseListOne = [] } }) }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index d95bdb5cc..e3f3da2b7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -434,7 +434,7 @@
- {{$t('reasonsForRejection')}} + {{$t('listConfirmationRejectionReason')}}
@@ -476,6 +476,49 @@
+
+ {{$t('taskConfirmationRejectionReason')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -507,7 +550,8 @@ formInline: {}, disabled: false, userInfoQuery: {}, - rejectCauseList:[] + rejectCauseList:[], + rejectCauseListOne:[] } }, mounted() { @@ -527,9 +571,20 @@ } getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { if (res.success) { - this.rejectCauseList = res.result + this.rejectCauseList = [] + this.rejectCauseListOne = [] + if (res.result && res.result.length > 0) { + res.result.forEach(val => { + if (val.rejectType == '0') { + this.rejectCauseList.push(val) + } else if (val.rejectType == '1') { + this.rejectCauseListOne.push(val) + } + }) + } } else { this.rejectCauseList = [] + this.rejectCauseListOne = [] } }) },