boyue2025/boyue-ui-admin-vue3
3
0
Fork 0
mirror of https://gitee.com/myxzgzs/boyue-ui-admin-vue3 synced 2025-08-09 00:42:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat： 新增获取下一个执行的流程节点接口

Browse Source
This commit is contained in:
smallNorthLee 2025-03-02 22:30:10 +08:00
parent 986d1cdfc2
commit a383363e69
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/bpm/processInstance/index.ts
View File

@ -102,3 +102,8 @@ export const getFormFieldsPermission = async (params: any) => {
export const getProcessInstanceBpmnModelView = async (id: string) => { export const getProcessInstanceBpmnModelView = async (id: string) => {
return await request.get({ url: '/bpm/process-instance/get-bpmn-model-view?id=' + id }) return await request.get({ url: '/bpm/process-instance/get-bpmn-model-view?id=' + id })
} }
// 获取下一个执行的流程节点
export const getNextFlowNodes = async (params: any) => {
return await request.get({ url: '/bpm/process-instance/get-next-flow-nodes', params })
}

5
src/components/SimpleProcessDesignerV2/src/consts.ts
View File

@ -162,6 +162,10 @@ export enum CandidateStrategy {
* 指定用户 * 指定用户
*/ */
USER = 30, USER = 30,
/**
* 审批人自选
*/
APPROVE_USER_SELECT = 34,
/** /**
* 发起人自选 * 发起人自选
*/ */
@ -542,6 +546,7 @@ export const CANDIDATE_STRATEGY: DictDataVO[] = [
{ label: '连续多级部门负责人', value: CandidateStrategy.MULTI_LEVEL_DEPT_LEADER }, { label: '连续多级部门负责人', value: CandidateStrategy.MULTI_LEVEL_DEPT_LEADER },
{ label: '指定岗位', value: CandidateStrategy.MULTI_LEVEL_DEPT_LEADER }, { label: '指定岗位', value: CandidateStrategy.MULTI_LEVEL_DEPT_LEADER },
{ label: '发起人自选', value: CandidateStrategy.START_USER_SELECT }, { label: '发起人自选', value: CandidateStrategy.START_USER_SELECT },
{ label: '审批人自选', value: CandidateStrategy.APPROVE_USER_SELECT },
{ label: '发起人本人', value: CandidateStrategy.START_USER }, { label: '发起人本人', value: CandidateStrategy.START_USER },
{ label: '发起人部门负责人', value: CandidateStrategy.START_USER_DEPT_LEADER }, { label: '发起人部门负责人', value: CandidateStrategy.START_USER_DEPT_LEADER },
{ label: '发起人连续部门负责人', value: CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER }, { label: '发起人连续部门负责人', value: CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER },

34
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
View File

@ -718,29 +718,31 @@ const closePopover = (type: string, formRef: FormInstance | undefined) => {
const initNextAssigneesFormField = async () => { const initNextAssigneesFormField = async () => {
// 获取修改的流程变量, 暂时只支持流程表单 // 获取修改的流程变量, 暂时只支持流程表单
const variables = getUpdatedProcessInstanceVariables() const variables = getUpdatedProcessInstanceVariables()
const data = await ProcessInstanceApi.getApprovalDetail({ const data = await ProcessInstanceApi.getNextFlowNodes({
processInstanceId: props.processInstance.id, processInstanceId: props.processInstance.id,
taskId: runningTask.value.id,
processVariablesStr: JSON.stringify(variables) processVariablesStr: JSON.stringify(variables)
}) })
if (data && data.length > 0) {
const activityId = data.todoTask?.taskDefinitionKey data.forEach((node: any) => {
if (data.activityNodes && data.activityNodes.length > 0) {
// 找到当前节点的索引
const currentNodeIndex = data.activityNodes.findIndex((node: any) => node.id === activityId)
const nextNode = data.activityNodes[currentNodeIndex + 1]
// 情况一：发起人选择审批人：此时一般是因为条件发生变化，需要当前审批人补充选择
if ( if (
nextNode.candidateStrategy === CandidateStrategy.START_USER_SELECT && node.candidateStrategy === CandidateStrategy.START_USER_SELECT &&
!nextNode.tasks && node.candidateUsers && node.task
nextNode.candidateUsers?.length === 0
) { ) {
// 自选审批人，则弹出选择审批人弹窗 nextAssigneesActivityNode.value.push(node)
// TODO @小北：需要考虑下，这里的 nextNode 可能是多个节点，需要怎么处理；类似你在后端的处理哈 }
// TODO @小北：有点纠结，是不是写个预测下一个节点的接口，更合适？ })
nextAssigneesActivityNode.value = [nextNode] if (nextAssigneesActivityNode.value.length > 0) {
nextAssigneesVisible.value = true nextAssigneesVisible.value = true
} }
// TODO @小北：情况二：审批人选择的情况
// // 自选审批人，则弹出选择审批人弹窗
// // TODO @小北：需要考虑下，这里的 nextNode 可能是多个节点，需要怎么处理；类似你在后端的处理哈
// // TODO @小北：有点纠结，是不是写个预测下一个节点的接口，更合适？
// nextAssigneesActivityNode.value = [nextNode]
// nextAssigneesVisible.value = true
// }
// // TODO @小北：情况二：审批人选择的情况
} }
} }