hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix rows.value ==> salary

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-07-07 14:27:41 +07:00
parent ad986efba9
commit 5e7ad2e7f0
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/13_salary/components/04_salaryLists/TabMain.vue
View file

@ -255,11 +255,12 @@ function fetchDataQuota(id: string) {
*/ */
async function fetchDataPeriod(id: string) { async function fetchDataPeriod(id: string) {
showLoader(); showLoader();
let formData = { let formData = {
page: page:
formFilter.page !== 1 && formFilter.page !== 1 &&
formFilter.page === maxPage.value && formFilter.page === maxPage.value &&
rows.value.length === 0 rows.value.length === 1
? (formFilter.page - 1).toString() ? (formFilter.page - 1).toString()
: formFilter.page.toString(), : formFilter.page.toString(),
pageSize: formFilter.pageSize.toString(), pageSize: formFilter.pageSize.toString(),
@ -280,8 +281,6 @@ async function fetchDataPeriod(id: string) {
rows.value = res.data.result.data; rows.value = res.data.result.data;
total.value = res.data.result.total; total.value = res.data.result.total;
maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); 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) => { .catch((err) => {
messageError($q, err); messageError($q, err);

2
src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
View file

@ -252,7 +252,7 @@ async function fetchDataPeriod(id: string) {
page: page:
formFilter.page !== 1 && formFilter.page !== 1 &&
formFilter.page === maxPage.value && formFilter.page === maxPage.value &&
rows.value.length === 0 rows.value.length === 1
? (formFilter.page - 1).toString() ? (formFilter.page - 1).toString()
: formFilter.page.toString(), : formFilter.page.toString(),
pageSize: formFilter.pageSize.toString(), pageSize: formFilter.pageSize.toString(),