From 5e7ad2e7f06fb93a9a36069c541dd8eb395301da Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 7 Jul 2025 14:27:41 +0700 Subject: [PATCH] fix rows.value ==> salary --- src/modules/13_salary/components/04_salaryLists/TabMain.vue | 5 ++--- .../13_salary/components/05_salaryListsEmployee/TabMain.vue | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue index b6e40b3fb..107e41543 100644 --- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue +++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue @@ -255,11 +255,12 @@ function fetchDataQuota(id: string) { */ async function fetchDataPeriod(id: string) { showLoader(); + let formData = { page: formFilter.page !== 1 && formFilter.page === maxPage.value && - rows.value.length === 0 + rows.value.length === 1 ? (formFilter.page - 1).toString() : formFilter.page.toString(), pageSize: formFilter.pageSize.toString(), @@ -280,8 +281,6 @@ async function fetchDataPeriod(id: string) { rows.value = res.data.result.data; total.value = res.data.result.total; maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); - console.log("rows.value", rows.value.length); - console.log("maxPage.value", maxPage.value); }) .catch((err) => { messageError($q, err); diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue index 9e808a97f..2ad3dcaa1 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue @@ -252,7 +252,7 @@ async function fetchDataPeriod(id: string) { page: formFilter.page !== 1 && formFilter.page === maxPage.value && - rows.value.length === 0 + rows.value.length === 1 ? (formFilter.page - 1).toString() : formFilter.page.toString(), pageSize: formFilter.pageSize.toString(),