From 5ee1ab2b434ac74f584c0c018765e8c0513b8fd0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 5 Jul 2024 16:56:13 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
 =?UTF-8?q?=20=3D>=20=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20ti?=
 =?UTF-8?q?tle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/views/salaryEmployeeRate.vue        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index 2b710dd65..a2bbab67a 100644
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@@ -107,15 +107,18 @@ const pagination = ref({
   rowsPerPage: formFilter.pageSize,
 });
 const isActive = ref<boolean>(false);
+const groupSalary = ref<string>("");
 
 function fetchDataDetail() {
   http
     .get(config.API.salaryEmployeeChartByid(salaryEmployeeId.value))
     .then((res) => {
       isActive.value = res.data.result.isActive;
+      groupSalary.value = res.data.result.group;
     })
-    .catch((e) => {})
-    .finally(() => {});
+    .catch((e) => {
+      messageError($q, e);
+    });
 }
 
 function fetchSalalyEmployeeRate() {
@@ -222,9 +225,9 @@ watch(
   }
 );
 
-onMounted(() => {
-  fetchSalalyEmployeeRate();
-  fetchDataDetail();
+onMounted(async () => {
+  await fetchDataDetail();
+  await fetchSalalyEmployeeRate();
 });
 </script>
 <template>
@@ -240,7 +243,7 @@ onMounted(() => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราค่าจ้าง
+      อัตราค่าจ้าง กลุ่มที่{{ groupSalary }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">