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 2024-03-05 15:01:01 +07:00
commit c867e8c569
4 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/13_salary/components/SalaryLists/TabMain.vue
View file

@ -185,7 +185,7 @@ const maxPage = ref<number>(1);
* @param id กลุ่ม
*/
function fetchDataQuota(id: string) {
showLoader();
// showLoader();
http
.get(config.API.salaryListPeriodQuota(id))
.then((res) => {
@ -205,10 +205,10 @@ function fetchDataQuota(id: string) {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
// .finally(() => {
// hideLoader();
// });
}
/**

15
src/modules/13_salary/views/salaryLists.vue
View file

@ -77,9 +77,9 @@ function getRound() {
store.roundMainCode = roundFilter.value.shortCode;
getSnap(roundFilter.value.shortCode);
getAgency(roundFilter.value.revisionId);
getAgencyPosition(roundFilter.value.revisionId);
await getSnap(roundFilter.value.shortCode);
await getAgency(roundFilter.value.revisionId);
await getAgencyPosition(roundFilter.value.revisionId);
// if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
// await fetchSalalyPeriod(
@ -149,7 +149,7 @@ async function getAgency(id: string) {
id: x.id,
name: x.orgRootName,
}));
agencyFilter.value = store.rootId;
// agencyFilter.value = store.rootId;
})
.catch((err) => {
messageError($q, err);
@ -165,11 +165,12 @@ async function getAgencyPosition(id: string) {
await http
.get(config.API.keycloakPositionByid(id))
.then(async (res) => {
const data = res.data.result;
const data = await res.data.result;
const position = agencyOptions.value?.find(
(e: DataOption) => e.id === data.rootId
);
agencyFilter.value = position ? position.id : "";
if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
@ -217,7 +218,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
messageError($q, err);
})
.finally(() => {
hideLoader();
setTimeout(() => {
hideLoader();
}, 800);
});
}