diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index 66d90986..4d3f8553 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -639,7 +639,7 @@ async function fetchImageList(id: string, selectedName?: string) { } async function fetchUserList() { - await userStore.fetchList({ + const ret = await userStore.fetchList({ includeBranch: true, pageSize: pageSize.value, page: currentPage.value, @@ -652,6 +652,18 @@ async function fetchUserList() { ? 'ACTIVE' : 'INACTIVE', }); + + if (ret) { + if ($q.screen.xs) { + if (!userData.value) { + userData.value = ret; + } else { + userData.value?.result.push(...ret.result); + } + } else { + userData.value = ret; + } + } } function noPersonnel() { @@ -1066,64 +1078,79 @@ watch( -