diff --git a/src/components/custom/workflow/flow-intervene-modal.vue b/src/components/custom/workflow/flow-intervene-modal.vue index 5e0a58e5..b85fe1b0 100644 --- a/src/components/custom/workflow/flow-intervene-modal.vue +++ b/src/components/custom/workflow/flow-intervene-modal.vue @@ -10,6 +10,7 @@ defineOptions({ const { loading, startLoading, endLoading } = useLoading(); const { bool: addSignatureVisible, setTrue: openAddSignatureModal } = useBoolean(); const { bool: transferVisible, setTrue: openTransferModal } = useBoolean(); +const { bool: reduceSignatureVisible, setTrue: openReduceSignatureModal } = useBoolean(); interface Props { taskId: CommonType.IdType; assigneeIds: CommonType.IdType[]; @@ -124,6 +125,11 @@ function handleTerminate() { }); } +function handleReduceSubmit() { + visible.value = false; + emit('refresh'); +} + async function getTaskInfo() { startLoading(); const { error, data } = await fetchGetTask(props.taskId); @@ -178,7 +184,9 @@ watch(visible, () => { 转办 加签 - 减签 + + 减签 + 中止 @@ -191,5 +199,11 @@ watch(visible, () => { :disabled-ids="assigneeIds" @confirm="handleAddSignatureConfirm" /> + + diff --git a/src/components/custom/workflow/reduce-signature-drawer.vue b/src/components/custom/workflow/reduce-signature-drawer.vue new file mode 100644 index 00000000..51fd064b --- /dev/null +++ b/src/components/custom/workflow/reduce-signature-drawer.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/service/api/workflow/task.ts b/src/service/api/workflow/task.ts index 17b73ac9..5f6baea6 100644 --- a/src/service/api/workflow/task.ts +++ b/src/service/api/workflow/task.ts @@ -61,3 +61,11 @@ export function fetchTerminateTask(data: Api.Workflow.TerminateTaskOperateParams data }); } + +/** 获取当前任务所有人员 */ +export function fetchGetCurrentTaskAllUser(taskId: CommonType.IdType) { + return request({ + url: `/workflow/task/currentTaskAllUser/${taskId}`, + method: 'get' + }); +} diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index 9fd26d4b..b4f5275f 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -13,7 +13,6 @@ declare module 'vue' { BetterScroll: typeof import('./../components/custom/better-scroll.vue')['default'] BooleanTag: typeof import('./../components/custom/boolean-tag.vue')['default'] ButtonIcon: typeof import('./../components/custom/button-icon.vue')['default'] - copy: typeof import('./../components/custom/dept-tree-select copy.vue')['default'] CountTo: typeof import('./../components/custom/count-to.vue')['default'] DarkModeContainer: typeof import('./../components/common/dark-mode-container.vue')['default'] DataTable: typeof import('./../components/common/data-table.vue')['default'] @@ -81,6 +80,7 @@ declare module 'vue' { NBreadcrumb: typeof import('naive-ui')['NBreadcrumb'] NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem'] NButton: typeof import('naive-ui')['NButton'] + NCar: typeof import('naive-ui')['NCar'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup'] @@ -153,6 +153,7 @@ declare module 'vue' { OssUpload: typeof import('./../components/custom/oss-upload.vue')['default'] PinToggler: typeof import('./../components/common/pin-toggler.vue')['default'] PostSelect: typeof import('./../components/custom/post-select.vue')['default'] + ReduceSignatureDrawer: typeof import('./../components/custom/workflow/reduce-signature-drawer.vue')['default'] ReloadButton: typeof import('./../components/common/reload-button.vue')['default'] RoleSelect: typeof import('./../components/custom/role-select.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/views/workflow/category/modules/category-operate-drawer.vue b/src/views/workflow/category/modules/category-operate-drawer.vue index 8692f45f..eb2dabef 100644 --- a/src/views/workflow/category/modules/category-operate-drawer.vue +++ b/src/views/workflow/category/modules/category-operate-drawer.vue @@ -106,7 +106,7 @@ watch(visible, () => { - + diff --git a/src/views/workflow/process-definition/modules/definition-import-modal.vue b/src/views/workflow/process-definition/modules/definition-import-modal.vue index 3f6fe8b7..118fc780 100644 --- a/src/views/workflow/process-definition/modules/definition-import-modal.vue +++ b/src/views/workflow/process-definition/modules/definition-import-modal.vue @@ -115,7 +115,7 @@ watch(visible, () => { > - + diff --git a/src/views/workflow/process-definition/modules/definition-operate-drawer.vue b/src/views/workflow/process-definition/modules/definition-operate-drawer.vue index dea20f1f..7e3ff674 100644 --- a/src/views/workflow/process-definition/modules/definition-operate-drawer.vue +++ b/src/views/workflow/process-definition/modules/definition-operate-drawer.vue @@ -108,7 +108,7 @@ watch(visible, () => { - +