diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 45da96b8..aa98ebc0 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -306,30 +306,6 @@ const remainingRouter: AppRouteRecordRaw[] = [ activeMenu: 'bpm/oa/leave/create' } }, - { - path: '/bpm/oa/leave/detail', - component: () => import('@/views/bpm/oa/leave/detail.vue'), - name: 'OALeaveDetail', - meta: { - noCache: true, - hidden: true, - canTo: true, - title: '查看 OA 请假', - activeMenu: 'bpm/oa/leave/detail' - } - }, - { - path: '/bpm/task/done', - component: () => import('@/views/bpm/task/done/index.vue'), - name: 'TaskDone', - meta: { - noCache: true, - hidden: true, - canTo: true, - title: '已办任务', - activeMenu: 'bpm/task/done/index' - } - }, { path: '/bpm/task/todo', component: () => import('@/views/bpm/task/todo/index.vue'), diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index b90b36ef..b707dd22 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -24,6 +24,7 @@ declare module '@vue/runtime-core' { DocAlert: typeof import('./../components/DocAlert/index.vue')['default'] Echart: typeof import('./../components/Echart/src/Echart.vue')['default'] Editor: typeof import('./../components/Editor/src/Editor.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] @@ -72,6 +73,7 @@ declare module '@vue/runtime-core' { ElTimeline: typeof import('element-plus/es')['ElTimeline'] ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] Error: typeof import('./../components/Error/src/Error.vue')['default'] FlowCondition: typeof import('./../components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue')['default'] diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue index 9f43d087..e23d023e 100644 --- a/src/views/bpm/processInstance/index.vue +++ b/src/views/bpm/processInstance/index.vue @@ -27,7 +27,12 @@ /> - + - + - + 搜索 重置 + + 发起流程 + - - - - - 发起流程 - - - @@ -135,16 +135,18 @@ type="primary" v-hasPermi="['bpm:process-instance:cancel']" @click="handleDetail(scope.row)" - >详情 + 详情 + 取消 + 取消 + @@ -158,14 +160,14 @@ -