From 931cd3498b32a15e9f3d93f5a44f6b74f6cf64d2 Mon Sep 17 00:00:00 2001 From: BMJ Date: Tue, 22 Nov 2022 22:52:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E5=88=B7=E6=96=B0=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=80=E7=9B=B4=E8=BD=AC=E5=9C=88=E5=9C=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/workflow/form/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruoyi-ui/src/views/workflow/form/index.vue b/ruoyi-ui/src/views/workflow/form/index.vue index 0eb52f6a..d29a284b 100644 --- a/ruoyi-ui/src/views/workflow/form/index.vue +++ b/ruoyi-ui/src/views/workflow/form/index.vue @@ -176,6 +176,9 @@ export default { } }; }, + created() { + this.getList(); + }, activated() { this.getList(); }, From 176bce90372715643fc9bc1f808c46a2d5387c33 Mon Sep 17 00:00:00 2001 From: BMJ Date: Tue, 22 Nov 2022 23:01:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E5=88=B7=E6=96=B0=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/workflow/work/detail.vue | 26 +++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/workflow/work/detail.vue b/ruoyi-ui/src/views/workflow/work/detail.vue index b4b9a4c9..18ac4dd3 100644 --- a/ruoyi-ui/src/views/workflow/work/detail.vue +++ b/ruoyi-ui/src/views/workflow/work/detail.vue @@ -302,19 +302,25 @@ export default { userOpen: false }; }, + created() { + this.init(); + }, activated() { - this.taskForm.deployId = this.$route.query && this.$route.query.deployId; - this.taskForm.definitionId = this.$route.query && this.$route.query.definitionId; - this.taskForm.taskId = this.$route.query && this.$route.query.taskId; - this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId; - this.finished = this.$route.query && this.$route.query.finished - // 流程任务重获取变量表单 - if (this.taskForm.taskId) { - this.getProcessDetails(this.taskForm.procInsId, this.taskForm.deployId, this.taskForm.taskId); - } - this.loadIndex = this.taskForm.procInsId; + this.init(); }, methods: { + init() { + this.taskForm.deployId = this.$route.query && this.$route.query.deployId; + this.taskForm.definitionId = this.$route.query && this.$route.query.definitionId; + this.taskForm.taskId = this.$route.query && this.$route.query.taskId; + this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId; + this.finished = this.$route.query && this.$route.query.finished + // 流程任务重获取变量表单 + if (this.taskForm.taskId) { + this.getProcessDetails(this.taskForm.procInsId, this.taskForm.deployId, this.taskForm.taskId); + } + this.loadIndex = this.taskForm.procInsId; + }, /** 查询部门下拉树结构 */ getTreeSelect() { deptTreeSelect().then(response => { From 755b77082a8a33c2a367a3ba441cfc2b2a0d8a95 Mon Sep 17 00:00:00 2001 From: BMJ Date: Tue, 22 Nov 2022 23:06:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E8=AF=AD=E6=B3=95=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/workflow/work/detail.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ruoyi-ui/src/views/workflow/work/detail.vue b/ruoyi-ui/src/views/workflow/work/detail.vue index 18ac4dd3..20ec67a8 100644 --- a/ruoyi-ui/src/views/workflow/work/detail.vue +++ b/ruoyi-ui/src/views/workflow/work/detail.vue @@ -60,7 +60,7 @@
- +
{{ formInfo.title }}
@@ -90,12 +90,14 @@ {{ item.endTime || '-' }} {{ item.duration || '-'}} -
- - {{ commentType(comment.type) }} - {{ comment.time }} - - {{ comment.fullMessage }} +
+
+ + {{ commentType(comment.type) }} + {{ comment.time }} + + {{ comment.fullMessage }} +
From 040c2efb3c0260bb873c08aed2664d7741fe3995 Mon Sep 17 00:00:00 2001 From: BMJ Date: Tue, 22 Nov 2022 23:36:40 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E5=8A=9E=EF=BC=8C=E6=8A=84=E9=80=81=E5=92=8C?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E5=88=B7=E6=96=B0=E4=B8=8D=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/workflow/work/claim.vue | 3 +++ ruoyi-ui/src/views/workflow/work/finished.vue | 3 +++ ruoyi-ui/src/views/workflow/work/own.vue | 1 + ruoyi-ui/src/views/workflow/work/todo.vue | 3 +++ 4 files changed, 10 insertions(+) diff --git a/ruoyi-ui/src/views/workflow/work/claim.vue b/ruoyi-ui/src/views/workflow/work/claim.vue index 1738b81d..b8c4b08c 100644 --- a/ruoyi-ui/src/views/workflow/work/claim.vue +++ b/ruoyi-ui/src/views/workflow/work/claim.vue @@ -101,6 +101,9 @@ export default { rules: {} }; }, + created() { + this.getList(); + }, activated() { this.getList(); }, diff --git a/ruoyi-ui/src/views/workflow/work/finished.vue b/ruoyi-ui/src/views/workflow/work/finished.vue index 8ea8e2a2..0a162603 100644 --- a/ruoyi-ui/src/views/workflow/work/finished.vue +++ b/ruoyi-ui/src/views/workflow/work/finished.vue @@ -133,6 +133,9 @@ export default { } }; }, + created() { + this.getList(); + }, activated() { this.getList(); }, diff --git a/ruoyi-ui/src/views/workflow/work/own.vue b/ruoyi-ui/src/views/workflow/work/own.vue index 9cdb8bee..82767f39 100644 --- a/ruoyi-ui/src/views/workflow/work/own.vue +++ b/ruoyi-ui/src/views/workflow/work/own.vue @@ -165,6 +165,7 @@ export default { }, created() { this.getCategoryList(); + this.getList(); }, activated() { this.getList(); diff --git a/ruoyi-ui/src/views/workflow/work/todo.vue b/ruoyi-ui/src/views/workflow/work/todo.vue index 05549176..7c2e63fe 100644 --- a/ruoyi-ui/src/views/workflow/work/todo.vue +++ b/ruoyi-ui/src/views/workflow/work/todo.vue @@ -122,6 +122,9 @@ export default { rules: {} }; }, + created() { + this.getList(); + }, activated() { this.getList(); }, From 74f5dc344455e50eaa5553bf69f96474881e75ca Mon Sep 17 00:00:00 2001 From: BMJ Date: Wed, 23 Nov 2022 00:37:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=8C=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/workflow/WfFormController.java | 2 +- ruoyi-ui/src/api/workflow/form.js | 9 --------- ruoyi-ui/src/views/workflow/category/index.vue | 2 +- ruoyi-ui/src/views/workflow/form/index.vue | 10 +++++----- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java index 86f7b8bc..1fc17821 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java @@ -53,7 +53,7 @@ public class WfFormController extends BaseController { */ @SaCheckPermission("workflow:form:export") @Log(title = "流程表单", businessType = BusinessType.EXPORT) - @GetMapping("/export") + @PostMapping("/export") public void export(@Validated WfFormBo bo, HttpServletResponse response) { List list = formService.queryList(bo); ExcelUtil.exportExcel(list, "流程表单", WfFormVo.class, response); diff --git a/ruoyi-ui/src/api/workflow/form.js b/ruoyi-ui/src/api/workflow/form.js index 867c56e9..e903d4cc 100644 --- a/ruoyi-ui/src/api/workflow/form.js +++ b/ruoyi-ui/src/api/workflow/form.js @@ -50,12 +50,3 @@ export function delForm(formId) { method: 'delete' }) } - -// 导出流程表单 -export function exportForm(query) { - return request({ - url: '/workflow/form/export', - method: 'get', - params: query - }) -} diff --git a/ruoyi-ui/src/views/workflow/category/index.vue b/ruoyi-ui/src/views/workflow/category/index.vue index 669edace..50e78285 100644 --- a/ruoyi-ui/src/views/workflow/category/index.vue +++ b/ruoyi-ui/src/views/workflow/category/index.vue @@ -287,7 +287,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/category/export', { + this.download('workflow/category/export', { ...this.queryParams }, `category_${new Date().getTime()}.xlsx`) } diff --git a/ruoyi-ui/src/views/workflow/form/index.vue b/ruoyi-ui/src/views/workflow/form/index.vue index d29a284b..bc605aa8 100644 --- a/ruoyi-ui/src/views/workflow/form/index.vue +++ b/ruoyi-ui/src/views/workflow/form/index.vue @@ -130,7 +130,7 @@