Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts: # pnpm-lock.yaml # src/views/ai/model/model/index.vue # src/views/bpm/model/form/index.vue
This commit is contained in:
@@ -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'),
|
||||
@@ -344,7 +356,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'manager/model/update/:id',
|
||||
// TODO @zws:1)建议,在加一个路由。然后标题是“复制流程”,这样体验会好点;2)复制出来的数据,在名字前面,加“副本 ”,和钉钉保持一致!
|
||||
path: 'manager/model/:type/:id',
|
||||
component: () => import('@/views/bpm/model/form/index.vue'),
|
||||
name: 'BpmModelUpdate',
|
||||
meta: {
|
||||
|
||||
Reference in New Issue
Block a user