From b1fd996cb82d07f4607c6bf10b82d19950094415 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 5 Jun 2025 15:38:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=8C=E0=B8=A1=20=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/05_Leave/DetailLeaveReject.vue | 21 ++++++++++++-------
 .../05_Leave/formDetail/formSpouse.vue        |  2 +-
 .../05_Leave/formDetail/formStudy.vue         |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
index 163d8b63c..ad6fdf58a 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
@@ -250,9 +250,9 @@ async function fetchDetailLeave(paramsId: string) {
         data.leaveLastStart && date2Thai(data.leaveLastEnd);
       formData.leaveTotal = data.leaveTotal;
       formData.leavebirthDate =
-        data.leavebirthDate && date2Thai(data.leavebirthDate);
+        data.leaveBirthDate && date2Thai(data.leaveBirthDate);
       formData.leavegovernmentDate =
-        data.leavegovernmentDate && date2Thai(data.leavegovernmentDate);
+        data.leaveGovernmentDate && date2Thai(data.leaveGovernmentDate);
       formData.leaveSalary = data.leaveSalary;
       formData.leaveSalaryText = data.leaveSalaryText;
       formData.leaveTypeDay =
@@ -323,7 +323,7 @@ async function fectOptionType() {
     .get(config.API.leaveType())
     .then((res) => {
       leaveType.value = res.data.result;
-      checkLeaveType(formData.leaveTypeId, formData.leaveTypeName);
+      checkLeaveType(formData.leaveTypeId, formData.leaveSubTypeName);
     })
     .catch((err) => {
       messageError($q, err);
@@ -348,15 +348,22 @@ function checkLeaveType(leaveTypeId: string, leaveTypeName: string) {
       checkForm.value = "FormChildbirth";
     } else if (type === "LV-005") {
       checkForm.value = "FormHoliday";
-    } else if (type === "LV-006") {
+    } else if (type === "LV-006" && formData.leaveSubTypeName === "ลาอุปสมบท") {
       checkForm.value = "FormUpasom";
-    } else if (type === "LV-006" && leaveTypeName === "พิธีฮัจญ์ฯ") {
+    } else if (
+      type === "LV-006" &&
+      formData.leaveSubTypeName === "ลาประกอบพิธีฮัจญ์"
+    ) {
       checkForm.value = "FormHajj";
     } else if (type === "LV-007") {
       checkForm.value = "FormCheckSelect";
-    } else if (type === "LV-008" && leaveTypeName === "ลาไปศีกษา") {
+    } else if (type === "LV-008" && formData.leaveSubTypeName === "ศึกษาต่อ") {
       checkForm.value = "FormStudy";
-    } else if (type === "LV-008") {
+    } else if (
+      (type === "LV-008" && formData.leaveSubTypeName === "ฝึกอบรม") ||
+      (type === "LV-008" && formData.leaveSubTypeName === "ปฎิบัติการวิจัย") ||
+      (type === "LV-008" && formData.leaveSubTypeName === "ดูงาน")
+    ) {
       checkForm.value = "FormLeaveToTraining";
     } else if (type === "LV-009") {
       checkForm.value = "FormLeaveToWorkInternational";
diff --git a/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue b/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
index 1dd6fb2eb..bf7596e93 100644
--- a/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
+++ b/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
@@ -80,7 +80,7 @@ function convertDateToEng(dataThia: string) {
       <div class="row">
         <div class="col text-grey-8">เงินเดือนปัจจุบัน</div>
         <div class="col">
-          {{ props.data.leaveSalary }} ({{ props.data.leaveSalaryText }})
+          {{ props.data.leaveSalary.toLocaleString() }} ({{ props.data.leaveSalaryText }})
         </div>
       </div>
       <div class="row">
diff --git a/src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue b/src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
index de7716ce0..f399f3182 100644
--- a/src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
+++ b/src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
@@ -73,7 +73,7 @@ function convertDateToEng(dataThia: string) {
       <div class="row">
         <div class="col text-grey-8">เงินเดือนปัจจุบัน</div>
         <div class="col">
-          {{ props.data.leaveSalary }} ({{ props.data.leaveSalaryText }})
+          {{ props.data.leaveSalary.toLocaleString() }} ({{ props.data.leaveSalaryText }})
         </div>
       </div>
       <div class="row">