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

【代码评审】BPM：修复流程预测功能的一些变量

Browse Source
This commit is contained in:
YunaiV 2025-02-19 13:21:58 +08:00
parent 0d7d2cd1c3
commit bf96e8aeaf
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
View File

@ -108,7 +108,7 @@ const fApi = ref<ApiAttrs>()
// 指定审批人 // 指定审批人
const startUserSelectTasks: any = ref([]) // 发起人需要选择审批人或抄送人的任务列表 const startUserSelectTasks: any = ref([]) // 发起人需要选择审批人或抄送人的任务列表
const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
const hisStartUserSelectAssignees = ref({}) // 历史发起人选择审批人的数据 const tempStartUserSelectAssignees = ref({}) // 历史发起人选择审批人的数据，用于每次表单变更时，临时保存
const bpmnXML: any = ref(null) // BPMN 数据 const bpmnXML: any = ref(null) // BPMN 数据
const simpleJson = ref<string | undefined>() // Simple 设计器数据 json 格式 const simpleJson = ref<string | undefined>() // Simple 设计器数据 json 格式
@ -156,17 +156,18 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
} }
} }
// 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 /** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
watch( watch(
detailForm.value, detailForm.value,
(newValue) => { (newValue) => {
if (newValue && Object.keys(newValue.value).length > 0) { if (newValue && Object.keys(newValue.value).length > 0) {
// 记录之前的节点审批人 // 记录之前的节点审批人
hisStartUserSelectAssignees.value = startUserSelectAssignees.value tempStartUserSelectAssignees.value = startUserSelectAssignees.value
startUserSelectAssignees.value = {} startUserSelectAssignees.value = {}
// 加载最新的审批详情
getApprovalDetail({ getApprovalDetail({
id: props.selectProcessDefinition.id, id: props.selectProcessDefinition.id,
processVariablesStr: newValue.value processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
}) })
} }
}, },
@ -178,11 +179,11 @@ watch(
/** 获取审批详情 */ /** 获取审批详情 */
const getApprovalDetail = async (row: any) => { const getApprovalDetail = async (row: any) => {
try { try {
// TODO 获取审批详情，设置 activityId 为发起人节点（为了获取字段权限。暂时只对 Simple 设计器有效） // TODO 获取审批详情，设置 activityId 为发起人节点（为了获取字段权限。暂时只对 Simple 设计器有效）；@jason：这里可以去掉 activityId 么？
const data = await ProcessInstanceApi.getApprovalDetail({ const data = await ProcessInstanceApi.getApprovalDetail({
processDefinitionId: row.id, processDefinitionId: row.id,
activityId: NodeId.START_USER_NODE_ID, activityId: NodeId.START_USER_NODE_ID,
processVariablesStr: JSON.stringify(row.processVariablesStr) processVariablesStr: JSON.stringify(row.processVariablesStr) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
}) })
if (!data) { if (!data) {
@ -196,11 +197,14 @@ const getApprovalDetail = async (row: any) => {
startUserSelectTasks.value = data.activityNodes?.filter( startUserSelectTasks.value = data.activityNodes?.filter(
(node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy (node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy
) )
// 恢复之前的选择审批人
if (startUserSelectTasks.value?.length > 0) { if (startUserSelectTasks.value?.length > 0) {
for (const node of startUserSelectTasks.value) { for (const node of startUserSelectTasks.value) {
if (hisStartUserSelectAssignees.value[node.id] && hisStartUserSelectAssignees.value[node.id].length > 0) { if (
startUserSelectAssignees.value[node.id] = hisStartUserSelectAssignees.value[node.id] tempStartUserSelectAssignees.value[node.id] &&
tempStartUserSelectAssignees.value[node.id].length > 0
) {
startUserSelectAssignees.value[node.id] = tempStartUserSelectAssignees.value[node.id]
} else { } else {
startUserSelectAssignees.value[node.id] = [] startUserSelectAssignees.value[node.id] = []
} }

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

@ -709,6 +709,7 @@ const handleAudit = async (pass: boolean, formRef: FormInstance | undefined) =>
message.warning('表单校验不通过，请先完善表单!!') message.warning('表单校验不通过，请先完善表单!!')
return return
} }
if (pass) { if (pass) {
// 获取修改的流程变量, 暂时只支持流程表单 // 获取修改的流程变量, 暂时只支持流程表单
const variables = getUpdatedProcessInstanceVariables() const variables = getUpdatedProcessInstanceVariables()