From 04385785f07c6dca6d62231a0ac8804aa9227db6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 18:14:44 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=20=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B9=80=E0=B8=87=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=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

---
 src/modules/13_salary/views/salaryEmployeeRate.vue |  9 ++++++---
 src/modules/13_salary/views/salaryRate.vue         | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index 2b710dd65..5b6631117 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 group = ref<string>("");
 
 function fetchDataDetail() {
   http
     .get(config.API.salaryEmployeeChartByid(salaryEmployeeId.value))
     .then((res) => {
       isActive.value = res.data.result.isActive;
+      group.value = `กลุ่มที่ ${res.data.result.group}`;
     })
-    .catch((e) => {})
-    .finally(() => {});
+    .catch((e) => {
+      messageError($q, e);
+    });
 }
 
 function fetchSalalyEmployeeRate() {
@@ -240,7 +243,7 @@ onMounted(() => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราค่าจ้าง
+      อัตราค่าจ้าง {{ group }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index f83272217..eeaf18461 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -34,6 +34,8 @@ const {
 } = useCounterMixin();
 
 const isActive = ref<boolean>(false);
+const posType = ref<string>("");
+
 const salaryId = ref<string>(route.params.id.toString());
 
 /** modalDialog*/
@@ -209,9 +211,11 @@ function fetchList() {
     .get(config.API.salaryChartByid(salaryId.value))
     .then((res) => {
       isActive.value = res.data.result.isActive;
+      posType.value = `${res.data.result.posTypeName}(${res.data.result.posLevelName})`;
     })
-    .catch((e) => {})
-    .finally(() => {});
+    .catch((e) => {
+      messageError($q, e);
+    });
 }
 onMounted(async () => {
   await fetchList();
@@ -236,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือน
+      อัตราเงินเดือน {{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">