Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/09_leave/components/2_Leave/DetailLeave.vue

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

@@ -5,12 +5,12 @@ import { useCounterMixin } from "@/stores/mixin";
 import type { DataOption } from "@/modules/09_leave/interface/index/Main";
 import type { QTableProps } from "quasar";
 import type { DataRows } from "@/modules/09_leave/interface/response/leave";
+import type { ListsData } from "@/modules/09_leave/interface/request/leave";
 
 const mixin = useCounterMixin();
 const { date2Thai, showLoader, hideLoader } = mixin;
 export const useLeavelistDataStore = defineStore("leave", () => {
   //TABMENU
-  const tab = ref<string>("1");
   const amounttab1 = ref<number>(0);
   const amounttab2 = ref<number>(0);
   //ข้อมูลในตาราง
@@ -19,20 +19,19 @@ export const useLeavelistDataStore = defineStore("leave", () => {
   const columns = ref<QTableProps["columns"]>([]);
   const visibleColumns = ref<string[]>([]);
   const loadTable = ref<boolean>(false);
-  async function fetchList(data: DataRows[]) {
-    let datalist = data.map((e: DataRows) => ({
+  async function fetchList(data: ListsData[]) {
+    let datalist = data.map((e: ListsData) => ({
+      id: e.id,
       leaveType: e.leaveType,
       name: e.name,
-      Date: e.Date,
+      Date: date2Thai(e.Date),
       status: convertSatatus(e.status),
     }));
-    tab.value !== "1"
-      ? (mainData.value = datalist)
-      : (mainData.value = datalist.filter(
-          (e) => e.status === "อยู่ระหว่างกำเนินการ"
-        ));
+    mainData.value = datalist.filter(
+      (e) => e.status === "อยู่ระหว่างดำเนินการ"
+    );
     const filteramounttab1 = datalist.filter(
-      (e) => e.status === "อยู่ระหว่างกำเนินการ"
+      (e) => e.status === "อยู่ระหว่างดำเนินการ"
     );
     amounttab1.value = filteramounttab1.length;
     amounttab2.value = datalist.length;
@@ -162,16 +161,17 @@ export const useLeavelistDataStore = defineStore("leave", () => {
   // convertSatatus
   function convertSatatus(val: string) {
     switch (val) {
-      case "1":
+      case "NEW":
         return "ใหม่";
-      case "2":
-        return "อยู่ระหว่างกำเนินการ";
-      case "3":
+      case "PENDING":
+        return "อยู่ระหว่างดำเนินการ";
+      case "APPROVE":
         return "อนุมัติ";
+      case "REJECT":
+        return "ไม่อนุมัติ";
     }
   }
   return {
-    tab,
     amounttab1,
     amounttab2,
     //ข้อมูลในตาราง

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

@@ -2,6 +2,7 @@ import { defineStore } from "pinia";
 import { ref } from "vue";
 import type { QTableProps } from "quasar";
 import type { DataRows } from "@/modules/09_leave/interface/response/specialTime";
+import type { ListData } from "@/modules/09_leave/interface/request/specialTime";
 import { useCounterMixin } from "@/stores/mixin";
 const mixin = useCounterMixin();
 const { date2Thai } = mixin;
@@ -11,14 +12,21 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   const selectDate = ref<Date | null>(new Date());
   const fiscalYear = ref<string | null>("0");
   const DataMainOrig = ref<DataRows[]>([]); // ข้อมูลหลักดั้งเดิม
-  async function fecthList(data: DataRows[]) {
-    let datalist: DataRows[] = data.map((e: any) => ({
+  async function fecthList(data: ListData[]) {
+    let datalist: DataRows[] = data.map((e: ListData) => ({
+      id: e.id,
       fullname: e.fullname,
       date: date2Thai(new Date(e.date)),
-      dateFix: date2Thai(new Date(e.dateFix)) + (e.timeStamp || ""),
-      type: e.type,
-      reason: e.reason,
-      timeStamp: e.timeStamp,
+      dateFix: date2Thai(new Date(e.dateFix)),
+      timeMorning:
+        e.startTimeMorning == null
+          ? "-"
+          : e.startTimeMorning + " - " + e.endTimeMorning,
+      timeAfternoon:
+        e.startTimeAfternoon == null
+          ? "-"
+          : e.startTimeAfternoon + " - " + e.endTimeAfternoon,
+      status: e.status,
     }));
     rows.value = datalist;
     DataMainOrig.value = datalist;
@@ -77,8 +85,8 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     "fullname",
     "date",
     "dateFix",
-    "type",
-    "reason",
+    "timeMorning",
+    "timeAfternoon",
   ]);
 
   const columns = ref<QTableProps["columns"]>([
@@ -108,8 +116,6 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
       field: "date",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
     {
       name: "dateFix",
@@ -119,32 +125,27 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
       field: "dateFix",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
     {
-      name: "type",
+      name: "timeMorning",
       align: "left",
-      label: "ประเภท",
+      label: "ช่วงเช้า",
       sortable: true,
-      field: "type",
+      field: "timeMorning",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
     {
-      name: "reason",
+      name: "timeAfternoon",
       align: "left",
-      label: "เหตุผล",
+      label: "ช่วงบ่าย",
       sortable: true,
-      field: "reason",
+      field: "timeAfternoon",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
   ]);
+
   return {
     fecthList,
     rows,