Skip to content

Commit bd48210

Browse files
committed
【代码评审】Bpm:数据报表
1 parent 79a5341 commit bd48210

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

src/router/modules/remaining.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
307307
activityId: route.query.activityId
308308
})
309309
},
310+
{
311+
path: 'process-instance/report',
312+
component: () => import('@/views/bpm/processInstance/report/index.vue'),
313+
name: 'BpmProcessInstanceReport',
314+
meta: {
315+
noCache: true,
316+
hidden: true,
317+
canTo: true,
318+
title: '数据报表',
319+
activeMenu: '/bpm/manager/model'
320+
}
321+
},
310322
{
311323
path: 'oa/leave/create',
312324
component: () => import('@/views/bpm/oa/leave/create.vue'),

src/views/bpm/model/CategoryDraggableModel.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,10 @@
194194
</el-dropdown-item>
195195
<el-dropdown-item
196196
command="handleReport"
197-
v-if="checkPermi(['bpm:model:report']) && scope.row.processDefinition"
197+
v-if="
198+
checkPermi(['bpm:process-instance:manager-query']) &&
199+
scope.row.processDefinition
200+
"
198201
:disabled="!isManagerUser(scope.row)"
199202
>
200203
报表

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,10 @@ const userList = ref<any[]>([]) // 用户列表
171171
const getList = async () => {
172172
loading.value = true
173173
try {
174-
let queryParamsClone = { ...queryParams }
175-
queryParamsClone.formFieldsParams = JSON.stringify(queryParamsClone.formFieldsParams)
176-
const data = await ProcessInstanceApi.getProcessInstanceManagerPage(queryParamsClone)
174+
const data = await ProcessInstanceApi.getProcessInstanceManagerPage({
175+
...queryParams,
176+
formFieldsParams: JSON.stringify(queryParams.formFieldsParams)
177+
})
177178
list.value = data.list
178179
total.value = data.total
179180
} finally {
@@ -205,6 +206,7 @@ const handleQuery = () => {
205206
}
206207
207208
/** 重置按钮操作 */
209+
// TODO @lesan:动态表单的 search ,无法重置的样子
208210
const resetQuery = () => {
209211
queryFormRef.value.resetFields()
210212
queryFormRef.value.formFieldsParams = {}

0 commit comments

Comments
 (0)