xuemingqiang/yudao-ui-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 流程再次发起，预测节点查询

Browse Source
This commit is contained in:
smallNorthLee
2025-03-03 21:09:59 +08:00
parent c2e99fb427
commit 3b5a0ae290
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@
:rows="4"
/>
</el-form-item>
<el-form-item label="下一个节点的审批人" prop="nextAssignees" v-if="nextAssigneesVisible">
<el-form-item label="下一个节点的审批人" prop="nextAssignees" v-if="nextAssigneesActivityNode.length > 0">
<div class="ml-10px -mt-15px -mb-35px">
<ProcessInstanceTimeline
:activity-nodes="nextAssigneesActivityNode"
@ -522,6 +522,7 @@ import { BpmModelFormType, BpmProcessInstanceStatus } from '@/utils/constants'
import type { FormInstance, FormRules } from 'element-plus'
import SignDialog from './SignDialog.vue'
import ProcessInstanceTimeline from '../detail/ProcessInstanceTimeline.vue'
import { isEmpty } from '@/utils/is'
defineOptions({ name: 'ProcessInstanceBtnContainer' })
@ -565,7 +566,6 @@ const reasonRequire = ref()
const approveFormRef = ref<FormInstance>()
const signRef = ref()
const approveSignFormRef = ref()
const nextAssigneesVisible = ref(false) // 是否显示下一个节点的审批人
const nextAssigneesActivityNode = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([]) // 下一个审批节点信息
const approveReasonForm = reactive({
reason: '',
@ -711,7 +711,7 @@ const closePopover = (type: string, formRef: FormInstance | undefined) => {
formRef.resetFields()
}
popOverVisible.value[type] = false
nextAssigneesVisible.value = false
nextAssigneesActivityNode.value = []
}
/** 流程通过时，根据表单变量查询新的流程节点，判断下一个节点类型是否为自选审批人 */
@ -726,23 +726,14 @@ const initNextAssigneesFormField = async () => {
if (data && data.length > 0) {
data.forEach((node: any) => {
if (
node.candidateStrategy === CandidateStrategy.START_USER_SELECT &&
node.candidateUsers && node.task
isEmpty(node.tasks) &&
isEmpty(node.candidateUsers) &&
(CandidateStrategy.START_USER_SELECT === node.candidateStrategy ||
CandidateStrategy.APPROVE_USER_SELECT === node.candidateStrategy)
) {
nextAssigneesActivityNode.value.push(node)
}
})
if (nextAssigneesActivityNode.value.length > 0) {
nextAssigneesVisible.value = true
}
// // 自选审批人，则弹出选择审批人弹窗
// // TODO @小北：需要考虑下，这里的 nextNode 可能是多个节点，需要怎么处理；类似你在后端的处理哈
// // TODO @小北：有点纠结，是不是写个预测下一个节点的接口，更合适？
// nextAssigneesActivityNode.value = [nextNode]
// nextAssigneesVisible.value = true
// }
// // TODO @小北：情况二：审批人选择的情况
}
}
@ -767,7 +758,8 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
if (pass) {
// 如果需要自选审批人，则校验自选审批人
if (nextAssigneesVisible.value && Object.keys(approveReasonForm.nextAssignees).length === 0) {
if (Object.keys(nextAssigneesActivityNode.value).length > 0
&& Object.keys(approveReasonForm.nextAssignees).length === 0) {
message.warning('下一个节点的审批人不能为空!')
return
}
@ -793,7 +785,7 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
}
await TaskApi.approveTask(data)
popOverVisible.value.approve = false
nextAssigneesVisible.value = false
nextAssigneesActivityNode.value = []
message.success('审批通过成功')
} else {
// 审批不通过数据