From de5aa648d07d30f93c69ba3d00b2f86265bf5b7a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 14:05:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-portal-ui/src/views/flow/doneList.vue | 3 ++- supervise-portal-ui/src/views/flow/todoList.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/supervise-portal-ui/src/views/flow/doneList.vue b/supervise-portal-ui/src/views/flow/doneList.vue index b62da4fd..7eb2d1a1 100644 --- a/supervise-portal-ui/src/views/flow/doneList.vue +++ b/supervise-portal-ui/src/views/flow/doneList.vue @@ -273,8 +273,9 @@ import flowRecords from '@/components/flow/flowRecord' selectUrl(this.selectUrl_list).then((response) => { if (response.success && response.data.url !== '') { // this.url = 'http://127.0.0.1:9531' + '/production/#/paichanguanli/haveDone' + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = ''+ response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + console.log(this.url) } else if (response.success && response.data.url === '') { this.$notify({ title: '提示', diff --git a/supervise-portal-ui/src/views/flow/todoList.vue b/supervise-portal-ui/src/views/flow/todoList.vue index b9c439dc..47d2fb1d 100644 --- a/supervise-portal-ui/src/views/flow/todoList.vue +++ b/supervise-portal-ui/src/views/flow/todoList.vue @@ -312,7 +312,7 @@ export default { selectUrl(this.selectUrl_list).then((response) => { if (response.success && response.data.url !== '') { // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = '' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) console.log('已办拼接url:', this.url) } else if (response.success && response.data.url === '') { From 51b33a491375f86c8b836a10164247e25ca16389 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 14:15:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/views/Rkzysq/index.vue | 12 ++++++------ .../src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue | 6 ++++++ .../src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 6 ++++++ .../src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue | 6 ++++++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/supervise-enterprise-ui/src/views/Rkzysq/index.vue b/supervise-enterprise-ui/src/views/Rkzysq/index.vue index 10dea8ae..b2b7d087 100644 --- a/supervise-enterprise-ui/src/views/Rkzysq/index.vue +++ b/supervise-enterprise-ui/src/views/Rkzysq/index.vue @@ -234,8 +234,8 @@ export default { /** 流程流转记录 */ handleFlowRecord(row) { this.getModelDetail(row.procDefId) - this.getFlowViewer(row.procInsId) - this.getFlowRecordList(row.procInsId, row.procDefId) + this.getFlowViewer(row.procInstId) + this.getFlowRecordList(row.procInstId, row.procDefId) this.editDialog = true }, /** xml 文件 */ @@ -247,15 +247,15 @@ export default { }) }, // 已办环节的节点 - getFlowViewer(procInsId) { + getFlowViewer(procInstId) { var token = getStorage() - getFlowViewer(procInsId, token).then(res => { + getFlowViewer(procInstId, token).then(res => { this.taskList = res.data }) }, /** 流程流转记录 */ - getFlowRecordList(procInsId, procDefId) { - req.flowRecord(procInsId, procDefId).then(res => { + getFlowRecordList(procInstId, procDefId) { + req.flowRecord(procInstId, procDefId).then(res => { this.flowRecordList = res.data.flowList // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值 // if (res.data.formData) { diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue index b40703d9..2ab88513 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue @@ -345,4 +345,10 @@ export default { .rowClass{ border-top: 1px solid #E0E3EB; } + +.titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; +} diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue index e1f40f04..4911c72c 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -206,4 +206,10 @@ export default { font-size: 15px; font-weight: 400; } + +.titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; +} diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue index cd05d00d..19d72891 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue @@ -194,4 +194,10 @@ export default { font-size: 15px; font-weight: 400; } + +.titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; +}