From 67804675bd58582c0ee62f76d3bd0ed9397dd7f9 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 6 Jul 2022 17:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 3 +-- .../collectionOfRegulatoryOpinions/index.vue | 15 ++++++++++--- .../components/feedbackInformation.vue | 2 +- .../regulatoryCirculationHistory.vue | 14 ++++++------- .../processForm/processDetails/index.vue | 21 ++++++++++++++----- .../processForm/regulatoryProcess/index.vue | 2 +- .../tabComponents/alreadyProcess/index.vue | 3 ++- .../tabComponents/alreadySend/index.vue | 3 ++- .../tabComponents/monitorProcess/index.vue | 3 ++- 9 files changed, 44 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index da9dbdace..4c8e45171 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -313,6 +313,7 @@ this.JLoading = true let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0]) value.standId = value.id + value.taskAffirmDueDate = value.endTime delete value.id value.id = this.getUUID() value.currentUserName = this.userInfo().username @@ -341,8 +342,6 @@ }) }, completeTask(value, taskId) { - let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - value.operatorTime = operatorTime let query = { userid: this.userInfo().id, taskId: taskId, diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index c99d75f49..ce910fc71 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -74,7 +74,8 @@ > {{$t('viewProcess')}} - {{$t('evaluationResults')}} + {{$t('evaluationResults')}}
@@ -223,8 +224,16 @@ // }) window.open(newUrl.href, '_blank') }, - viewProcessClick() { - + viewProcessClick(row) { + let newUrl = this.$router.resolve({ + path: '/processDetails', + query: { + prcNum: row.prcNum, + prcType: 5, + prcId: row.actiProcInstId + } + }) + window.open(newUrl.href, '_blank') }, evaluationResultsClick(row) { this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row))) diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index bda8ce474..2eb3fd2ce 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -138,7 +138,7 @@ this.$refs.uploadFile.visible = true this.uploadName = item this.uploadIndex = index - getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue index 3ece69515..542632113 100644 --- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue @@ -33,27 +33,27 @@ columns: [ { title: this.$t('operationContent'), - dataIndex: 'name', + dataIndex: 'taskDefinitionKeyName', align: 'center', - width: '20%' + width: '25%' }, { title: this.$t('Operator'), - dataIndex: 'assignee', + dataIndex: 'createBy', align: 'center', - width: '20%' + width: '25%' }, { title: this.$t('role'), - dataIndex: 'approvalOpinion', + dataIndex: 'operatorRoleName', align: 'center', - width: '20%' + width: '25%' }, { title: this.$t('operationTime'), dataIndex: 'createTime', align: 'center', - width: '20%', + width: '25%', customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue index 6c0c3a150..88a529300 100644 --- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue +++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue @@ -13,12 +13,14 @@
- + +