diff --git a/src/api/final/index.ts b/src/api/final/index.ts index 857eeb2..d5eae04 100644 --- a/src/api/final/index.ts +++ b/src/api/final/index.ts @@ -74,10 +74,10 @@ export async function getRepeatList(params: FinalParam) { params, }) - const { data: { records, totalPage, totalCount } } = res + const { data: { records, total, pages } } = res return { - pageCount: 3, + pageCount: pages, data: records, - totalCount: 20, + totalCount: total, } } diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index bc8a4c5..dd1793a 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -441,7 +441,7 @@ async function query(page: number, pageSize: number, filterId?: any) { tableData.value = data total.value = totalCount pagination.page = page - pagination.pageCount = pageCount + pagination.pageCount = Math.ceil(totalCount / pageSize) loading.value = false } diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 23d9c49..5c7b2c4 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -165,6 +165,8 @@ function approvalHandler(items?: any) { return } + console.log(processItems) + const list: any = [] processItems.forEach((item) => { list.push({ diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue index 32c16c8..e21576f 100644 --- a/src/views/task/modal/BatchModal.vue +++ b/src/views/task/modal/BatchModal.vue @@ -310,6 +310,10 @@ function reset() { layout() } +function onChange() { + reload() +} + async function refreshHandler() { reset() if (!taskId.value) @@ -397,11 +401,11 @@ defineExpose({
- {{ TASK_STATUS_OBJ[taskDetailInfo?.states] }} + {{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }}
{{ taskDetailInfo?.ocrPicture?.createTime }} @@ -418,7 +422,7 @@ defineExpose({
- +
{{ timeLabel || '时间模式' }}