diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue index fc63668..5369b0c 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue @@ -15,8 +15,9 @@ import { list as queryApprovalOpinionList } from '/@/views/taskApprovalOpinion/TaskApprovalOpinion.api'; const approvalHistoryColumns: BasicColumn[] = [ - { title: '办理时间', dataIndex: 'opTime', width: 170, align: 'center' }, { title: '节点名称', dataIndex: 'taskName', width: 160, align: 'center' }, + { title: '开始时间', dataIndex: 'startTime', width: 170, align: 'center' }, + { title: '办理时间', dataIndex: 'opTime', width: 170, align: 'center' }, { title: '办理人', dataIndex: 'opUserName', @@ -25,7 +26,7 @@ customRender: ({ record }) => record.opUserName || record.opUserId || '-', }, { title: '操作类型', dataIndex: 'actionType', width: 120, align: 'center' }, - { title: '操作结果', dataIndex: 'actionResult', width: 180, align: 'center' }, + // { title: '操作结果', dataIndex: 'actionResult', width: 180, align: 'center' }, { title: '审批意见', dataIndex: 'opinion', align: 'left' }, ]; @@ -56,7 +57,7 @@ pagination: { pageSize: 10, }, - scroll: { x: 980 }, + scroll: { x: 1150 }, }); // 按流程实例查询审批历史,只查 task_approval_opinion 表 @@ -71,8 +72,8 @@ return queryApprovalOpinionList({ ...params, processInstId, - column: 'opTime', - order: 'desc', + column: 'startTime', + order: 'asc', }); } diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskTraceContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskTraceContent.vue index 7a728d4..88323f7 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskTraceContent.vue +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskTraceContent.vue @@ -1,15 +1,13 @@ @@ -18,19 +16,19 @@ * 历史任务跟踪-查看历史节点-流程图 */ import BpmGraphic from '/@/views/super/bpm/process/components/BpmGraphic.vue'; - import { BasicTable } from '/@/components/Table'; - import { taskTraceColumns } from '../task.handle.data'; - import { taskTraceList } from '../task.handle.api'; - import { useListPage } from '/@/hooks/system/useListPage'; - import JEllipsis from '/@/components/Form/src/jeecg/components/JEllipsis.vue'; + // import { BasicTable } from '/@/components/Table'; + // import { taskTraceColumns } from '../task.handle.data'; + // import { taskTraceList } from '../task.handle.api'; + // import { useListPage } from '/@/hooks/system/useListPage'; + // import JEllipsis from '/@/components/Form/src/jeecg/components/JEllipsis.vue'; import { ref } from 'vue'; export default { name: 'TaskTraceContent', components: { BpmGraphic, - BasicTable, - JEllipsis, + // BasicTable, + // JEllipsis, }, props: { formData: { @@ -39,55 +37,58 @@ }, }, setup(props) { - console.log('进入TaskTraceContent>>'); - const { tableContext } = useListPage({ - designScope: 'task-trace-content', - pagination: true, - tableProps: { - title: '', - api: taskTraceList, - columns: taskTraceColumns, - showIndexColumn: true, - showTableSetting: false, - canResize: false, - showActionColumn: false, - useSearchForm: false, - beforeFetch: (params) => { - return addQueryParams(params); - }, - }, - }); - const [registerTable] = tableContext; - - function addQueryParams(params) { - params.processInstanceId = props.formData.procInsId; - return params; - } + // const { tableContext } = useListPage({ + // designScope: 'task-trace-content', + // pagination: true, + // tableProps: { + // title: '', + // api: taskTraceList, + // columns: taskTraceColumns, + // showIndexColumn: true, + // showTableSetting: false, + // canResize: false, + // showActionColumn: false, + // useSearchForm: false, + // beforeFetch: (params) => { + // return addQueryParams(params); + // }, + // }, + // }); + // const [registerTable] = tableContext; + // + // function addQueryParams(params) { + // params.processInstanceId = props.formData.procInsId; + // return params; + // } const taskList = ref([]); function getTaskList(arr) { - console.log('aaa', arr); taskList.value = arr; } - function getNodeInfo(record) { - let arr = taskList.value; - if (arr && arr.length > 0) { - for (let item of arr) { - if (item.id == record.id) { - return item.remarks; - } - } - } - return ''; - } + // function getNodeInfo(record) { + // let arr = taskList.value; + // if (arr && arr.length > 0) { + // for (let item of arr) { + // if (item.id == record.id) { + // return item.remarks; + // } + // } + // } + // return ''; + // } return { - registerTable, + // registerTable, getTaskList, - getNodeInfo, + // getNodeInfo, }; }, }; - + diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue index 189c3f1..d12d0b3 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue @@ -25,7 +25,7 @@ - + @@ -47,7 +47,7 @@ */ import { BasicModal, useModalInner } from '/@/components/Modal'; import { ref , nextTick , computed, watch } from 'vue'; - import { UserOutlined, PartitionOutlined, FileTextOutlined } from '@ant-design/icons-vue'; + import { UserOutlined, PartitionOutlined, FileTextOutlined, HistoryOutlined } from '@ant-design/icons-vue'; import TaskHandleInnerContent from '../content/TaskHandleInnerContent.vue'; import TaskTraceContent from '../content/TaskTraceContent.vue'; import BpmDynamicForm from '/@/views/super/bpm/process/components/BpmDynamicForm.vue'; @@ -60,6 +60,7 @@ UserOutlined, FileTextOutlined, PartitionOutlined, + HistoryOutlined, TaskHandleInnerContent, TaskTraceContent, BpmDynamicForm,