diff --git a/src/views/dashboard/ProcessPortal/components/MyWork.vue b/src/views/dashboard/ProcessPortal/components/MyWork.vue index ce8f914..1dc2505 100644 --- a/src/views/dashboard/ProcessPortal/components/MyWork.vue +++ b/src/views/dashboard/ProcessPortal/components/MyWork.vue @@ -115,7 +115,7 @@ showIndexColumn: true, showTableSetting: false, canResize: false, - scroll: { x: 900 }, + scroll: { x: 1050 }, actionColumn: { dataIndex: 'action', fixed: 'right', width: 120 }, useSearchForm: false, }, diff --git a/src/views/dashboard/ProcessPortal/data/cc.data.ts b/src/views/dashboard/ProcessPortal/data/cc.data.ts index 5ab5e60..4ab5398 100644 --- a/src/views/dashboard/ProcessPortal/data/cc.data.ts +++ b/src/views/dashboard/ProcessPortal/data/cc.data.ts @@ -4,25 +4,32 @@ export const ccColumns: BasicColumn[] = [ { title: '业务标题', align: 'center', + width: 320, dataIndex: 'bpmBizTitle', ellipsis: true, }, { - title: '任务名称', + title: '抄送节点', align: 'center', - width: 260, + width: 160, dataIndex: 'taskName', }, { title: '发起人', align: 'center', - width: 160, + width: 120, dataIndex: 'processApplyUserName', }, { - title: '办理人', + title: '抄送人', align: 'center', - width: 160, - dataIndex: 'taskAssigneeName', + width: 120, + dataIndex: 'ccFromUserName', + }, + { + title: '抄送时间', + align: 'center', + width: 170, + dataIndex: 'ccCreateTime', }, ]; diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue b/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue new file mode 100644 index 0000000..ef22ba1 --- /dev/null +++ b/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/MyReadCcTaskList.vue b/src/views/super/bpm/process/personalOffice/myCcTask/MyReadCcTaskList.vue new file mode 100644 index 0000000..ddc605a --- /dev/null +++ b/src/views/super/bpm/process/personalOffice/myCcTask/MyReadCcTaskList.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/MyUnreadCcTaskList.vue b/src/views/super/bpm/process/personalOffice/myCcTask/MyUnreadCcTaskList.vue new file mode 100644 index 0000000..152a511 --- /dev/null +++ b/src/views/super/bpm/process/personalOffice/myCcTask/MyUnreadCcTaskList.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.api.ts b/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.api.ts index 6bc0332..0a9cd68 100644 --- a/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.api.ts +++ b/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.api.ts @@ -1,7 +1,7 @@ import { defHttp } from '/@/utils/http/axios'; enum Api { - list = '/act/task/taskAllCcHistoryList', + list = '/act/process/extActTaskCc/myList', read = '/act/process/extActTaskCc/read', } diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.data.ts b/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.data.ts index 443e988..1face5f 100644 --- a/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.data.ts +++ b/src/views/super/bpm/process/personalOffice/myCcTask/task.cc.data.ts @@ -7,53 +7,39 @@ export const columns: BasicColumn[] = [ { title: '业务标题', align: 'center', + width: 360, dataIndex: 'bpmBizTitle', ellipsis: true, }, - // { - // title: '流程编号', - // align: 'center', - // dataIndex: 'processDefinitionId', - // }, { title: '流程名称', align: 'center', + width: 180, dataIndex: 'processDefinitionName', }, - // { - // title: '流程实例', - // align: 'center', - // dataIndex: 'processInstanceId', - // }, { - title: '任务名称', + title: '抄送节点', align: 'center', + width: 160, dataIndex: 'taskName', }, { title: '发起人', align: 'center', + width: 120, dataIndex: 'processApplyUserName', }, { - title: '办理人', + title: '抄送人', align: 'center', - dataIndex: 'taskAssigneeName', + width: 120, + dataIndex: 'ccFromUserName', }, { - title: '开始时间', + title: '抄送时间', align: 'center', - dataIndex: 'taskBeginTime', - }, - { - title: '结束时间', - align: 'center', - dataIndex: 'taskEndTime', - }, - { - title: '耗时', - align: 'center', - dataIndex: 'durationStr', + width: 170, + dataIndex: 'ccCreateTime', }, ]; @@ -65,6 +51,7 @@ export const readColumns: BasicColumn[] = [ { title: '已阅时间', align: 'center', + width: 170, dataIndex: 'readTime', }, ]; @@ -88,9 +75,4 @@ export const searchFormSchema: FormSchema[] = [ // field: 'processDefinitionId', // component: 'Input', // }, - // { - // label: '应用ID', - // field: 'lowAppId', - // component: 'Input', - // }, ];