微调
This commit is contained in:
@@ -1,269 +1,270 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-card v-loading='loading' class='box-card'>
|
<el-card v-loading='loading' class='box-card'>
|
||||||
<el-col :offset='3' :span='17'>
|
<el-col :offset='3' :span='17'>
|
||||||
<div class='item_line'>
|
<div class='item_line'>
|
||||||
<el-timeline>
|
<el-timeline>
|
||||||
<div class='end_item_line'>
|
<div class='end_item_line'>
|
||||||
<div class='end_item_lines'></div>
|
<div class='end_item_lines'></div>
|
||||||
<el-timeline-item
|
<el-timeline-item
|
||||||
v-if='processInstance.endTime'
|
v-if='processInstance.endTime'
|
||||||
:type='getProcessInstanceTimelineItemType(processInstance)'
|
:type='getProcessInstanceTimelineItemType(processInstance)'
|
||||||
>
|
>
|
||||||
<p style='font-weight: 700'>
|
<p style='font-weight: 700'>
|
||||||
结束流程：在 {{ formatDate(processInstance?.endTime) }} 结束
|
结束流程：在 {{ formatDate(processInstance?.endTime) }} 结束
|
||||||
<el-tag :type='getTaskTimelineItemType(processInstance.status)'>
|
<el-tag :type='getTaskTimelineItemType(processInstance.status)'>
|
||||||
{{ getTaskNameItemType(processInstance.status) }}
|
{{ getTaskNameItemType(processInstance.status) }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
</p>
|
</p>
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
</div>
|
</div>
|
||||||
<div class='start_item_line' v-for='(item, index) in tasksList' :key='index'>
|
<div class='start_item_line' v-for='(item, index) in tasksList' :key='index'>
|
||||||
<div class='start_item_lines'></div>
|
<div class='start_item_lines'></div>
|
||||||
<!-- 最后一条不显示重新发起 -->
|
<!-- 最后一条不显示重新发起 -->
|
||||||
<el-timeline-item type='success' v-if="index != 0 && item.status != '1'">
|
<el-timeline-item type='success' v-if="index != 0 && item.status != '1'">
|
||||||
<p style='font-weight: 700'>
|
<p style='font-weight: 700'>
|
||||||
重新发起：【{{ item.processInstance.startUser?.name }}】在
|
重新发起：【{{ item.processInstance.startUser?.name }}】在
|
||||||
{{ formatDate(item?.createTime) }} 重新发起【 {{ item.processInstance.name }} 】流程
|
{{ formatDate(item?.createTime) }} 重新发起【 {{ item.processInstance.name }} 】流程
|
||||||
</p>
|
</p>
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
<el-timeline-item :type='getTaskTimelineItemType(item)'>
|
<el-timeline-item :type='getTaskTimelineItemType(item)'>
|
||||||
<p style='font-weight: 700; margin: 8px'>
|
<p style='font-weight: 700; margin: 8px'>
|
||||||
审批任务：{{ item.name }}
|
审批任务：{{ item.name }}
|
||||||
<el-tag
|
<el-tag
|
||||||
style="margin-left: 10px;" :type='getTaskTimelineItemType(item.status)'>
|
style="margin-left: 10px;" :type='getTaskTimelineItemType(item.status)'>
|
||||||
{{ getTaskNameItemType(item.status) }}
|
{{ getTaskNameItemType(item.status) }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
<el-button
|
<el-button
|
||||||
class='ml-10px'
|
class='ml-10px'
|
||||||
v-if='!isEmpty(item.children)'
|
v-if='!isEmpty(item.children)'
|
||||||
@click='openChildrenTask(item)'
|
@click='openChildrenTask(item)'
|
||||||
size='small'
|
size='small'
|
||||||
>
|
>
|
||||||
<Icon icon='ep:memo' />
|
<Icon icon='ep:memo'/>
|
||||||
子任务
|
子任务
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class='ml-10px'
|
class='ml-10px'
|
||||||
size='small'
|
size='small'
|
||||||
type="primary"
|
type="primary"
|
||||||
:icon="View"
|
:icon="View"
|
||||||
style="margin-left: 10px;"
|
style="margin-left: 10px;"
|
||||||
@click='handleFormDetail(item)'
|
@click='handleFormDetail(item)'
|
||||||
v-if="item.formId"
|
v-if="item.formId && item.status!=3"
|
||||||
>
|
>
|
||||||
<Icon icon='ep:document' />
|
<Icon icon='ep:document'/>
|
||||||
查看表单
|
查看表单
|
||||||
</el-button>
|
</el-button>
|
||||||
</p>
|
</p>
|
||||||
<el-card :body-style="{ padding: '10px' }">
|
<el-card :body-style="{ padding: '10px' }">
|
||||||
<label v-if='item.assigneeUser' style='margin-right: 30px; font-weight: normal'>
|
<label v-if='item.assigneeUser' style='margin-right: 30px; font-weight: normal'>
|
||||||
审批人：{{ item.assigneeUser.name }}
|
审批人：{{ item.assigneeUser.name }}
|
||||||
<el-tag size='small' type='info'>{{ item.assigneeUser.deptName }}</el-tag>
|
<el-tag size='small' type='info'>{{ item.assigneeUser.deptName }}</el-tag>
|
||||||
</label>
|
</label>
|
||||||
<label v-if='item.createTime' style='font-weight: normal'>创建时间：</label>
|
<label v-if='item.createTime' style='font-weight: normal'>创建时间：</label>
|
||||||
<label style='font-weight: normal; color: #8a909c'>
|
<label style='font-weight: normal; color: #8a909c'>
|
||||||
{{ formatDate(item?.createTime) }}
|
{{ formatDate(item?.createTime) }}
|
||||||
</label>
|
</label>
|
||||||
<label v-if='item.endTime' style='margin-left: 30px; font-weight: normal'>
|
<label v-if='item.endTime' style='margin-left: 30px; font-weight: normal'>
|
||||||
审批时间：
|
审批时间：
|
||||||
</label>
|
</label>
|
||||||
<label v-if='item.endTime' style='font-weight: normal; color: #8a909c'>
|
<label v-if='item.endTime' style='font-weight: normal; color: #8a909c'>
|
||||||
{{ formatDate(item?.endTime) }}
|
{{ formatDate(item?.endTime) }}
|
||||||
</label>
|
</label>
|
||||||
<label v-if='item.durationInMillis' style='margin-left: 30px; font-weight: normal'>
|
<label v-if='item.durationInMillis' style='margin-left: 30px; font-weight: normal'>
|
||||||
耗时：
|
耗时：
|
||||||
</label>
|
</label>
|
||||||
<label v-if='item.durationInMillis' style='font-weight: normal; color: #8a909c'>
|
<label v-if='item.durationInMillis' style='font-weight: normal; color: #8a909c'>
|
||||||
{{ formatPast2(item?.durationInMillis) }}
|
{{ formatPast2(item?.durationInMillis) }}
|
||||||
</label>
|
</label>
|
||||||
<p v-if='item.reason'>审批建议：{{ item.reason }}</p>
|
<p v-if='item.reason'>审批建议：{{ item.reason }}</p>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
</div>
|
</div>
|
||||||
<el-timeline-item type='success'>
|
<el-timeline-item type='success'>
|
||||||
<p style='font-weight: 700'>
|
<p style='font-weight: 700'>
|
||||||
发起流程：【{{ tasksList[tasksList.length - 1]?.processInstance.startUser?.name }}】在
|
发起流程：【{{ tasksList[tasksList.length - 1]?.processInstance.startUser?.name }}】在
|
||||||
{{ formatDate(tasksList[tasksList.length - 1]?.createTime) }} 发起【
|
{{ formatDate(tasksList[tasksList.length - 1]?.createTime) }} 发起【
|
||||||
{{ tasksList[tasksList.length - 1]?.processInstance.name }} 】流程
|
{{ tasksList[tasksList.length - 1]?.processInstance.name }} 】流程
|
||||||
</p>
|
</p>
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
</el-timeline>
|
</el-timeline>
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
</el-card>
|
|
||||||
<!-- 弹窗：子任务 -->
|
|
||||||
<TaskSignList ref='taskSignListRef' @success='refresh' />
|
|
||||||
<!-- 弹窗：表单 -->
|
|
||||||
<el-dialog title='表单详情' v-model='taskFormVisible' width='750' @closed="closeForm">
|
|
||||||
<!-- pointer-events:none;设置元素无法响应鼠标 -->
|
|
||||||
<div style="pointer-events:none;">
|
|
||||||
<form-create ref='fApi' v-model='taskForm.value' :option='taskForm.option' :rule='taskForm.rule' />
|
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-col>
|
||||||
|
</el-card>
|
||||||
|
<!-- 弹窗：子任务 -->
|
||||||
|
<TaskSignList ref='taskSignListRef' @success='refresh'/>
|
||||||
|
<!-- 弹窗：表单 -->
|
||||||
|
<el-dialog title='表单详情' v-model='taskFormVisible' width='750' @closed="closeForm">
|
||||||
|
<!-- pointer-events:none;设置元素无法响应鼠标 -->
|
||||||
|
<div style="pointer-events:none;">
|
||||||
|
<form-create ref='fApi' v-model='taskForm.value' :option='taskForm.option' :rule='taskForm.rule'/>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
<script lang='ts' setup>
|
<script lang='ts' setup>
|
||||||
import { ref, watch, nextTick } from 'vue'
|
import {ref, watch, nextTick} from 'vue'
|
||||||
import { formatDate, formatPast2 } from '@/utils/formatTime'
|
import {formatDate, formatPast2} from '@/utils/formatTime'
|
||||||
import { propTypes } from '@/utils/propTypes'
|
import {propTypes} from '@/utils/propTypes'
|
||||||
import { isEmpty } from '@/utils/is'
|
import {isEmpty} from '@/utils/is'
|
||||||
import TaskSignList from './dialog/TaskSignList.vue'
|
import TaskSignList from './dialog/TaskSignList.vue'
|
||||||
import type { ApiAttrs } from '@form-create/element-ui/types/config'
|
import type {ApiAttrs} from '@form-create/element-ui/types/config'
|
||||||
import { setConfAndFields2 ,resetConfAndFields} from '@/utils/formCreate'
|
import {setConfAndFields2, resetConfAndFields} from '@/utils/formCreate'
|
||||||
import {View} from '@element-plus/icons-vue'
|
import {View} from '@element-plus/icons-vue'
|
||||||
defineOptions({ name: 'BpmProcessInstanceTaskList' })
|
|
||||||
|
defineOptions({name: 'BpmProcessInstanceTaskList'})
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
loading: propTypes.bool, // 是否加载中
|
loading: propTypes.bool, // 是否加载中
|
||||||
processInstance: propTypes.object, // 流程实例
|
processInstance: propTypes.object, // 流程实例
|
||||||
tasks: propTypes.arrayOf(propTypes.object) // 流程任务的数组
|
tasks: propTypes.arrayOf(propTypes.object) // 流程任务的数组
|
||||||
})
|
})
|
||||||
const tasksList: any = ref([])
|
const tasksList: any = ref([])
|
||||||
watch(
|
watch(
|
||||||
() => props.tasks,
|
() => props.tasks,
|
||||||
(val, oldVal) => {
|
(val, oldVal) => {
|
||||||
if (val && val.length != 0) {
|
if (val && val.length != 0) {
|
||||||
tasksList.value = JSON.parse(JSON.stringify(val)).sort((a, b) => {
|
tasksList.value = JSON.parse(JSON.stringify(val)).sort((a, b) => {
|
||||||
// 有已完成的情况，按照完成时间倒序
|
// 有已完成的情况，按照完成时间倒序
|
||||||
// if (a.endTime && b.endTime) {
|
// if (a.endTime && b.endTime) {
|
||||||
// return sortYMDHMS(a.endTime) - sortYMDHMS(b.endTime)
|
// return sortYMDHMS(a.endTime) - sortYMDHMS(b.endTime)
|
||||||
// } else
|
// } else
|
||||||
// if (a.endTime) {
|
// if (a.endTime) {
|
||||||
// return 1
|
// return 1
|
||||||
// }
|
// }
|
||||||
// else if (b.endTime) {
|
// else if (b.endTime) {
|
||||||
// return -1
|
// return -1
|
||||||
// // 都是未完成，按照创建时间倒序
|
// // 都是未完成，按照创建时间倒序
|
||||||
// }
|
// }
|
||||||
// else
|
// else
|
||||||
// {
|
// {
|
||||||
return sortYMDHMS(b.createTime) - sortYMDHMS(a.createTime)
|
return sortYMDHMS(b.createTime) - sortYMDHMS(a.createTime)
|
||||||
// }
|
// }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
immediate: true,
|
immediate: true,
|
||||||
deep: true
|
deep: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const sortYMDHMS = val => {
|
const sortYMDHMS = val => {
|
||||||
return val.replace('-', '').replace('-', '').replace(' ', '').replace(':', '').replace(':', '') - 0
|
return val.replace('-', '').replace('-', '').replace(' ', '').replace(':', '').replace(':', '') - 0
|
||||||
}
|
}
|
||||||
/** 获得流程实例对应的颜色 */
|
/** 获得流程实例对应的颜色 */
|
||||||
const getProcessInstanceTimelineItemType = (item: any) => {
|
const getProcessInstanceTimelineItemType = (item: any) => {
|
||||||
if (item.status === 2) {
|
if (item.status === 2) {
|
||||||
return 'success'
|
return 'success'
|
||||||
}
|
}
|
||||||
if (item.status === 3) {
|
if (item.status === 3) {
|
||||||
return 'danger'
|
return 'danger'
|
||||||
}
|
}
|
||||||
if (item.status === 4) {
|
if (item.status === 4) {
|
||||||
return 'warning'
|
return 'warning'
|
||||||
}
|
}
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 获得任务对应的颜色 */
|
/** 获得任务对应的颜色 */
|
||||||
const getTaskTimelineItemType = (itemStatus: any) => {
|
const getTaskTimelineItemType = (itemStatus: any) => {
|
||||||
if ([0, 1, 6, 7].includes(itemStatus)) {
|
if ([0, 1, 6, 7].includes(itemStatus)) {
|
||||||
return 'primary'
|
|
||||||
}
|
|
||||||
if (itemStatus === 2) {
|
|
||||||
return 'success'
|
|
||||||
}
|
|
||||||
if (itemStatus === 3) {
|
|
||||||
return 'danger'
|
|
||||||
}
|
|
||||||
if (itemStatus === 4) {
|
|
||||||
return 'info'
|
|
||||||
}
|
|
||||||
if (itemStatus === 5) {
|
|
||||||
return 'warning'
|
|
||||||
}
|
|
||||||
return 'primary'
|
return 'primary'
|
||||||
|
}
|
||||||
|
if (itemStatus === 2) {
|
||||||
|
return 'success'
|
||||||
|
}
|
||||||
|
if (itemStatus === 3) {
|
||||||
|
return 'danger'
|
||||||
|
}
|
||||||
|
if (itemStatus === 4) {
|
||||||
|
return 'info'
|
||||||
|
}
|
||||||
|
if (itemStatus === 5) {
|
||||||
|
return 'warning'
|
||||||
|
}
|
||||||
|
return 'primary'
|
||||||
}
|
}
|
||||||
const getTaskNameItemType = (itemStatus: any) => {
|
const getTaskNameItemType = (itemStatus: any) => {
|
||||||
if (itemStatus === 1) {
|
if (itemStatus === 1) {
|
||||||
return '审批中'
|
|
||||||
}
|
|
||||||
if (itemStatus === 2) {
|
|
||||||
return '审批通过'
|
|
||||||
}
|
|
||||||
if (itemStatus === 3) {
|
|
||||||
return '审批不通过'
|
|
||||||
}
|
|
||||||
if (itemStatus === 4) {
|
|
||||||
return '已取消'
|
|
||||||
}
|
|
||||||
return '审批中'
|
return '审批中'
|
||||||
|
}
|
||||||
|
if (itemStatus === 2) {
|
||||||
|
return '审批通过'
|
||||||
|
}
|
||||||
|
if (itemStatus === 3) {
|
||||||
|
return '审批不通过'
|
||||||
|
}
|
||||||
|
if (itemStatus === 4) {
|
||||||
|
return '已取消'
|
||||||
|
}
|
||||||
|
return '审批中'
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 子任务 */
|
/** 子任务 */
|
||||||
const taskSignListRef = ref()
|
const taskSignListRef = ref()
|
||||||
const openChildrenTask = (item: any) => {
|
const openChildrenTask = (item: any) => {
|
||||||
taskSignListRef.value.open(item)
|
taskSignListRef.value.open(item)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 查看表单 */
|
/** 查看表单 */
|
||||||
const fApi = ref<ApiAttrs>() // form-create 的 API 操作类
|
const fApi = ref<ApiAttrs>() // form-create 的 API 操作类
|
||||||
const taskForm = ref({
|
const taskForm = ref({
|
||||||
rule: [],
|
rule: [],
|
||||||
option: {},
|
option: {},
|
||||||
value: {}
|
value: {}
|
||||||
}) // 流程任务的表单详情
|
}) // 流程任务的表单详情
|
||||||
const taskFormVisible = ref(false)
|
const taskFormVisible = ref(false)
|
||||||
const handleFormDetail = async (row:any) => {
|
const handleFormDetail = async (row: any) => {
|
||||||
// 设置表单
|
// 设置表单
|
||||||
setConfAndFields2(taskForm, row.formConf, row.formFields, row.formVariables)
|
setConfAndFields2(taskForm, row.formConf, row.formFields, row.formVariables)
|
||||||
// 弹窗打开
|
// 弹窗打开
|
||||||
taskFormVisible.value = true
|
taskFormVisible.value = true
|
||||||
// 隐藏提交、重置按钮，设置禁用只读
|
// 隐藏提交、重置按钮，设置禁用只读
|
||||||
await nextTick()
|
await nextTick()
|
||||||
fApi.value.fapi.btn.show(false)
|
fApi.value.fapi.btn.show(false)
|
||||||
fApi.value?.fapi?.resetBtn.show(false)
|
fApi.value?.fapi?.resetBtn.show(false)
|
||||||
// fApi.value?.fapi?.disabled(true)
|
// fApi.value?.fapi?.disabled(true)
|
||||||
}
|
}
|
||||||
//关闭表单
|
//关闭表单
|
||||||
const closeForm=()=>{
|
const closeForm = () => {
|
||||||
resetConfAndFields(taskForm)
|
resetConfAndFields(taskForm)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 刷新数据 */
|
/** 刷新数据 */
|
||||||
const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
|
const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
|
||||||
const refresh = () => {
|
const refresh = () => {
|
||||||
emit('refresh')
|
emit('refresh')
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang='scss' scoped>
|
<style lang='scss' scoped>
|
||||||
.item_line {
|
.item_line {
|
||||||
.end_item_line {
|
.end_item_line {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.end_item_lines {
|
.end_item_lines {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 4px;
|
left: 4px;
|
||||||
top: 10px;
|
top: 10px;
|
||||||
width: 2px;
|
width: 2px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: #eeeeee;
|
background: #eeeeee;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.start_item_line {
|
.start_item_line {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.start_item_lines {
|
.start_item_lines {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 4px;
|
left: 4px;
|
||||||
top: 10px;
|
top: 10px;
|
||||||
width: 2px;
|
width: 2px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: #eeeeee;
|
background: #eeeeee;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
::v-deep .el-timeline-item__tail {
|
::v-deep .el-timeline-item__tail {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user