From 4a9fa574deca608fea219f02de2ab23ce6a83c0a Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Fri, 3 Nov 2023 11:09:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20path=20=20timesta?=
 =?UTF-8?q?mp-special?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

แก้ path timestamp-special
---
 src/interface/request/main/main.ts            |  2 +-
 .../interface/response/specialTime.ts         | 11 ++++
 src/modules/09_leave/router.ts                | 53 ++++++++++---------
 3 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 src/modules/09_leave/interface/response/specialTime.ts

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index ecf34e6b6..dec0d773f 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -397,7 +397,7 @@ const menuList = readonly<any[]>([
       {
         key: 9.4,
         label: "ลงเวลากรณีพิเศษ",
-        path: "/special-time",
+        path: "/timestamp-special",
         role: "leave",
       },
       {
diff --git a/src/modules/09_leave/interface/response/specialTime.ts b/src/modules/09_leave/interface/response/specialTime.ts
new file mode 100644
index 000000000..318a5ed5d
--- /dev/null
+++ b/src/modules/09_leave/interface/response/specialTime.ts
@@ -0,0 +1,11 @@
+interface DataRows {
+  fullname: string | null;
+  date: string | null;
+  dateFix: string | null;
+  type: string;
+  reason: string;
+  timeStamp: string;
+  unapprove?: string; // Make these properties optional
+  approve?: string;
+}
+export type { DataRows };
diff --git a/src/modules/09_leave/router.ts b/src/modules/09_leave/router.ts
index 1e07cfd17..cc60e32ab 100644
--- a/src/modules/09_leave/router.ts
+++ b/src/modules/09_leave/router.ts
@@ -1,10 +1,13 @@
 const workMain = () => import("@/modules/09_leave/views/WorkingMain.vue");
 const leaveMain = () => import("@/modules/09_leave/views/LeaveListMain.vue");
-const reportMain = () => import("@/modules/09_leave/views/ReportMain.vue")
-const leaveDetail = () => import("@/modules//09_leave/components/2_Leave/DetailLeave.vue")
-const RoundMain = () => import("@/modules/09_leave/views/RoundMain.vue")
-const ChangeRoundMain = () => import("@/modules/09_leave/views/ChangeRoundMain.vue")
-const SpecialTimeMain = () => import("@/modules/09_leave/views/SpecialTimeMain.vue");
+const reportMain = () => import("@/modules/09_leave/views/ReportMain.vue");
+const leaveDetail = () =>
+  import("@/modules//09_leave/components/2_Leave/DetailLeave.vue");
+const RoundMain = () => import("@/modules/09_leave/views/RoundMain.vue");
+const ChangeRoundMain = () =>
+  import("@/modules/09_leave/views/ChangeRoundMain.vue");
+const SpecialTimeMain = () =>
+  import("@/modules/09_leave/views/SpecialTimeMain.vue");
 
 export default [
   {
@@ -17,25 +20,15 @@ export default [
       Role: "coin",
     },
   },
-    {
-        path: "/change-round",
-        name: "/change-round",
-        component: ChangeRoundMain,
-        meta: {
-            Auth: true,
-            Key: [9],
-            Role: "coin",
-        },
+  {
+    path: "/change-round",
+    name: "/change-round",
+    component: ChangeRoundMain,
+    meta: {
+      Auth: true,
+      Key: [9],
+      Role: "coin",
     },
-    {
-        path: "/work-list",
-        name: "/work-list",
-        component: workMain,
-        meta: {
-            Auth: true,
-            Key: [9],
-            Role: "coin",
-        },
   },
   {
     path: "/work-list",
@@ -48,8 +41,18 @@ export default [
     },
   },
   {
-    path: "/special-time",
-    name: "/special-time",
+    path: "/work-list",
+    name: "/work-list",
+    component: workMain,
+    meta: {
+      Auth: true,
+      Key: [9],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/timestamp-special",
+    name: "/timestamp-special",
     component: SpecialTimeMain,
     meta: {
       Auth: true,