From bce060c758ffeaaef320fde848e012762dba516b Mon Sep 17 00:00:00 2001 From: xiangheng <11675084@qq.com> Date: Wed, 20 Dec 2023 00:41:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow_apply/components/apply_submit.vue | 9 +- .../flow_history/components/todo/approve.vue | 165 ++++++++++++++++++ admin/src/views/flow_history/index.vue | 12 +- admin/src/views/flow_history/todo.vue | 86 ++++----- .../workbench/image/customer_service.png | Bin 85609 -> 0 bytes admin/src/views/workbench/image/qq_group.png | Bin 33733 -> 0 bytes admin/src/views/workbench/index.vue | 37 +--- .../flow_history/flow_history_service.go | 15 +- .../tpl_utils/templates/vue/index.vue.tpl | 5 +- 9 files changed, 221 insertions(+), 108 deletions(-) create mode 100644 admin/src/views/flow_history/components/todo/approve.vue delete mode 100644 admin/src/views/workbench/image/customer_service.png delete mode 100644 admin/src/views/workbench/image/qq_group.png diff --git a/admin/src/views/flow_apply/components/apply_submit.vue b/admin/src/views/flow_apply/components/apply_submit.vue index e88936e..86046e6 100644 --- a/admin/src/views/flow_apply/components/apply_submit.vue +++ b/admin/src/views/flow_apply/components/apply_submit.vue @@ -20,12 +20,12 @@ { return next_nodes.value.find((item) => item.type == 'bpmn:userTask') }) -const approver = ref([]) +const approverUserList = ref([]) const formRules = { applyUserId: [ { @@ -93,6 +93,7 @@ const formRules = { } function open(row) { console.log('open') + Object.assign(formData, new formDataState()) formData.id = row.id dialogVisible.value = true @@ -107,7 +108,7 @@ function open(row) { if (item.type == 'bpmn:userTask') { flow_history_get_approver(item).then((user) => { console.log('user', user) - approver.value = user + approverUserList.value = user }) } }) diff --git a/admin/src/views/flow_history/components/todo/approve.vue b/admin/src/views/flow_history/components/todo/approve.vue new file mode 100644 index 0000000..ea5ee89 --- /dev/null +++ b/admin/src/views/flow_history/components/todo/approve.vue @@ -0,0 +1,165 @@ + + + + + + + + + diff --git a/admin/src/views/flow_history/index.vue b/admin/src/views/flow_history/index.vue index f9cf4d4..46835e5 100644 --- a/admin/src/views/flow_history/index.vue +++ b/admin/src/views/flow_history/index.vue @@ -3,26 +3,26 @@ - + - + - + - + - + - + 查询 diff --git a/admin/src/views/flow_history/todo.vue b/admin/src/views/flow_history/todo.vue index b488673..661f3f9 100644 --- a/admin/src/views/flow_history/todo.vue +++ b/admin/src/views/flow_history/todo.vue @@ -3,28 +3,17 @@
- - - - - + - + - - - - - - - - - + + 查询 重置 @@ -42,35 +31,34 @@
- - + + > + + - - + + @@ -79,23 +67,25 @@
- + +