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

!377 Merge remote-tracking branch 'yudao/master'

Browse Source 
Merge pull request !377 from Jason/master
This commit is contained in:
芋道源码
2026-06-28 10:41:38 +00:00
committed by Gitee
parent c24757e5e8 de0ad1a01b
commit 36d99229cb
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
View File

@@ -197,7 +197,15 @@ function shouldShowCustomUserSelect(
}
/** 判断是否需要显示审批意见和附件 */
function shouldShowReasonAndAttachment(task: any, nodeType: BpmNodeTypeEnum) {
function shouldShowReasonAndAttachment(
task: any,
nodeType: BpmNodeTypeEnum,
nodeIndex: number,
) {
// 第一个发起人节点是系统自动通过的，不展示审批意见；
if (nodeType === BpmNodeTypeEnum.START_USER_NODE && nodeIndex === 0) {
return false;
}
return (
Boolean(task.reason || task.attachments?.length > 0) &&
[BpmNodeTypeEnum.START_USER_NODE, BpmNodeTypeEnum.USER_TASK_NODE].includes(
@@ -422,7 +430,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
<!-- 审批意见,附件和签名 -->
<div
v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
v-if="shouldShowReasonAndAttachment(task, activity.nodeType, index)"
class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
>
<div v-if="task.reason">审批意见：{{ task.reason }}</div>

12
apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
View File

@@ -204,7 +204,15 @@ function shouldShowCustomUserSelect(
}
/** 判断是否需要显示审批意见和附件 */
function shouldShowReasonAndAttachment(task: any, nodeType: BpmNodeTypeEnum) {
function shouldShowReasonAndAttachment(
task: any,
nodeType: BpmNodeTypeEnum,
nodeIndex: number,
) {
// 第一个发起人节点是系统自动通过的，不展示审批意见；
if (nodeType === BpmNodeTypeEnum.START_USER_NODE && nodeIndex === 0) {
return false;
}
return (
Boolean(task.reason || task.attachments?.length > 0) &&
[BpmNodeTypeEnum.START_USER_NODE, BpmNodeTypeEnum.USER_TASK_NODE].includes(
@@ -429,7 +437,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
<!-- 审批意见、附件和签名 -->
<div
v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
v-if="shouldShowReasonAndAttachment(task, activity.nodeType, index)"
class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
>
<div v-if="task.reason">审批意见：{{ task.reason }}</div>

12
apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
View File

@@ -204,7 +204,15 @@ function shouldShowCustomUserSelect(
}
/** 判断是否需要显示审批意见和附件 */
function shouldShowReasonAndAttachment(task: any, nodeType: BpmNodeTypeEnum) {
function shouldShowReasonAndAttachment(
task: any,
nodeType: BpmNodeTypeEnum,
nodeIndex: number,
) {
// 第一个发起人节点是系统自动通过的，不展示审批意见；
if (nodeType === BpmNodeTypeEnum.START_USER_NODE && nodeIndex === 0) {
return false;
}
return (
Boolean(task.reason || task.attachments?.length > 0) &&
[BpmNodeTypeEnum.START_USER_NODE, BpmNodeTypeEnum.USER_TASK_NODE].includes(
@@ -427,7 +435,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
<!-- 审批意见,附件和签名 -->
<div
v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
v-if="shouldShowReasonAndAttachment(task, activity.nodeType, index)"
class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
>
<div v-if="task.reason">审批意见：{{ task.reason }}</div>