From 060be76901ef59173bfc404f88d325174c33bd0d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 14:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsList.vue | 12 +- .../components/evaluatorFeedback.vue | 115 +++++++++++++----- .../components/feedbackInformation.vue | 75 +++++++----- .../processForm/evaluationProcess/index.vue | 5 +- .../processForm/regulatoryProcess/index.vue | 4 +- 5 files changed, 138 insertions(+), 73 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index fb1d93dfa..a474a8892 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -177,11 +177,13 @@ //导出 handleExport() { let query = { - lawsOpinionGatherId: this.lawsOpinionGatherId, - actiProcInstId: this.actiProcInstId + pageSize:this.pageSize, + pageNo:this.pageNo + // lawsOpinionGatherId: this.lawsOpinionGatherId, + // actiProcInstId: this.actiProcInstId } downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls', - this.$t('evaluationResults') + '.xls', query) + this.$t('evaluationResults') + '.zip', query) }, getData(row) { this.visible = true @@ -206,7 +208,9 @@ getList() { let query = { lawsOpinionGatherId: this.lawsOpinionGatherId, - actiProcInstId: this.actiProcInstId + actiProcInstId: this.actiProcInstId, + pageSize:this.pageSize, + pageNo:this.pageNo } this.loading = true getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 5492cf511..a9b0fcefe 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -27,16 +27,16 @@ -
+
{{$t('feedbackPoint')+(index+1)}}
@@ -46,7 +46,11 @@ * {{$t('relevantSections')}}
- + {{$t('problemDescription')}}
- + import { getAction, postAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' + export default { name: 'evaluatorFeedback', components: { @@ -107,44 +115,78 @@ type: String, default: '' }, - feedbackDataList:{ + feedbackDataList: { type: Array, - default: (()=>{ + default: (() => { return [] }) - }, + } }, data() { return { formInline: {}, - disabled:false, - rules: {}, - uploadIndex:'', + disabled: false, + rules: { + flag:[ + { + required: true, + message: this.$t('complianceResults') + this.$t('cannotEmpty'), + trigger: 'change' + }, + ], + relatedSection: [ + { + required: true, + message: this.$t('relevantSections') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('relevantSections') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], + issueOrSuggest: [ + { + required: true, + message: this.$t('problemDescription') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('problemDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, + uploadIndex: '', dataList: [] } }, mounted() { - if (this.feedbackDataList && this.feedbackDataList.length > 0){ - this.dataList = this.feedbackDataList - this.dataList = [...this.dataList] - }else{ - this.dataList = [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] - } + this.$nextTick(() => { + if (this.feedbackDataList && this.feedbackDataList.length > 0) { + this.formInline.dataList = this.feedbackDataList + } else { + this.formInline.dataList = [ + { + relatedSection: '', + issueOrSuggest: '', + reason: '', + accessoryFile: '' + } + ] + } + this.formInline = { ...this.formInline } + }) }, methods: { - clickButtonToUpload(item,index) { + clickButtonToUpload(item, index) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item this.uploadIndex = index - getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { @@ -161,22 +203,29 @@ }) } /** 赋值给当前对应的表单文件 */ - this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') - this.dataList = [...this.dataList] + this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') + this.formInline = [...this.formInline] }, addData() { - this.dataList.push({ + this.formInline.dataList.push({ relatedSection: '', issueOrSuggest: '', reason: '', accessoryFile: '' }) - this.dataList = [...this.dataList] + this.formInline = [...this.formInline] }, deleteData() { - this.dataList.pop() - this.dataList = [...this.dataList] - } + this.formInline.dataList.pop() + this.formInline = [...this.formInline] + }, + submitData(callBack){ + this.$refs.ruleForm.validate(valid => { + if (valid) { + callBack && callBack(this.formInline) + } + }) + }, } } diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 2eb3fd2ce..31a6c837d 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -7,16 +7,16 @@
-
+
{{$t('feedbackPoint')+(index+1)}}
@@ -26,7 +26,11 @@ * {{$t('relevantSections')}}
- + {{$t('questionsSuggestions')}}
- + { - return [] + default: (() => { + return [] }) - }, + } }, data() { return { formInline: {}, - disabled:false, + disabled: false, rules: {}, - uploadIndex:'', + uploadIndex: '', dataList: [] } }, mounted() { - if (this.feedbackDataList && this.feedbackDataList.length > 0){ - this.dataList = this.feedbackDataList - this.dataList = [...this.dataList] - }else{ - this.dataList = [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] - } + this.$nextTick(() => { + if (this.feedbackDataList && this.feedbackDataList.length > 0) { + this.formInline.dataList = this.feedbackDataList + this.formInline = { ...this.formInline } + } else { + this.formInline.dataList = [ + { + relatedSection: '', + issueOrSuggest: '', + reason: '', + accessoryFile: '' + } + ] + } + this.formInline = { ...this.formInline } + }) + }, methods: { - clickButtonToUpload(item,index) { + clickButtonToUpload(item, index) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item this.uploadIndex = index - getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { @@ -155,21 +166,21 @@ }) } /** 赋值给当前对应的表单文件 */ - this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') - this.dataList = [...this.dataList] + this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') + this.formInline = { ...this.formInline } }, addData() { - this.dataList.push({ + this.formInline.dataList.push({ relatedSection: '', issueOrSuggest: '', reason: '', accessoryFile: '' }) - this.dataList = [...this.dataList] + this.formInline = { ...this.formInline } }, deleteData() { - this.dataList.pop() - this.dataList = [...this.dataList] + this.formInline.dataList.pop() + this.formInline = { ...this.formInline } } } } diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index f438e9690..bddbf9efc 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -170,8 +170,9 @@ }) }, submit() { - let dataList = this.$refs.feedbackInformationRef.dataList - this.insertBatch(dataList, 2) + this.$refs.evaluatorFeedbackRef.submitData() + // let dataList = this.$refs.feedbackInformationRef.dataList + // this.insertBatch(dataList, 2) }, completeTask() { let query = { diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 165d6d740..9d30aecbb 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -134,7 +134,7 @@ }, preservation() { this.loading = true - let dataList = this.$refs.feedbackInformationRef.dataList + let dataList = this.$refs.feedbackInformationRef.formInline.dataList this.insertBatch(dataList, 1) }, insertBatch(list, num) { @@ -162,7 +162,7 @@ }) }, submit() { - let dataList = this.$refs.feedbackInformationRef.dataList + let dataList = this.$refs.feedbackInformationRef.formInline.dataList this.insertBatch(dataList, 2) }, completeTask() {