diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 0420f8ce9..48e615c96 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -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) {