diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 83b65895a..da9dbdace 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -107,6 +107,7 @@ /> + {{this.$t('pleaseWaitWhileRunning')}} @@ -140,6 +141,7 @@ addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' }, loading: false, + JLoading:false, dataSource: [], selectedRowKeys: [], total: 0, @@ -308,6 +310,7 @@ if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) { this.$message.warning(this.$t('pleaseSelectStandard')) } else { + this.JLoading = true let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0]) value.standId = value.id delete value.id @@ -332,6 +335,8 @@ postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { this.completeTask(value, res.result) + }else{ + this.JLoading = false } }) }, @@ -349,12 +354,12 @@ // window.close() // }, 1000) this.$message.success(this.$t('OperationSuccessful')) - this.loading = false + this.JLoading = false this.$router.push({ path: '/collectionOfRegulatoryOpinions' }) } else { - this.loading = false + this.JLoading = false this.$message.warning(this.$t('operationFailed')) } }) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 09e85fbb2..c99d75f49 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -136,7 +136,7 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'technologyTerritory' + dataIndex: 'technologyTerritoryShow' }, { title: this.$t('collectResults'), diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 559d8ce6f..bda8ce474 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -100,7 +100,13 @@ title: { type: String, default: '' - } + }, + feedbackDataList:{ + type: Array, + default: (()=>{ + return [] + }) + }, }, data() { return { @@ -108,16 +114,24 @@ disabled:false, rules: {}, uploadIndex:'', - dataList: [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] + dataList: [] } }, + mounted() { + if (this.feedbackDataList && this.feedbackDataList.length > 0){ + this.dataList = this.feedbackDataList + this.dataList = [...this.dataList] + }else{ + this.dataList = [ + { + relatedSection: '', + issueOrSuggest: '', + reason: '', + accessoryFile: '' + } + ] + } + }, methods: { clickButtonToUpload(item,index) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index a79ddd595..67da54846 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -15,6 +15,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -55,12 +57,13 @@ queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds', list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list' }, + loading: false, isDisplay: true, queryProject: {}, standardContentList: [ { title: this.$t('standard'), - value: 'serialNumber' + value: 'serial_number' }, { title: this.$t('title'), @@ -92,6 +95,7 @@ } }, mounted() { + this.isDisplay = false this.queryTaskDetailByTask(() => { this.lawsOpinionAssessmentResult() }) @@ -115,14 +119,26 @@ actiProcInstId: this.$route.query.prcId }).then((res) => { if (res.success) { + this.feedbackDataList = res.result || [] this.loading = false } else { + this.feedbackDataList = [] this.loading = false } + this.isDisplay = true }) }, preservation() { + }, + insertBatch(list) { + postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', list).then((res) => { + if (res.success) { + + }else{ + + } + }) }, submit() {