diff --git a/src/api/bpm/category/index.ts b/src/api/bpm/category/index.ts new file mode 100644 index 00000000..d1e109cb --- /dev/null +++ b/src/api/bpm/category/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +// BPM 流程分类 VO +export interface CategoryVO { + id: number // 分类编号 + name: string // 分类名 + code: string // 分类标志 + status: number // 分类状态 + sort: number // 分类排序 +} + +// BPM 流程分类 API +export const CategoryApi = { + // 查询流程分类分页 + getCategoryPage: async (params: any) => { + return await request.get({ url: `/bpm/category/page`, params }) + }, + + // 查询流程分类列表 + getCategorySimpleList: async () => { + return await request.get({ url: `/bpm/category/simple-list` }) + }, + + // 查询流程分类详情 + getCategory: async (id: number) => { + return await request.get({ url: `/bpm/category/get?id=` + id }) + }, + + // 新增流程分类 + createCategory: async (data: CategoryVO) => { + return await request.post({ url: `/bpm/category/create`, data }) + }, + + // 修改流程分类 + updateCategory: async (data: CategoryVO) => { + return await request.put({ url: `/bpm/category/update`, data }) + }, + + // 删除流程分类 + deleteCategory: async (id: number) => { + return await request.delete({ url: `/bpm/category/delete?id=` + id }) + } +} diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index b08035de..ec61e971 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -278,18 +278,6 @@ const remainingRouter: AppRouteRecordRaw[] = [ activeMenu: '/bpm/manager/model' } }, - { - path: '/process-instance/create', - component: () => import('@/views/bpm/processInstance/create/index.vue'), - name: 'BpmProcessInstanceCreate', - meta: { - noCache: true, - hidden: true, - canTo: true, - title: '发起流程', - activeMenu: 'bpm/processInstance/create' - } - }, { path: '/process-instance/detail', component: () => import('@/views/bpm/processInstance/detail/index.vue'), diff --git a/src/utils/dict.ts b/src/utils/dict.ts index e6b82500..6d7d2e72 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -136,11 +136,10 @@ export enum DICT_TYPE { INFRA_FILE_STORAGE = 'infra_file_storage', // ========== BPM 模块 ========== - BPM_MODEL_CATEGORY = 'bpm_model_category', BPM_MODEL_FORM_TYPE = 'bpm_model_form_type', BPM_TASK_CANDIDATE_STRATEGY = 'bpm_task_candidate_strategy', BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status', - BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result', + BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result', // TODO @芋艿:改名 BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type', // ========== PAY 模块 ========== diff --git a/src/views/bpm/category/CategoryForm.vue b/src/views/bpm/category/CategoryForm.vue new file mode 100644 index 00000000..5b771537 --- /dev/null +++ b/src/views/bpm/category/CategoryForm.vue @@ -0,0 +1,124 @@ + + + + + + + + + + + + + {{ dict.label }} + + + + + + + + + 确 定 + 取 消 + + + + diff --git a/src/views/bpm/category/index.vue b/src/views/bpm/category/index.vue new file mode 100644 index 00000000..0e11e819 --- /dev/null +++ b/src/views/bpm/category/index.vue @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue index 923a5901..9ebd28b1 100644 --- a/src/views/bpm/definition/index.vue +++ b/src/views/bpm/definition/index.vue @@ -11,11 +11,7 @@ - - - - - + diff --git a/src/views/bpm/processInstance/create/index.vue b/src/views/bpm/processInstance/create/index.vue index a10e0208..2cbfe9c4 100644 --- a/src/views/bpm/processInstance/create/index.vue +++ b/src/views/bpm/processInstance/create/index.vue @@ -1,35 +1,49 @@ - - - - - - - - - - - v{{ scope.row.version }} - - - - - - - 选择 - - - - + + + + + + + + + + + {{ definition.name }} + + + + + + + - 申请信息【{{ selectProcessInstance.name }}】 - + 申请信息【{{ selectProcessDefinition.name }}】 + 选择其它流程 @@ -47,35 +61,46 @@