Skip to content

phsl / admin

Go to a project
Commit cd9cefa2 by YunaiV
Options

【功能修改】工作流：审批意见直接展示，不通过 tooltip

parent ffc09e8e
Showing with 24 additions and 60 deletions
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
...@@ -17,42 +17,21 @@ ...@@ -17,42 +17,21 @@
<div class="flex flex-col pr-2"> <div class="flex flex-col pr-2">
<div class="position-relative" v-if="task.assigneeUser || task.ownerUser"> <div class="position-relative" v-if="task.assigneeUser || task.ownerUser">
<!-- 信息：头像 --> <!-- 信息：头像 -->
<el-tooltip <el-avatar
:content="task.reason"
placement="bottom"
v-if="task.assigneeUser && task.assigneeUser.avatar" v-if="task.assigneeUser && task.assigneeUser.avatar"
effect="light" :size="36"
> :src="task.assigneeUser.avatar"
<el-avatar :size="36" :src="task.assigneeUser.avatar" /> />
</el-tooltip> <el-avatar v-else-if="task.assigneeUser && task.assigneeUser.nickname">
<el-tooltip {{ task.assigneeUser.nickname.substring(0, 1) }}
:content="task.reason" </el-avatar>
placement="bottom" <el-avatar
v-else-if="task.assigneeUser && task.assigneeUser.nickname"
effect="light"
>
<el-avatar>
{{ task.assigneeUser.nickname.substring(0, 1) }}
</el-avatar>
</el-tooltip>
<el-tooltip
:content="task.reason"
placement="bottom"
v-else-if="task.ownerUser && task.ownerUser.avatar" v-else-if="task.ownerUser && task.ownerUser.avatar"
effect="light" :src="task.ownerUser.avatar"
> />
<el-avatar :src="task.ownerUser.avatar" /> <el-avatar v-else-if="task.ownerUser && task.ownerUser.nickname">
</el-tooltip> {{ task.ownerUser.nickname.substring(0, 1) }}
<el-tooltip </el-avatar>
:content="task.reason"
placement="bottom"
v-else-if="task.ownerUser && task.ownerUser.nickname"
effect="light"
>
<el-avatar>
{{ task.ownerUser.nickname.substring(0, 1) }}
</el-avatar>
</el-tooltip>
<!-- 信息：任务 ICON --> <!-- 信息：任务 ICON -->
<div <div
class="position-absolute top-26px left-26px bg-#fff rounded-full flex items-center p-2px" class="position-absolute top-26px left-26px bg-#fff rounded-full flex items-center p-2px"
...@@ -78,16 +57,12 @@ ...@@ -78,16 +57,12 @@
> >
{{ task.ownerUser.nickname }} {{ task.ownerUser.nickname }}
</div> </div>
<!-- <div
<div v-if="task.reason" class="text-#a5a5a5 my-4px text-12px flex items-center w-100%"> v-if="task.reason && activity.nodeType === NodeType.USER_TASK_NODE"
<div class="text-#a5a5a5 text-13px mt-1"
:title="task.reason" >
class="text-truncate w-200px border-1px border-#a5a5a5 border-dashed rounded py-5px px-15px text-#2d2d2d" 审批意见：{{ task.reason }}
>
{{ task.reason }}
</div>
</div> </div>
-->
</div> </div>
</div> </div>
</div> </div>
...@@ -131,20 +106,6 @@ ...@@ -131,20 +106,6 @@
> >
{{ getApprovalNodeTime(activity) }} {{ getApprovalNodeTime(activity) }}
</div> </div>
<!-- TODO @jason：审批意见，要展示哈。 -->
<!-- <div class="color-#a1a6ae text-12px mb-10px"> {{ activity.assigneeUser.nickname }}</div>
<div v-if="activity.opinion" class="text-#a5a5a5 text-12px w-100%">
<div class="mb-5px">审批意见：</div>
<div
class="w-100% border-1px border-#a5a5a5 border-dashed rounded py-5px px-15px text-#2d2d2d"
>
{{ activity.opinion }}
</div>
</div>
<div v-if="activity.createTime" class="text-#a5a5a5 text-13px">
{{ formatDate(activity.createTime) }}
</div> -->
</div> </div>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
...@@ -219,8 +180,11 @@ const getApprovalNodeColor = (taskStatus: number) => { ...@@ -219,8 +180,11 @@ const getApprovalNodeColor = (taskStatus: number) => {
} }
const getApprovalNodeTime = (node: ProcessInstanceApi.ApprovalNodeInfo) => { const getApprovalNodeTime = (node: ProcessInstanceApi.ApprovalNodeInfo) => {
if (node.nodeType === NodeType.START_USER_NODE && node.startTime) {
return `发起时间：${formatDate(node.startTime)}`
}
if (node.endTime) { if (node.endTime) {
return `结束时间：${formatDate(node.endTime)}` return `审批时间：${formatDate(node.endTime)}`
} }
if (node.startTime) { if (node.startTime) {
return `创建时间：${formatDate(node.startTime)}` return `创建时间：${formatDate(node.startTime)}`
......
src/views/bpm/processInstance/detail/index.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="form-scroll-area"> <div class="form-scroll-area">
<el-scrollbar> <el-scrollbar>
<el-row> <el-row>
<el-col :span="18" class="!flex !flex-col formCol"> <el-col :span="17" class="!flex !flex-col formCol">
<!-- 表单信息 --> <!-- 表单信息 -->
<div <div
v-loading="processInstanceLoading" v-loading="processInstanceLoading"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="7">
<!-- 审批记录时间线 --> <!-- 审批记录时间线 -->
<ProcessInstanceTimeline ref="timelineRef" :approve-nodes="approveNodes" /> <ProcessInstanceTimeline ref="timelineRef" :approve-nodes="approveNodes" />
</el-col> </el-col>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment