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

ปรับ Page ==> ระบบเงินเดือน/ค่าจ้าง >> รายการเลื่อนเงินเดือน ขรก. (กรณีเลื่อนขั้นเงินเดือน รายชื่อสุดท้าย ของหน้าสุดท้าย)

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

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

@ -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);

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

@ -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)