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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-07-07 15:18:57 +07:00
commit b2635d0afb
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/08_registryEmployee/views/Main.vue
View file

@ -238,6 +238,12 @@ async function fetchList() {
function onClickDelete(id: string) {
dialogRemove($q, async () => {
showLoader();
queryParams.page =
queryParams.page !== 1 &&
queryParams.page === maxPage.value &&
rows.value.length === 1
? queryParams.page - 1
: queryParams.page;
await http
.delete(config.API.registryNew("-employee") + `/${id}`)
.then(async () => {

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

@ -255,9 +255,14 @@ 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 === 1
? (formFilter.page - 1).toString()
: formFilter.page.toString(),
pageSize: formFilter.pageSize.toString(),
keyword: formFilter.keyword.trim(),
type: store.tabType,
@ -268,6 +273,7 @@ async function fetchDataPeriod(id: string) {
? "1"
: "0",
};
rows.value = [];
await http
.put(config.API.salaryListPeriodORG(id), formData)

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 === 1
? (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)