From 5d519167c1910dbf353c3432a82530149f5e1bb6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 18:16:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/evaluatorFeedback.vue | 49 ++++++++++++++++--- .../regulatoryCirculationHistory.vue | 2 +- .../processForm/evaluationProcess/index.vue | 46 +++++++++++++++-- 5 files changed, 85 insertions(+), 14 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d05cdc046..1dc0d3d5c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1131,4 +1131,5 @@ module.exports = { clauseEvaluation:'Clause evaluation', standardDocuments:'Standard documents', pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', + reviewComments:'Review comments', } \ 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 4c2a26c01..4c6a71b22 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1135,4 +1135,5 @@ module.exports = { clauseEvaluation:'条款评估', standardDocuments:'标准文件', pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人', + reviewComments:'审核意见', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index f69d75e3a..659f96077 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -50,7 +50,7 @@ * {{$t('relevantSections')}} -
+
{{item.relatedSection}}
{{$t('problemDescription')}}
-
+
{{item.issueOrSuggest}}
{{$t('enclosure')}}
- - {{$t('viewUploadedFiles')}} + + {{$t('viewFile')}} -- @@ -113,6 +114,25 @@
+
+
+ {{$t('sponsorReview')}} +
+
+ + +
+
+ * + {{$t('reviewComments')}} +
+ + + +
+ + @@ -124,6 +144,7 @@ import { getAction, postAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' import viewFileModel from '@/components/viewFileModel/index' + export default { name: 'evaluatorFeedback', components: { @@ -157,6 +178,18 @@ trigger: 'change' } ], + approvalOpinion: [ + { + required: true, + message: this.$t('reviewComments') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], relatedSection: [ { required: true, @@ -315,7 +348,7 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 110px); display: inline-block; margin-top: 2px; margin-bottom: 12px; @@ -324,8 +357,8 @@ .title-text-right { display: inline-block; width: calc(100% - 130px); - padding-top: 15px; - font-size: 14px; + padding-top: 12px; + font-size: 16px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -351,7 +384,7 @@ } .feedbackPoint { - font-size: 14px; + font-size: 16px; font-weight: 400; color: #000F16; margin-bottom: 10px; diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue index 542632113..6fda1fd06 100644 --- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue @@ -68,7 +68,7 @@ getList() { let query = { actiProcInstId: this.$route.query.prcId, - flowType: '5' + flowType: this.$route.query.prcType } getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 69ff81f3d..17fcc8177 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -26,10 +26,12 @@ /> @@ -70,7 +72,9 @@ isDisplay: true, feedbackDataList: [], queryProject: {}, - complianceResult:{}, + complianceResult: {}, + isPreservation: false, + isSendBack: false, isTrue: false, standardContentList: [ { @@ -107,6 +111,13 @@ }, mounted() { this.isDisplay = false + if (this.$route.query.taskDefinitionKey == 'pgrqr') { + this.isPreservation = true + this.isSendBack = false + } else { + this.isPreservation = false + this.isSendBack = true + } this.queryTaskDetailByTask() }, methods: { @@ -176,15 +187,40 @@ } }) }, + sendBack() { + if (this.isTrue) { + + } else { + this.$refs.evaluatorFeedbackRef.preservationData((res) => { + this.loading = true + this.queryProject.approvalOpinion = res.approvalOpinion + this.queryProject.flag = '2' + this.completeTask() + }) + } + }, submit() { - this.$refs.evaluatorFeedbackRef.submitData((res) => { - this.insertBatch(res, 2) - }) + if (this.isTrue) { + + } else { + this.$refs.evaluatorFeedbackRef.submitData((res) => { + if (this.$route.query.taskDefinitionKey == 'pgrqr') { + this.loading = true + this.insertBatch(res, 2) + } else { + this.loading = true + this.queryProject.approvalOpinion = res.approvalOpinion + this.queryProject.flag = '1' + this.completeTask() + } + }) + } }, completeTask() { let query = { userid: this.userInfo().id, taskId: this.$route.query.taskIds, + flag: this.queryProject.flag, json: JSON.stringify(this.queryProject).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => {