【代码评审】Bpm：数据报表

src/router/modules/remaining.ts

@@ -308,6 +308,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
         })
         })
       },
       },
       {
       {
+        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',
         path: 'oa/leave/create',
         component: () => import('@/views/bpm/oa/leave/create.vue'),
         component: () => import('@/views/bpm/oa/leave/create.vue'),
         name: 'OALeaveCreate',
         name: 'OALeaveCreate',

src/views/bpm/model/CategoryDraggableModel.vue

@@ -194,7 +194,10 @@
                   </el-dropdown-item>
                   </el-dropdown-item>
                   <el-dropdown-item
                   <el-dropdown-item
                     command="handleReport"
                     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)"
                     :disabled="!isManagerUser(scope.row)"
                   >
                   >
                     报表
                     报表

src/views/bpm/processInstance/report/index.vue

@@ -171,9 +171,10 @@ const userList = ref<any[]>([]) // 用户列表
 const getList = async () => {
 const getList = async () => {
   loading.value = true
   loading.value = true
   try {
   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
     list.value = data.list
     total.value = data.total
     total.value = data.total
   } finally {
   } finally {
@@ -205,6 +206,7 @@ const handleQuery = () => {
 }
 }
 
 
 /** 重置按钮操作 */
 /** 重置按钮操作 */
+// TODO @lesan：动态表单的 search ，无法重置的样子
 const resetQuery = () => {
 const resetQuery = () => {
   queryFormRef.value.resetFields()
   queryFormRef.value.resetFields()
   queryFormRef.value.formFieldsParams = {}
   queryFormRef.value.formFieldsParams = {}