From 74f5dc344455e50eaa5553bf69f96474881e75ca Mon Sep 17 00:00:00 2001
From: BMJ <BernieMJ1012@gmail.com>
Date: Wed, 23 Nov 2022 00:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E7=A8=8B=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=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<WfFormVo> 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 @@
 </template>
 
 <script>
-import { listForm, getForm, delForm, addForm, updateForm, exportForm } from "@/api/workflow/form";
+import { listForm, getForm, delForm, addForm, updateForm } from "@/api/workflow/form";
 import Editor from '@/components/Editor';
 import Parser from '@/utils/generator/parser'
 export default {
@@ -287,15 +287,15 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      let _this = this
       this.$confirm('是否确认导出所有流程表单数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return exportForm(queryParams);
-      }).then(response => {
-        this.download(response.msg);
+        _this.download('/workflow/form/export', {
+        ..._this.queryParams
+      }, `form_${new Date().getTime()}.xlsx`)
       })
     }
   }