diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue index 0a2057dd..dcf3bcc4 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue @@ -33,12 +33,6 @@ const bpmnControlForm = ref({ prefix: 'flowable' }) const activityList = ref([]) // 任务列表 -// const bpmnXML = computed(() => { // TODO 芋艿:不晓得为啊哈不能这么搞 -// if (!props.processInstance || !props.processInstance.processDefinition) { -// return -// } -// return DefinitionApi.getProcessDefinitionBpmnXML(props.processInstance.processDefinition.id) -// }) /** 初始化 */ onMounted(async () => { diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue index 9876d5d3..e20872db 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue @@ -3,7 +3,7 @@ - +
- - 子任务 + 子任务

@@ -92,7 +91,7 @@ const getTimelineItemIcon = (item) => { } /** 获得任务对应的颜色 */ -const getTimelineItemType = (item) => { +const getTimelineItemType = (item: any) => { if (item.status === 1) { return 'primary' } diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index 800ff2f3..a8c5f2a5 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -302,9 +302,6 @@ const loadRunningTask = (tasks) => { loadRunningTask(task.children) } // 2.1 只有待处理才需要 - // if (task.status !== 1 && task.status !== 6) { - // return - // } if (task.status !== 1 && task.status !== 6) { return } diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index d9b32803..7d8f905b 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -75,16 +75,17 @@ prop="endTime" width="180" /> + + + + - - -