fix: [bpm] 审批人自选时下一个节点审批人显示问题
parent
d78476ed84
commit
71627271d0
|
|
@ -855,9 +855,10 @@ defineExpose({ loadTodoTask });
|
||||||
name="nextAssignees"
|
name="nextAssignees"
|
||||||
v-if="nextAssigneesActivityNode.length > 0"
|
v-if="nextAssigneesActivityNode.length > 0"
|
||||||
>
|
>
|
||||||
<div class="-mb-8 -mt-3.5 ml-2.5">
|
<div class="ml-2.5 mt-2.5">
|
||||||
<ProcessInstanceTimeline
|
<ProcessInstanceTimeline
|
||||||
ref="nextAssigneesTimelineRef"
|
ref="nextAssigneesTimelineRef"
|
||||||
|
embedded
|
||||||
:activity-nodes="nextAssigneesActivityNode"
|
:activity-nodes="nextAssigneesActivityNode"
|
||||||
:show-status-icon="false"
|
:show-status-icon="false"
|
||||||
:enable-approve-user-select="true"
|
:enable-approve-user-select="true"
|
||||||
|
|
|
||||||
|
|
@ -23,12 +23,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
|
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
|
||||||
|
embedded?: boolean; // 是否嵌入表单使用(缩小顶部内边距,避免与表单项 label 间距过大)
|
||||||
enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
|
enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
|
||||||
showStatusIcon?: boolean; // 是否显示头像右下角状态图标
|
showStatusIcon?: boolean; // 是否显示头像右下角状态图标
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
showStatusIcon: true, // 默认值为 true
|
showStatusIcon: true, // 默认值为 true
|
||||||
enableApproveUserSelect: false, // 默认值为 false
|
enableApproveUserSelect: false, // 默认值为 false
|
||||||
|
embedded: false, // 默认值为 false
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -240,7 +242,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<Timeline class="pt-5">
|
<Timeline :class="embedded ? 'pt-2' : 'pt-5'">
|
||||||
<!-- 遍历每个审批节点 -->
|
<!-- 遍历每个审批节点 -->
|
||||||
<Timeline.Item
|
<Timeline.Item
|
||||||
v-for="(activity, index) in activityNodes"
|
v-for="(activity, index) in activityNodes"
|
||||||
|
|
|
||||||
|
|
@ -858,9 +858,10 @@ defineExpose({ loadTodoTask });
|
||||||
name="nextAssignees"
|
name="nextAssignees"
|
||||||
v-if="nextAssigneesActivityNode.length > 0"
|
v-if="nextAssigneesActivityNode.length > 0"
|
||||||
>
|
>
|
||||||
<div class="-mb-8 -mt-3.5 ml-2.5">
|
<div class="ml-2.5">
|
||||||
<ProcessInstanceTimeline
|
<ProcessInstanceTimeline
|
||||||
ref="nextAssigneesTimelineRef"
|
ref="nextAssigneesTimelineRef"
|
||||||
|
embedded
|
||||||
:activity-nodes="nextAssigneesActivityNode"
|
:activity-nodes="nextAssigneesActivityNode"
|
||||||
:show-status-icon="false"
|
:show-status-icon="false"
|
||||||
:enable-approve-user-select="true"
|
:enable-approve-user-select="true"
|
||||||
|
|
|
||||||
|
|
@ -30,12 +30,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
|
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
|
||||||
|
embedded?: boolean; // 是否嵌入表单使用(缩小顶部内边距,避免与表单项 label 间距过大)
|
||||||
enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
|
enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
|
||||||
showStatusIcon?: boolean; // 是否显示头像右下角状态图标
|
showStatusIcon?: boolean; // 是否显示头像右下角状态图标
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
showStatusIcon: true, // 默认值为 true
|
showStatusIcon: true, // 默认值为 true
|
||||||
enableApproveUserSelect: false, // 默认值为 false
|
enableApproveUserSelect: false, // 默认值为 false
|
||||||
|
embedded: false, // 默认值为 false
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -247,7 +249,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<Timeline class="pt-5">
|
<Timeline :class="embedded ? 'pt-2' : 'pt-5'">
|
||||||
<!-- 遍历每个审批节点 -->
|
<!-- 遍历每个审批节点 -->
|
||||||
<TimelineItem
|
<TimelineItem
|
||||||
v-for="(activity, index) in activityNodes"
|
v-for="(activity, index) in activityNodes"
|
||||||
|
|
|
||||||
|
|
@ -861,9 +861,10 @@ defineExpose({ loadTodoTask });
|
||||||
prop="nextAssignees"
|
prop="nextAssignees"
|
||||||
v-if="nextAssigneesActivityNode.length > 0"
|
v-if="nextAssigneesActivityNode.length > 0"
|
||||||
>
|
>
|
||||||
<div class="-mb-8 -mt-3.5 ml-2.5">
|
<div>
|
||||||
<ProcessInstanceTimeline
|
<ProcessInstanceTimeline
|
||||||
ref="nextAssigneesTimelineRef"
|
ref="nextAssigneesTimelineRef"
|
||||||
|
embedded
|
||||||
:activity-nodes="nextAssigneesActivityNode"
|
:activity-nodes="nextAssigneesActivityNode"
|
||||||
:show-status-icon="false"
|
:show-status-icon="false"
|
||||||
:enable-approve-user-select="true"
|
:enable-approve-user-select="true"
|
||||||
|
|
|
||||||
|
|
@ -30,12 +30,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
|
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
|
||||||
|
embedded?: boolean; // 是否嵌入表单使用(缩小顶部内边距,避免与表单项 label 间距过大)
|
||||||
enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
|
enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
|
||||||
showStatusIcon?: boolean; // 是否显示头像右下角状态图标
|
showStatusIcon?: boolean; // 是否显示头像右下角状态图标
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
showStatusIcon: true, // 默认值为 true
|
showStatusIcon: true, // 默认值为 true
|
||||||
enableApproveUserSelect: false, // 默认值为 false
|
enableApproveUserSelect: false, // 默认值为 false
|
||||||
|
embedded: false, // 默认值为 false
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -247,7 +249,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<ElTimeline class="pt-5">
|
<ElTimeline :class="embedded ? 'pt-2' : 'pt-5'">
|
||||||
<!-- 遍历每个审批节点 -->
|
<!-- 遍历每个审批节点 -->
|
||||||
<ElTimelineItem
|
<ElTimelineItem
|
||||||
v-for="(activity, index) in activityNodes"
|
v-for="(activity, index) in activityNodes"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue