แก้ UI รายการลา

src/modules/09_leave/stores/LeaveStore.ts

@@ -48,6 +48,9 @@ export const useLeavelistDataStore = defineStore("leave", () => {
       profileType: e.profileType ?? "-",
       leaveTypeId: e.leaveTypeId ?? "-",
       citizenId: e.citizenId ?? "-",
+      leaveSubTypeName: e.leaveSubTypeName,
+      leaveRange: e.leaveRange ?? "-",
+      leaveRangeEnd: e.leaveRangeEnd ?? "-",
       fullName:
         e.fullName !== undefined && e.fullName !== null && e.fullName !== ""
           ? e.fullName
@@ -65,7 +68,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
         e.leaveStartDate && e.leaveEndDate
           ? e.leaveStartDate === e.leaveEndDate
             ? date2Thai(e.leaveEndDate)
-            : date2Thai(e.leaveStartDate) + " - " + date2Thai(e.leaveEndDate)
+            : `${date2Thai(e.leaveStartDate)}${e.leaveRange !== 'ALL' ? ` (${converstType(e.leaveRange)})`:''} - ${date2Thai(e.leaveEndDate)}${e.leaveRangeEnd !== 'ALL' ? ` (${converstType(e.leaveRangeEnd)})`:''}`
           : "-",
       status: e.status && convertSatatus(e.status),
     }));
@@ -73,6 +76,17 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     rows.value = mainData.value;
   }
 
+  function converstType(val: string) {
+    switch (val) {
+      case "ALL":
+        return "";
+      case "MORNING":
+        return "ครึ่งวันเช้า";
+      case "AFTERNOON":
+        return "ครึ่งวันบ่าย";
+    }
+  }
+
   /**
    * ฟังก์ชั่น fetchListLeave
    * @param data รับข้อมูลจาก Page
@@ -82,6 +96,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
       id: e.id,
       profileType: e.profileType ?? "-",
       leaveTypeName: e.leaveTypeName,
+      leaveSubTypeName: e.leaveSubTypeName,
       leaveTypeId: e.leaveTypeId,
       fullName: e.fullName,
       dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave),
@@ -173,7 +188,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     dataToobar.value = val.map((e: any) => ({
       id: e.id,
       name: e.name,
-      code:e.code
+      code: e.code,
     }));
   }
 
@@ -191,6 +206,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     convertLeaveDaytype,
     leaveType,
     colorType,
+    converstType,
     leaveTypeOption,
   };
 });