diff --git a/backend/src/api/approval.js b/backend/src/api/approval.js index 5fbc146..82e1a4e 100644 --- a/backend/src/api/approval.js +++ b/backend/src/api/approval.js @@ -58,29 +58,29 @@ export function getAvailableFlows(params) { return request({ url: '/backend/approval/flow/available', method: 'get', params }); } -// ==================== 审批中心 ==================== +// ==================== 审批中心(运行时实例) ==================== -// 我的任务列表:type=pending 待我审批 / done 我已审批 / cc 抄送我的 -export function getCenterTaskList(params) { - return request({ url: '/backend/approval/center/task/list', method: 'get', params }); +// 我发起的审批实例列表 +export function getMyApprovalInstances(params) { + return request({ url: '/backend/approval/instance/mine', method: 'get', params }); } -// 通用审批操作:{ task_id, pass, comment } -export function actCenterTask(data) { - return request({ url: '/backend/approval/center/task/act', method: 'post', data }); +// 我作为审批人的任务列表(handled=1 返回我已处理) +export function getApprovalTodo(params) { + return request({ url: '/backend/approval/instance/todo', method: 'get', params }); } -// 我发起的审批实例列表(status 可选:1审批中 2通过 3驳回 4撤回) -export function getCenterInstanceList(params) { - return request({ url: '/backend/approval/center/instance/list', method: 'get', params }); +// 审批实例详情(含流程时间线) +export function getApprovalInstanceDetail(id) { + return request({ url: `/backend/approval/instance/detail/${id}`, method: 'get' }); } -// 审批实例详情(含节点任务时间线) -export function getCenterInstanceDetail(id) { - return request({ url: `/backend/approval/center/instance/detail/${id}`, method: 'get' }); +// 审批人通过 / 驳回 +export function approveApprovalInstance(data) { + return request({ url: '/backend/approval/instance/approve', method: 'post', data }); } -// 审批权限设置:只更新流程的适用部门/是否默认/启用状态(body: {id, apply_dept_ids, is_default, status}) -export function saveApprovalFlowPerm(data) { - return request({ url: '/backend/approval/flow/perm', method: 'post', data }); +// 发起人撤回 +export function withdrawApprovalInstance(id) { + return request({ url: `/backend/approval/instance/withdraw/${id}`, method: 'post' }); } diff --git a/backend/src/views/apps/oa/approvalcenter/components/DetailDrawer.vue b/backend/src/views/apps/oa/approvalcenter/components/DetailDrawer.vue new file mode 100644 index 0000000..ca036f9 --- /dev/null +++ b/backend/src/views/apps/oa/approvalcenter/components/DetailDrawer.vue @@ -0,0 +1,383 @@ + + + + + diff --git a/backend/src/views/apps/oa/approvalcenter/list.vue b/backend/src/views/apps/oa/approvalcenter/list.vue index 4c8ba3b..3365a76 100644 --- a/backend/src/views/apps/oa/approvalcenter/list.vue +++ b/backend/src/views/apps/oa/approvalcenter/list.vue @@ -1,207 +1,147 @@ diff --git a/backend/src/views/apps/oa/approvalcenter/mine.vue b/backend/src/views/apps/oa/approvalcenter/mine.vue index 6176fb2..f46fbd6 100644 --- a/backend/src/views/apps/oa/approvalcenter/mine.vue +++ b/backend/src/views/apps/oa/approvalcenter/mine.vue @@ -1,55 +1,86 @@ diff --git a/backend/src/views/apps/oa/approvalcenter/settings.vue b/backend/src/views/apps/oa/approvalcenter/settings.vue index 0bb6ecd..439b272 100644 --- a/backend/src/views/apps/oa/approvalcenter/settings.vue +++ b/backend/src/views/apps/oa/approvalcenter/settings.vue @@ -1,297 +1,117 @@ diff --git a/backend/src/views/apps/oa/reimburse/components/detail.vue b/backend/src/views/apps/oa/reimburse/components/detail.vue index 7068521..e4207b4 100644 --- a/backend/src/views/apps/oa/reimburse/components/detail.vue +++ b/backend/src/views/apps/oa/reimburse/components/detail.vue @@ -242,33 +242,16 @@ @saved="handleItemsSaved" /> - -

选择要变更的单据状态,保存后立即生效。

- - - {{ item.label }} - - - -
-