From 621edfd144da4ceb42f44a6e1be780ecc1fa23b4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 5 Mar 2024 14:32:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/views/salaryLists.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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