diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index f24faff..d3a551e 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -11,6 +11,7 @@ import { debounce } from 'lodash-es' import { audit } from '@/api/task/task' import NotPassed from '@/components/Approval/NotPassed.vue' +import { formatToDateHMS } from '@/utils/dateUtil' import { off, on } from '@/utils/domUtils' import ConfrimModal from "./ConfrimModal.vue" @@ -37,7 +38,7 @@ const timeLabel = computed(() => { return item?.label }) -const viewMode = ref('masonry') +const viewMode = ref('horizontalVersion') const viewLabel = computed(() => { const item = viewOptions.find((option) => { @@ -134,6 +135,7 @@ async function loadMore() { } onUpdated(() => { + console.log('onUpdated', onUpdated) layout() }) @@ -242,6 +244,7 @@ async function showModal() { pagination.pageNo = 1 const list = await featchList() listData.value = list + layout() } async function onChange() { @@ -265,8 +268,8 @@ async function commit() { layout() } } - function remove() { - if ( !selectIds.value|| selectIds.value.length === 0) { +function remove() { + if (!selectIds.value || selectIds.value.length === 0) { message.error('至少选中一个') return } @@ -313,9 +316,8 @@ function rejectHandler() { function reset() { batch.value = false; - pagination.pageNo = 0; + pagination.pageNo = 1; pagination.pageSize = 20; - listData.value.length = 0; selectedApproveItems.value.length = 0; loading = false; canloadMore = true; @@ -386,9 +388,11 @@ function doAudit(param: any) { function reloadList() { refreshHandler() } -function refreshHandler() { +async function refreshHandler() { reset() - featchList() + const list = await featchList() + listData.value = list + layout() } @@ -413,13 +417,13 @@ function refreshHandler() {