From bd48210d7fd75a6ae15893bf815e84c8077538e7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 26 Jan 2025 14:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E3=80=91Bpm=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts                | 12 ++++++++++++
 src/views/bpm/model/CategoryDraggableModel.vue |  5 ++++-
 src/views/bpm/processInstance/report/index.vue |  8 +++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 4b177ae8..a5a7e449 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -307,6 +307,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
           activityId: route.query.activityId
         })
       },
+      {
+        path: 'process-instance/report',
+        component: () => import('@/views/bpm/processInstance/report/index.vue'),
+        name: 'BpmProcessInstanceReport',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '数据报表',
+          activeMenu: '/bpm/manager/model'
+        }
+      },
       {
         path: 'oa/leave/create',
         component: () => import('@/views/bpm/oa/leave/create.vue'),
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index 1a8c37a8..0b097847 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -194,7 +194,10 @@
                   </el-dropdown-item>
                   <el-dropdown-item
                     command="handleReport"
-                    v-if="checkPermi(['bpm:model:report']) && scope.row.processDefinition"
+                    v-if="
+                      checkPermi(['bpm:process-instance:manager-query']) &&
+                      scope.row.processDefinition
+                    "
                     :disabled="!isManagerUser(scope.row)"
                   >
                     报表
diff --git a/src/views/bpm/processInstance/report/index.vue b/src/views/bpm/processInstance/report/index.vue
index ae0bd172..a7ab685c 100644
--- a/src/views/bpm/processInstance/report/index.vue
+++ b/src/views/bpm/processInstance/report/index.vue
@@ -171,9 +171,10 @@ const userList = ref<any[]>([]) // 用户列表
 const getList = async () => {
   loading.value = true
   try {
-    let queryParamsClone = { ...queryParams }
-    queryParamsClone.formFieldsParams = JSON.stringify(queryParamsClone.formFieldsParams)
-    const data = await ProcessInstanceApi.getProcessInstanceManagerPage(queryParamsClone)
+    const data = await ProcessInstanceApi.getProcessInstanceManagerPage({
+      ...queryParams,
+      formFieldsParams: JSON.stringify(queryParams.formFieldsParams)
+    })
     list.value = data.list
     total.value = data.total
   } finally {
@@ -205,6 +206,7 @@ const handleQuery = () => {
 }
 
 /** 重置按钮操作 */
+// TODO @lesan：动态表单的 search ，无法重置的样子
 const resetQuery = () => {
   queryFormRef.value.resetFields()
   queryFormRef.value.formFieldsParams = {}