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

Merge branch 'nice_dev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-03-05 14:32:23 +07:00
commit 4d58aea10a
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
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) {