diff --git a/admin/src/api/flow_apply.ts b/admin/src/api/flow/flow_apply.ts similarity index 59% rename from admin/src/api/flow_apply.ts rename to admin/src/api/flow/flow_apply.ts index e496fe0..f6620db 100644 --- a/admin/src/api/flow_apply.ts +++ b/admin/src/api/flow/flow_apply.ts @@ -2,25 +2,25 @@ import request from '@/utils/request' // 申请流程列表 export function flow_apply_lists(params?: Record) { - return request.get({ url: '/flow_apply/list', params }) + return request.get({ url: '/flow/flow_apply/list', params }) } // 申请流程详情 export function flow_apply_detail(params: Record) { - return request.get({ url: '/flow_apply/detail', params }) + return request.get({ url: '/flow/flow_apply/detail', params }) } // 申请流程新增 export function flow_apply_add(params: Record) { - return request.post({ url: '/flow_apply/add', params }) + return request.post({ url: '/flow/flow_apply/add', params }) } // 申请流程编辑 export function flow_apply_edit(params: Record) { - return request.post({ url: '/flow_apply/edit', params }) + return request.post({ url: '/flow/flow_apply/edit', params }) } // 申请流程删除 export function flow_apply_delete(params: Record) { - return request.post({ url: '/flow_apply/del', params }) + return request.post({ url: '/flow/flow_apply/del', params }) } diff --git a/admin/src/api/flow_history.ts b/admin/src/api/flow/flow_history.ts similarity index 61% rename from admin/src/api/flow_history.ts rename to admin/src/api/flow/flow_history.ts index 03cbac1..5657365 100644 --- a/admin/src/api/flow_history.ts +++ b/admin/src/api/flow/flow_history.ts @@ -2,42 +2,42 @@ import request from '@/utils/request/index' // 流程历史列表 export function flow_history_list(params?: Record) { - return request.get({ url: '/flow_history/list', params }) + return request.get({ url: '/flow/flow_history/list', params }) } // 流程历史列表-所有 export function flow_history_list_all(params?: Record) { - return request.get({ url: '/flow_history/listAll', params }) + return request.get({ url: '/flow/flow_history/listAll', params }) } // 流程历史详情 export function flow_history_detail(params: Record) { - return request.get({ url: '/flow_history/detail', params }) + return request.get({ url: '/flow/flow_history/detail', params }) } // 流程历史新增 export function flow_history_add(params: Record) { - return request.post({ url: '/flow_history/add', params }) + return request.post({ url: '/flow/flow_history/add', params }) } // 流程历史编辑 export function flow_history_edit(params: Record) { - return request.post({ url: '/flow_history/edit', params }) + return request.post({ url: '/flow/flow_history/edit', params }) } // 流程历史删除 export function flow_history_delete(params: Record) { - return request.post({ url: '/flow_history/del', params }) + return request.post({ url: '/flow/flow_history/del', params }) } // 获取下一个审批节点,中间可能有系统任务和结束节点被跳过 export function flow_history_next_node(params: Record) { - return request.post({ url: '/flow_history/next_node', params }) + return request.post({ url: '/flow/flow_history/next_node', params }) } // 获取下一个审批节点,中间可能有系统任务和结束节点被跳过 export function flow_history_get_approver(params: Record) { - return request.post({ url: '/flow_history/get_approver', params }) + return request.post({ url: '/flow/flow_history/get_approver', params }) } export function flow_history_pass(params: Record) { - return request.post({ url: '/flow_history/pass', params }) + return request.post({ url: '/flow/flow_history/pass', params }) } diff --git a/admin/src/api/flow_template.ts b/admin/src/api/flow/flow_template.ts similarity index 59% rename from admin/src/api/flow_template.ts rename to admin/src/api/flow/flow_template.ts index a8d3375..dbcaff9 100644 --- a/admin/src/api/flow_template.ts +++ b/admin/src/api/flow/flow_template.ts @@ -2,30 +2,30 @@ import request from '@/utils/request' // 流程模板列表 export function flow_template_lists(params?: Record) { - return request.get({ url: '/flow_template/list', params }) + return request.get({ url: '/flow/flow_template/list', params }) } // 流程模板列表-所有 export function flow_template_lists_all(params?: Record) { - return request.get({ url: '/flow_template/listAll', params }) + return request.get({ url: '/flow/flow_template/listAll', params }) } // 流程模板详情 export function flow_template_detail(params: Record) { - return request.get({ url: '/flow_template/detail', params }) + return request.get({ url: '/flow/flow_template/detail', params }) } // 流程模板新增 export function flow_template_add(params: Record) { - return request.post({ url: '/flow_template/add', params }) + return request.post({ url: '/flow/flow_template/add', params }) } // 流程模板编辑 export function flow_template_edit(params: Record) { - return request.post({ url: '/flow_template/edit', params }) + return request.post({ url: '/flow/flow_template/edit', params }) } // 流程模板删除 export function flow_template_delete(params: Record) { - return request.post({ url: '/flow_template/del', params }) + return request.post({ url: '/flow/flow_template/del', params }) } diff --git a/admin/src/views/flow_apply/components/apply_submit.vue b/admin/src/views/flow/flow_apply/components/apply_submit.vue similarity index 98% rename from admin/src/views/flow_apply/components/apply_submit.vue rename to admin/src/views/flow/flow_apply/components/apply_submit.vue index 03792ed..84f6251 100644 --- a/admin/src/views/flow_apply/components/apply_submit.vue +++ b/admin/src/views/flow/flow_apply/components/apply_submit.vue @@ -60,7 +60,7 @@ import { flow_history_next_node, flow_history_get_approver, flow_history_pass -} from '@/api/flow_history' +} from '@/api/flow/flow_history' const dialogVisible = ref(false) @@ -153,3 +153,4 @@ defineExpose({ // margin: 0; /* 如果页面出现垂直滚动条,则加入此行CSS以消除之 */ // } +@/api/flow/flow_history diff --git a/admin/src/views/flow_apply/edit.vue b/admin/src/views/flow/flow_apply/edit.vue similarity index 98% rename from admin/src/views/flow_apply/edit.vue rename to admin/src/views/flow/flow_apply/edit.vue index 2899e22..c534a75 100644 --- a/admin/src/views/flow_apply/edit.vue +++ b/admin/src/views/flow/flow_apply/edit.vue @@ -67,8 +67,8 @@ +@/api/flow/flow_apply@/api/flow/flow_template diff --git a/admin/src/views/flow_apply/index.vue b/admin/src/views/flow/flow_apply/index.vue similarity index 98% rename from admin/src/views/flow_apply/index.vue rename to admin/src/views/flow/flow_apply/index.vue index f1a69f5..1df8575 100644 --- a/admin/src/views/flow_apply/index.vue +++ b/admin/src/views/flow/flow_apply/index.vue @@ -120,13 +120,13 @@ import { flow_apply_lists, flow_apply_edit, flow_apply_detail -} from '@/api/flow_apply' +} from '@/api/flow/flow_apply' import { useDictData } from '@/hooks/useDictOptions' import { usePaging } from '@/hooks/usePaging' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import ApplySubmit from '@/views/flow_apply/components/apply_submit.vue' +import ApplySubmit from './components/apply_submit.vue' import ViewForm from '@/components/flow/XForm/view.vue' import useUserStore from '@/stores/modules/user' @@ -227,3 +227,4 @@ const SaveViewForm = (id, form_data) => { } getLists() +@/api/flow/flow_apply diff --git a/admin/src/views/flow_history/done.vue b/admin/src/views/flow/flow_history/done.vue similarity index 100% rename from admin/src/views/flow_history/done.vue rename to admin/src/views/flow/flow_history/done.vue diff --git a/admin/src/views/flow_history/edit.vue b/admin/src/views/flow/flow_history/edit.vue similarity index 57% rename from admin/src/views/flow_history/edit.vue rename to admin/src/views/flow/flow_history/edit.vue index f06c326..2b98d5a 100644 --- a/admin/src/views/flow_history/edit.vue +++ b/admin/src/views/flow/flow_history/edit.vue @@ -10,51 +10,56 @@ @close="handleClose" > - - - - - - - - - - - - - - - - - - - - - - - - - - - 请选择字典生成 - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + 请选择字典生成 + + + + + +@/api/flow/flow_history diff --git a/admin/src/views/flow_history/index.vue b/admin/src/views/flow/flow_history/index.vue similarity index 99% rename from admin/src/views/flow_history/index.vue rename to admin/src/views/flow/flow_history/index.vue index 46835e5..6409b93 100644 --- a/admin/src/views/flow_history/index.vue +++ b/admin/src/views/flow/flow_history/index.vue @@ -85,7 +85,7 @@ +@/api/flow/flow_history diff --git a/admin/src/views/flow_history/todo.vue b/admin/src/views/flow/flow_history/todo.vue similarity index 96% rename from admin/src/views/flow_history/todo.vue rename to admin/src/views/flow/flow_history/todo.vue index 09bb7be..ca68363 100644 --- a/admin/src/views/flow_history/todo.vue +++ b/admin/src/views/flow/flow_history/todo.vue @@ -71,13 +71,13 @@ +@/api/flow/flow_apply@/api/flow/flow_history diff --git a/admin/src/views/flow_template/edit.vue b/admin/src/views/flow/flow_template/edit.vue similarity index 96% rename from admin/src/views/flow_template/edit.vue rename to admin/src/views/flow/flow_template/edit.vue index db51c37..de18a56 100644 --- a/admin/src/views/flow_template/edit.vue +++ b/admin/src/views/flow/flow_template/edit.vue @@ -41,7 +41,11 @@ +@/api/flow/flow_template diff --git a/admin/src/views/flow_template/index.vue b/admin/src/views/flow/flow_template/index.vue similarity index 98% rename from admin/src/views/flow_template/index.vue rename to admin/src/views/flow/flow_template/index.vue index 68b3851..fa7164a 100644 --- a/admin/src/views/flow_template/index.vue +++ b/admin/src/views/flow/flow_template/index.vue @@ -75,9 +75,8 @@ import { flow_template_delete, flow_template_lists, flow_template_edit, - flow_template_add, - flow_template_detail -} from '@/api/flow_template' + flow_template_add +} from '@/api/flow/flow_template' import { usePaging } from '@/hooks/usePaging' import feedback from '@/utils/feedback' @@ -182,3 +181,4 @@ const handleConfig = async (data: any) => { } getLists() +@/api/flow/flow_template diff --git a/admin/src/views/setting/dict/data/edit.vue b/admin/src/views/setting/dict/data/edit.vue index e5d5a4e..87a3312 100644 --- a/admin/src/views/setting/dict/data/edit.vue +++ b/admin/src/views/setting/dict/data/edit.vue @@ -30,11 +30,7 @@ - +
diff --git a/server/admin/flow/enter.go b/server/admin/flow/enter.go index a18e2de..eb1c34a 100644 --- a/server/admin/flow/enter.go +++ b/server/admin/flow/enter.go @@ -20,7 +20,7 @@ func FlowApplyRoute(rg *gin.RouterGroup) { handle := flow_apply.FlowApplyHandler{} - rg = rg.Group("/", middleware.TokenAuth()) + rg = rg.Group("/flow", middleware.TokenAuth()) rg.GET("/flow_apply/list", handle.List) rg.GET("/flow_apply/detail", handle.Detail) rg.POST("/flow_apply/add", handle.Add) @@ -44,7 +44,7 @@ func FlowHistoryRoute(rg *gin.RouterGroup) { handle := flow_history.FlowHistoryHandler{} - rg = rg.Group("/", middleware.TokenAuth()) + rg = rg.Group("/flow", middleware.TokenAuth()) rg.GET("/flow_history/list", handle.List) rg.GET("/flow_history/listAll", handle.ListAll) rg.GET("/flow_history/detail", handle.Detail) @@ -73,7 +73,7 @@ func FlowTemplateRoute(rg *gin.RouterGroup) { handle := flow_template.FlowTemplateHandler{} - rg = rg.Group("/", middleware.TokenAuth()) + rg = rg.Group("/flow", middleware.TokenAuth()) rg.GET("/flow_template/list", handle.List) rg.GET("/flow_template/listAll", handle.ListAll) rg.GET("/flow_template/detail", handle.Detail)