From a746e05a86fe346795ae81b590c515a438787bb7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Mar 2025 13:48:02 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/DialogInfoMain.vue   | 52 ++++++++++---------
 .../13_salary/views/04_salaryLists.vue        |  6 ++-
 .../views/05_salaryListsEmployee.vue          |  8 ++-
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/modules/13_salary/components/DialogInfoMain.vue b/src/modules/13_salary/components/DialogInfoMain.vue
index 8387c42ab..5e1b35128 100644
--- a/src/modules/13_salary/components/DialogInfoMain.vue
+++ b/src/modules/13_salary/components/DialogInfoMain.vue
@@ -184,34 +184,36 @@ watch(
                 </div>
               </q-card-section>
 
-              <InfoSalary
-                v-if="type === 'posSalary'"
-                v-model:profileId="profileId"
-                :employeeClass="employeeClass"
-              />
-              <InfoDiscipline
-                v-if="type === 'discipline'"
-                v-model:profileId="profileId"
-                :employeeClass="employeeClass"
-              />
+              <q-scroll-area style="height: 55vh; max-width: 100%">
+                <InfoSalary
+                  v-if="type === 'posSalary'"
+                  v-model:profileId="profileId"
+                  :employeeClass="employeeClass"
+                />
+                <InfoDiscipline
+                  v-if="type === 'discipline'"
+                  v-model:profileId="profileId"
+                  :employeeClass="employeeClass"
+                />
 
-              <InfoLeave
-                v-if="type === 'leave'"
-                v-model:profileId="profileId"
-                :employeeClass="employeeClass"
-              />
+                <InfoLeave
+                  v-if="type === 'leave'"
+                  v-model:profileId="profileId"
+                  :employeeClass="employeeClass"
+                />
 
-              <InfoAssessments
-                v-if="type === 'assessments'"
-                v-model:profileId="profileId"
-                :employeeClass="employeeClass"
-              />
+                <InfoAssessments
+                  v-if="type === 'assessments'"
+                  v-model:profileId="profileId"
+                  :employeeClass="employeeClass"
+                />
 
-              <InfoInsignia
-                v-if="type === 'insignia'"
-                v-model:profileId="profileId"
-                :employeeClass="employeeClass"
-              />
+                <InfoInsignia
+                  v-if="type === 'insignia'"
+                  v-model:profileId="profileId"
+                  :employeeClass="employeeClass"
+                />
+              </q-scroll-area>
             </q-card>
           </div>
         </div>
diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index d37523836..e27d51208 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -121,11 +121,12 @@ async function getRound() {
         roundFilter.value = "ไม่มีข้อมูล";
         snapFilter.value = "ไม่มีข้อมูล";
         agencyFilter.value = "ไม่มีข้อมูล";
-        hideLoader();
       }
     })
     .catch((e) => {
       messageError($q, e);
+    })
+    .finally(() => {
       hideLoader();
     });
 }
@@ -276,6 +277,9 @@ async function fetchSalalyPeriod(
       })
       .catch((err) => {
         messageError($q, err);
+      })
+      .finally(() => {
+        hideLoader();
       });
   }
 }
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index d74831324..e494b93b3 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -120,11 +120,12 @@ async function getRound() {
         roundFilter.value = "ไม่มีข้อมูล";
         snapFilter.value = "ไม่มีข้อมูล";
         agencyFilter.value = "ไม่มีข้อมูล";
-        hideLoader();
       }
     })
     .catch((e) => {
       messageError($q, e);
+    })
+    .finally(() => {
       hideLoader();
     });
 }
@@ -247,7 +248,7 @@ async function fetchSalalyPeriod(
     const body = {
       rootId: rootId,
       salaryPeriodId: periodId,
-      snapshot: snap,
+      snapshot: snap, 
     };
 
     await http
@@ -260,6 +261,9 @@ async function fetchSalalyPeriod(
       })
       .catch((err) => {
         messageError($q, err);
+      })
+      .finally(() => {
+        hideLoader();
       });
   }
 }