From 3fefe0198d8ad2dca2369210ba36042c3cf991f1 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 14:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluatorFeedback.vue | 25 ++++- .../components/evaluatorFeedbackList.vue | 95 +++++++++++++++++-- .../processForm/evaluationProcess/index.vue | 6 +- .../components/SentList.vue | 36 ++++++- .../components/doneList.vue | 36 ++++++- .../regulatoryAssessmentTasks/index.vue | 5 +- 6 files changed, 186 insertions(+), 17 deletions(-) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index ef8d4b8d1..901df1907 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -156,12 +156,12 @@ -
+
{{$t('sponsorReview')}}
- +
@@ -175,6 +175,18 @@
+ + +
+
+ {{$t('reviewComments')}} +
+
+ {{formInline.approvalOpinion}} +
+
+ +
@@ -259,7 +271,8 @@ }, disabled: false, uploadIndex: '', - dataList: [] + dataList: [], + isTrue:false, } }, mounted() { @@ -283,8 +296,14 @@ }) if (this.$route.query.taskDefinitionKey == 'pgrqr') { this.disabled = false + if (this.$route.query.isDisabled) { + this.disabled = JSON.parse(this.$route.query.isDisabled) + } } else { this.disabled = true + if (this.$route.query.isDisabled) { + this.isTrue = JSON.parse(this.$route.query.isDisabled) + } } }, methods: { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 3b8473872..ec8a35034 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -282,6 +282,81 @@ ellipsis: true, scopedSlots: { customRender: 'sponsorFeedback' } } + ], + columnsOne: [ + { + title: this.$t('clauseNo'), + dataIndex: 'itemNum', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('clauseName'), + dataIndex: 'itemName', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('clauseContent'), + dataIndex: 'itemContent', + align: 'center', + width: 280, + scopedSlots: { customRender: 'clauseContent' } + }, + { + title: this.$t('evaluationMethod'), + dataIndex: 'evaluationMethodsName', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('complianceResults'), + dataIndex: 'complianceResult', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'Results' } + }, + { + title: this.$t('nameTechnicalDocument'), + dataIndex: 'technicalFileName', + align: 'center', + width: 280, + ellipsis: true + }, + { + title: this.$t('chapter'), + dataIndex: 'section', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('opinion'), + dataIndex: 'opinion', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('enclosure'), + dataIndex: 'accessoryFile', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'accessoryFile' } + }, + { + title: this.$t('sponsorFeedback'), + dataIndex: 'sponsorFeedback', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'sponsorFeedbackIndex' } + } ] } }, @@ -306,10 +381,18 @@ }, computed: { columns() { - if (this.$route.query.taskDefinitionKey == 'pgrqr') { - return this.columnsTwo + let disabled = false + if (this.$route.query.isDisabled) { + disabled = JSON.parse(this.$route.query.isDisabled) + } + if (disabled) { + return this.columnsOne } else { - return this.columnsThree + if (this.$route.query.taskDefinitionKey == 'pgrqr') { + return this.columnsTwo + } else { + return this.columnsThree + } } } }, @@ -345,14 +428,14 @@ this.$message.warning(this.$t('PleaseCompleteList')) return } - Object.keys(this.dataSource[i]).forEach(res=>{ + Object.keys(this.dataSource[i]).forEach(res => { if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') { this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“') this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘') } }) } - if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + if (this.$route.query.taskDefinitionKey == 'pgrqr') { let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') for (let i = 0; i < this.dataSource.length; i++) { this.dataSource[i].feedbackTime = feedbackTime @@ -361,7 +444,7 @@ callBack && callBack(this.dataSource) }, preservationData(callBack) { - if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + if (this.$route.query.taskDefinitionKey == 'pgrqr') { let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') for (let i = 0; i < this.dataSource.length; i++) { this.dataSource[i].feedbackTime = feedbackTime diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 7f592203a..caf22adff 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -26,7 +26,7 @@ :title="$t('evaluatorFeedback')" /> {{$t('standardInformation')}}
+ v-model="queryParam.serialNumber"> @@ -21,7 +21,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.taskType"> + v-model="queryParam.flowType"> @@ -81,7 +81,6 @@ value: '6' } ], - taskStatusList: [], tabActive: this.$t('toDoProcess') } },