From 48eb9ebb6cbd2cc4b16a31404a803a92df6f972e Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 3 Nov 2023 16:01:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=84?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B9=84=E0=B8=9B=E0=B8=A2=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=87=20=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../09_leave/components/2_Leave/DetailLeave.vue        |  4 ++--
 src/modules/09_leave/components/2_Leave/TableList.vue  |  2 +-
 src/modules/09_leave/interface/request/leave.ts        | 10 ++++++++++
 src/modules/09_leave/stores/LeaveStore.ts              |  6 ++++--
 src/modules/09_leave/views/LeaveListMain.vue           |  4 ++++
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 src/modules/09_leave/interface/request/leave.ts

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 155ad2055..2a3f9e7f0 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -18,7 +18,7 @@ const paramsId = route.params.id;
         class="q-mr-sm"
         @click="router.push(`/leave-list`)"
       />
-      รายละเอียดการลาของ {{ paramsId }}
+      รายละเอียดการลาของ นายปิยรมย์ ศิริธาราฟ
     </div>
     <div>
       <q-btn
@@ -56,7 +56,7 @@ const paramsId = route.params.id;
                   </div>
                   <div class="col-12 row">
                       <div class="col-xs-5 col-sm-3 text-grey-8">ชื่อ - นามสกุล</div>
-                      <div class="col text-weight-medium">{{ paramsId }}</div>
+                      <div class="col text-weight-medium">นายปิยรมย์ ศิริธาราฟ</div>
                   </div>
               </div>
               <div class="col-xs-12 col-sm-7 row">
diff --git a/src/modules/09_leave/components/2_Leave/TableList.vue b/src/modules/09_leave/components/2_Leave/TableList.vue
index 834c1959a..4627e2220 100644
--- a/src/modules/09_leave/components/2_Leave/TableList.vue
+++ b/src/modules/09_leave/components/2_Leave/TableList.vue
@@ -118,7 +118,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
           v-for="col in props.cols"
           :key="col.name"
           :props="props"
-          @click.prevent="router.push(`/leave/detail/${props.row.name}`)"
+          @click.prevent="router.push(`/leave/detail/${props.row.id}`)"
         >
           <div v-if="col.name == 'no'">
             {{ props.rowIndex + 1 }}
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts
new file mode 100644
index 000000000..674688ccc
--- /dev/null
+++ b/src/modules/09_leave/interface/request/leave.ts
@@ -0,0 +1,10 @@
+interface ListsData {
+    id: string;
+    leaveType: string
+    name: string
+    Date: string
+    status: string
+}
+export type {
+    ListsData
+}
\ No newline at end of file
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 576c1eb74..fcc7a0c30 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -5,6 +5,7 @@ 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;
@@ -18,8 +19,9 @@ 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: date2Thai(e.Date),
diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/LeaveListMain.vue
index b7a5a4e60..da8303374 100644
--- a/src/modules/09_leave/views/LeaveListMain.vue
+++ b/src/modules/09_leave/views/LeaveListMain.vue
@@ -17,24 +17,28 @@ onMounted(() => {
 function fecthLeaveList() {
   const data = [
     {
+      id: "00000000-0000-0000-0000-000000000000",
       leaveType: "ลาป่วย",
       name: "นายกัณฐิมา  กาฬสินธ์ุ",
       Date: "2023-11-03",
       status: "NEW",
     },
     {
+      id: "00000000-0000-0000-0000-000000000000",
       leaveType: "ลากิจส่วนตัว",
       name: "นายนครชัย วันดี",
       Date: "2023-11-01",
       status: "APPROVE",
     },
     {
+      id: "00000000-0000-0000-0000-000000000000",
       leaveType: "ลากิจส่วนตัว",
       name: "นายกัณฐิมา  กาฬสินธ์ุ",
       Date: "2023-11-02",
       status: "PENDING",
     },
     {
+      id: "00000000-0000-0000-0000-000000000000",
       leaveType: "ลาป่วย",
       name: "นายปิยรมย์ ศิริธาราฟ",
       Date: "2023-11-01",