diff --git a/src/views/dashboard/ProcessPortal/components/MyWork.vue b/src/views/dashboard/ProcessPortal/components/MyWork.vue index 2e76917..ce8f914 100644 --- a/src/views/dashboard/ProcessPortal/components/MyWork.vue +++ b/src/views/dashboard/ProcessPortal/components/MyWork.vue @@ -8,7 +8,7 @@ 待办 {{ todoTotal }} -
我的抄送
+
待阅
@@ -110,7 +110,7 @@ designScope: 'process-portal-cc', pagination: true, tableProps: { - api: ccList, + api: (params) => ccList({ ...params, isRead: 0 }), columns: ccColumns, showIndexColumn: true, showTableSetting: false, @@ -120,7 +120,7 @@ useSearchForm: false, }, }); - const [registerCcTable] = ccContext; + const [registerCcTable, { reload: reloadCc }] = ccContext; onMounted(() => { fetchTodoTotal(); @@ -138,7 +138,11 @@ async function handleRefresh() { refreshing.value = true; try { - reloadTodo(); + if (activeTab.value === 'todo') { + reloadTodo(); + } else { + reloadCc(); + } await fetchTodoTotal(); emit('refresh'); } finally { @@ -150,7 +154,7 @@ if (activeTab.value === 'todo') { router.push('/task/myTodoTaskInfo'); } else { - router.push('/task/myCcTaskListInfo'); + router.push('/task/myUnreadCcTaskList'); } } diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/MyCcTaskList.vue b/src/views/super/bpm/process/personalOffice/myCcTask/MyCcTaskList.vue index 03fbf5c..d0fd51f 100644 --- a/src/views/super/bpm/process/personalOffice/myCcTask/MyCcTaskList.vue +++ b/src/views/super/bpm/process/personalOffice/myCcTask/MyCcTaskList.vue @@ -1,82 +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 26392cc..6bc0332 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 @@ -2,6 +2,7 @@ import { defHttp } from '/@/utils/http/axios'; enum Api { list = '/act/task/taskAllCcHistoryList', + read = '/act/process/extActTaskCc/read', } /** @@ -9,3 +10,9 @@ enum Api { * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 标记已阅 + * @param id 抄送记录ID + */ +export const markRead = (id) => defHttp.put({ url: Api.read, params: { id } }); 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 871abc3..443e988 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 @@ -57,6 +57,18 @@ export const columns: BasicColumn[] = [ }, ]; +/** + * 已阅列表在原抄送列表基础上补充已阅时间。 + */ +export const readColumns: BasicColumn[] = [ + ...columns, + { + title: '已阅时间', + align: 'center', + dataIndex: 'readTime', + }, +]; + /** * 查询条件 */