Merge branch 'dev-bug-0908'

This commit is contained in:
zhanchao 2026-09-14 16:50:26 +08:00
commit f91be96986

View File

@ -176,7 +176,9 @@ const filtered = ref(false);
const filterVisible = ref(false);
const filterData = ref({ eventStatus: 'processing' });
const followUpType = ref('person') // person team
const { total, list, loading, page, pages, pageSize, changePage } = usePageList(getList)
const { total, list, loading, page, pages, pageSize, changePage } = usePageList(getList, {
pageSize: 20
})
let queryVersion = 0;
const certStatus = computed(() => doctorInfo.value?.verifyStatus ? certConfig[doctorInfo.value.verifyStatus] : null)
@ -279,8 +281,8 @@ async function getList() {
corpId: account.value.corpId,
startDate: filterData.value.startDate,
endDate: filterData.value.endDate,
page: page.value,
pageSize: 4
page: requestPage,
pageSize: pageSize.value
}
if (followUpType.value === 'person') {
data.executorUserId = doctorInfo.value.userid;
@ -305,7 +307,13 @@ async function getList() {
fileList: Array.isArray(i.fileList) ? i.fileList.filter(i => i && i.file && i.file.name) : [],
ownTeam: followUpType.value === 'team'
})) : [];
list.value = requestPage === 1 ? arr : [...list.value, ...arr];
if (requestPage === 1) {
list.value = arr;
} else {
const existingIds = new Set(list.value.map(item => item._id).filter(Boolean));
const newItems = arr.filter(item => !item._id || !existingIds.has(item._id));
list.value = [...list.value, ...newItems];
}
total.value = res && res.total > 0 ? res.total : 0;
pages.value = res && res.pages > 0 ? res.pages : 0;
if (!res || !res.success) {