From 02156fe6da3d4d6e4cdef68ac1c83745b64d20ad Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 14 Nov 2023 13:33:56 +0700
Subject: [PATCH] no message

---
 src/modules/09_leave/components/2_Leave/DetailLeave.vue       | 4 +++-
 .../09_leave/components/2_Leave/formDetail/formMain.vue       | 2 +-
 src/modules/09_leave/interface/request/leave.ts               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index efacb36a9..532639e0c 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -111,7 +111,9 @@ function fetchDetailLeave(paramsId: string) {
   console.log(data);
   data.map((e: any) => {
     formData.id = e.id;
-    formData.leaveTypeName = e.leaveTypeName;
+    formData.leaveTypeName = e.leaveTypeName
+      ? e.leaveTypeName
+      : stores.convertLeave(e.leaveTypeId);
     formData.leaveTypeId = e.leaveTypeId;
     formData.fullname = e.fullname;
     formData.dateSendLeave = e.dateSendLeave && date2Thai(e.dateSendLeave);
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue b/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
index 4e5c76090..d93bb7124 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
@@ -16,7 +16,7 @@ console.log(props);
       </div>
       <div class="row">
         <div class="col-4 text-grey-8">เรื่อง</div>
-        <div class="col">{{ props.data.leaveTypeId }}</div>
+        <div class="col">{{ props.data.leaveTypeName }}</div>
       </div>
       <div class="row">
         <div class="col-4 text-grey-8">เรียน</div>
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts
index a64fc3285..86a3b53dc 100644
--- a/src/modules/09_leave/interface/request/leave.ts
+++ b/src/modules/09_leave/interface/request/leave.ts
@@ -7,7 +7,7 @@ interface ListsData {
 }
 interface FremData {
   id: string; //Id การยื่นขอลา
-  leaveTypeName: string; //Name ประเภทการลา
+  leaveTypeName: string | null; //Name ประเภทการลา
   leaveTypeId: string | null; //Id ประเภทการลา
   fullname: string; //คำนำหน้า ชื่อ นามสกุล คนขอลา
   dateSendLeave: Date | null; //วันที่ยื่นใบลา