From d542f8f7c0ec2d94d58e92d8b6b1a073ddcbf69a Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 17 Jan 2024 15:44:41 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=A7=E0=B8=88=E0=B9=80?=
 =?UTF-8?q?=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

แก้ไขถ้าว่างให้ "-"
---
 src/modules/09_leave/stores/LeaveStore.ts | 25 +++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index a3aedc95f..a1639e442 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -43,23 +43,30 @@ export const useLeavelistDataStore = defineStore("leave", () => {
   async function fetchListLeave(data: ListLeave[]) {
     let datalist = data.map((e: ListLeave) => ({
       id: e.id,
-      leaveTypeName: e.leaveTypeName,
-      leaveTypeId: e.leaveTypeId,
-      citizenId: e.citizenId ?? "3120101734950",
-      fullName: e.fullName,
-      agency: e.agency ?? "สำนักงานการเจ้าหน้าที่",
-      org: e.org ?? "กองบริหารทั่วไป/ฝ่ายการเจ้าหน้าที่",
-      position: e.position ?? "นักทรัพยากรบุคคล",
-      level: e.level ?? "ชำนาญการ",
+      leaveTypeName: e.leaveTypeName ?? "-",
+      leaveTypeId: e.leaveTypeId ?? "-",
+      citizenId: e.citizenId ?? "-",
+      fullName:
+        e.fullName !== undefined && e.fullName !== null && e.fullName !== ""
+          ? e.fullName
+          : "-",
+      agency:
+        e.agency !== undefined && e.agency !== null && e.agency !== ""
+          ? e.agency
+          : "-",
+      org: e.org !== undefined && e.org !== null && e.org !== "" ? e.org : "-",
+      position: e.position ?? "-",
+      level: e.level ?? "-",
       dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave),
       dateLeave:
         e.dateSendLeave &&
         date2Thai(e.dateSendLeave) + "-" + date2Thai(e.dateSendLeave),
       status: e.status && convertSatatus(e.status),
     }));
-
+    console.log(datalist);
     mainData.value = datalist;
     rows.value = mainData.value;
+    console.log(mainData.value);
   }
 
   /**