yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: merge master into feat-antdv-next

pull/364/head
XuZhiqiang 2026-06-18 23:28:17 +08:00
parent c20eb8e1f4 db628675b2
commit 019473e9bc
3 changed files with 80 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,10 +273,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
</template> </template>
<div <div class="ml-2 flex flex-col items-start gap-2">
class="ml-2 flex flex-col items-start gap-2"
:id="`activity-task-${activity.id}-${index}`"
>
<!-- 第一行：节点名称、时间 --> <!-- 第一行：节点名称、时间 -->
<div class="flex w-full"> <div class="flex w-full">
<div class="font-bold"> <div class="font-bold">
@ -350,12 +347,12 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
</div> </div>
<div v-else class="mt-1 flex flex-wrap items-center gap-2"> <div v-else class="mt-1 flex w-full flex-wrap items-center gap-2">
<!-- 情况一：遍历每个审批节点下的【进行中】task 任务 --> <!-- 情况一：遍历每个审批节点下的【进行中】task 任务 -->
<div <div
v-for="(task, idx) in activity.tasks" v-for="(task, idx) in activity.tasks"
:key="idx" :key="idx"
class="flex flex-col gap-2 pr-2" class="flex w-full flex-col gap-2 pr-2"
> >
<div <div
class="relative flex flex-wrap gap-2" class="relative flex flex-wrap gap-2"
@ -416,7 +413,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
<!-- 审批意见,附件和签名 --> <!-- 审批意见,附件和签名 -->
<teleport defer :to="`#activity-task-${activity.id}-${index}`">
<div <div
v-if="shouldShowReasonAndAttachment(task, activity.nodeType)" v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500" class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
@ -486,7 +482,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
:preview="{ src: task.signPicUrl }" :preview="{ src: task.signPicUrl }"
/> />
</div> </div>
</teleport>
</div> </div>
<!-- 情况二：遍历每个审批节点下的【候选的】task 任务 --> <!-- 情况二：遍历每个审批节点下的【候选的】task 任务 -->

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

@ -280,10 +280,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
</template> </template>
<div <div class="ml-2 flex flex-col items-start gap-2">
class="ml-2 flex flex-col items-start gap-2"
:id="`activity-task-${activity.id}-${index}`"
>
<!-- 第一行：节点名称、时间 --> <!-- 第一行：节点名称、时间 -->
<div class="flex w-full"> <div class="flex w-full">
<div class="font-bold"> <div class="font-bold">
@ -357,12 +354,12 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
</div> </div>
<div v-else class="mt-1 flex flex-wrap items-center gap-2"> <div v-else class="mt-1 flex w-full flex-wrap items-center gap-2">
<!-- 情况一：遍历每个审批节点下的【进行中】task 任务 --> <!-- 情况一：遍历每个审批节点下的【进行中】task 任务 -->
<div <div
v-for="(task, idx) in activity.tasks" v-for="(task, idx) in activity.tasks"
:key="idx" :key="idx"
class="flex flex-col gap-2 pr-2" class="flex w-full flex-col gap-2 pr-2"
> >
<div <div
class="relative flex flex-wrap gap-2" class="relative flex flex-wrap gap-2"
@ -423,7 +420,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
<!-- 审批意见、附件和签名 --> <!-- 审批意见、附件和签名 -->
<teleport defer :to="`#activity-task-${activity.id}-${index}`">
<div <div
v-if="shouldShowReasonAndAttachment(task, activity.nodeType)" v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500" class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
@ -441,9 +437,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
<div class="flex flex-col gap-1.5"> <div class="flex flex-col gap-1.5">
<template <template
v-for="( v-for="(attachment, attachmentIndex) in task.attachments"
attachment, attachmentIndex
) in task.attachments"
:key="attachmentIndex" :key="attachmentIndex"
> >
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
@ -493,7 +487,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
:preview="{ src: task.signPicUrl }" :preview="{ src: task.signPicUrl }"
/> />
</div> </div>
</teleport>
</div> </div>
<!-- 情况二：遍历每个审批节点下的【候选的】task 任务 --> <!-- 情况二：遍历每个审批节点下的【候选的】task 任务 -->

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

@ -280,10 +280,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
</template> </template>
<div <div class="ml-2 flex flex-col items-start gap-2">
class="ml-2 flex flex-col items-start gap-2"
:id="`activity-task-${activity.id}-${index}`"
>
<!-- 第一行：节点名称、时间 --> <!-- 第一行：节点名称、时间 -->
<div class="flex w-full items-center"> <div class="flex w-full items-center">
<div class="font-bold"> <div class="font-bold">
@ -355,12 +352,12 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
</div> </div>
<div v-else class="mt-1 flex flex-wrap items-center gap-2"> <div v-else class="mt-1 flex w-full flex-wrap items-center gap-2">
<!-- 情况一：遍历每个审批节点下的【进行中】task 任务 --> <!-- 情况一：遍历每个审批节点下的【进行中】task 任务 -->
<div <div
v-for="(task, idx) in activity.tasks" v-for="(task, idx) in activity.tasks"
:key="idx" :key="idx"
class="flex flex-col gap-2 pr-2" class="flex w-full flex-col gap-2 pr-2"
> >
<div <div
class="relative flex flex-wrap gap-2" class="relative flex flex-wrap gap-2"
@ -421,7 +418,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
</div> </div>
<!-- 审批意见,附件和签名 --> <!-- 审批意见,附件和签名 -->
<teleport defer :to="`#activity-task-${activity.id}-${index}`">
<div <div
v-if="shouldShowReasonAndAttachment(task, activity.nodeType)" v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500" class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
@ -489,7 +485,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
:preview-src-list="[task.signPicUrl]" :preview-src-list="[task.signPicUrl]"
/> />
</div> </div>
</teleport>
</div> </div>
<!-- 情况二：遍历每个审批节点下的【候选的】task 任务 --> <!-- 情况二：遍历每个审批节点下的【候选的】task 任务 -->