diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue index a1266e979..b6e40b3fb 100644 --- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue +++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue @@ -255,9 +255,13 @@ function fetchDataQuota(id: string) { */ async function fetchDataPeriod(id: string) { showLoader(); - rows.value = []; let formData = { - page: formFilter.page.toString(), + page: + formFilter.page !== 1 && + formFilter.page === maxPage.value && + rows.value.length === 0 + ? (formFilter.page - 1).toString() + : formFilter.page.toString(), pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword.trim(), type: store.tabType, @@ -268,6 +272,7 @@ async function fetchDataPeriod(id: string) { ? "1" : "0", }; + rows.value = []; await http .put(config.API.salaryListPeriodORG(id), formData) @@ -275,6 +280,8 @@ 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 441c724c2..9e808a97f 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue @@ -248,9 +248,13 @@ function fetchDataQuota(id: string) { */ async function fetchDataPeriod(id: string) { showLoader(); - rows.value = []; let formData = { - page: formFilter.page.toString(), + page: + formFilter.page !== 1 && + formFilter.page === maxPage.value && + rows.value.length === 0 + ? (formFilter.page - 1).toString() + : formFilter.page.toString(), pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, type: store.tabType, @@ -261,6 +265,7 @@ async function fetchDataPeriod(id: string) { ? "1" : "0", }; + rows.value = []; await http .put(config.API.salaryListPeriodORGEmp(id), formData)