feat: 审批记录时间线抽取为单独组件;时间线整体样式优化、展示逻辑TODO
This commit is contained in:
@ -56,51 +56,8 @@
|
||||
/>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<!-- TODO @GoldenZqqq:后续这个,也拆个小组件出来 -->
|
||||
<el-timeline class="pt-20px">
|
||||
<el-timeline-item type="primary" size="large">
|
||||
<div class="flex flex-col items-start gap-2">
|
||||
<div class="font-bold"> 发起人:{{ processInstance?.startUser?.nickname }}</div>
|
||||
<el-tag type="success">发起</el-tag>
|
||||
<div class="text-#a5a5a5 text-12px">
|
||||
发起时间:{{ formatDate(processInstance.startTime) }}
|
||||
</div>
|
||||
</div>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item
|
||||
v-for="(activity, index) in tasks"
|
||||
:key="index"
|
||||
type="primary"
|
||||
size="large"
|
||||
>
|
||||
<div class="flex flex-col items-start gap-2">
|
||||
<div class="font-bold"> 审批人:{{ activity.assigneeUser?.nickname }}</div>
|
||||
<dict-tag
|
||||
:type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS"
|
||||
:value="activity.status"
|
||||
/>
|
||||
<!-- TODO:暂无该字段 -->
|
||||
<div v-if="activity.receiveTime" class="text-#a5a5a5 text-12px">
|
||||
接收时间:{{ formatDate(activity.receiveTime) }}
|
||||
</div>
|
||||
<div v-if="activity.createTime" class="text-#a5a5a5 text-12px">
|
||||
审批时间:{{ formatDate(activity.createTime) }}
|
||||
</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>
|
||||
<!-- 该节点用户的头像 -->
|
||||
<!-- <template #dot>
|
||||
<img :src="activity?.avatar" alt="" />
|
||||
</template> -->
|
||||
</el-timeline-item>
|
||||
</el-timeline>
|
||||
<!-- 审批记录时间线 -->
|
||||
<ProcessInstanceTimeline :process-instance="processInstance" :tasks="tasks" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-tab-pane>
|
||||
@ -139,6 +96,7 @@ import * as TaskApi from '@/api/bpm/task'
|
||||
import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
|
||||
import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
|
||||
import ProcessInstanceOperationButton from './ProcessInstanceOperationButton.vue'
|
||||
import ProcessInstanceTimeline from './ProcessInstanceTimeline.vue'
|
||||
import { registerComponent } from '@/utils/routerHelper'
|
||||
import * as UserApi from '@/api/system/user'
|
||||
import audit1 from '@/assets/svgs/bpm/audit1.svg'
|
||||
|
||||
Reference in New Issue
Block a user