From 9dae77573f68c461f076c8f0b949daa935c14089 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 13 Jun 2024 11:16:20 +0700
Subject: [PATCH] updated route leave sys

---
 src/interface/request/main/main.ts | 32 ++++++++----------------------
 src/modules/09_leave/router.ts     | 26 ++++++++----------------
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 3d8f56bef..03cbd560e 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -46,7 +46,6 @@ const menuList = readonly<any[]>([
   {
     key: 1,
     icon: "mdi-home-variant-outline",
-    activeIcon: "mdi-home-variant",
     label: "หน้าแรก",
     path: "dashboard",
     role: "dashboard",
@@ -54,7 +53,6 @@ const menuList = readonly<any[]>([
   // {
   //   key: 2,
   //   icon: "o_person",
-  //   activeIcon: "person",
   //   label: "ข้อมูลหลัก",
   //   path: "metadataNew",
   //   role: "metadata",
@@ -89,7 +87,6 @@ const menuList = readonly<any[]>([
   {
     key: 2,
     icon: "o_person",
-    activeIcon: "person",
     label: "ข้อมูลการประเมิน",
     path: "metadataNew",
     role: "evaluateKPI",
@@ -133,7 +130,6 @@ const menuList = readonly<any[]>([
   {
     key: 3,
     icon: "o_groups",
-    activeIcon: "groups",
     label: "โครงสร้างอัตรากำลัง",
     path: "organizationalNew",
     role: "organization",
@@ -162,7 +158,6 @@ const menuList = readonly<any[]>([
   {
     key: 4,
     icon: "verified",
-    activeIcon: "verified",
     label: "รายการรอตรวจสอบ",
     path: "verified",
     role: "registryverify",
@@ -170,7 +165,6 @@ const menuList = readonly<any[]>([
   {
     key: 6,
     icon: "mdi-file-certificate-outline",
-    activeIcon: "order",
     label: "ออกคำสั่ง",
     path: "order",
     role: "order",
@@ -178,7 +172,6 @@ const menuList = readonly<any[]>([
   {
     key: 7,
     icon: "o_search",
-    activeIcon: "search",
     label: "สรรหา",
     path: "recruiting",
     role: "recruit",
@@ -246,7 +239,6 @@ const menuList = readonly<any[]>([
     key: 8,
     path: "placement",
     icon: "how_to_reg",
-    activeIcon: "how_to_reg",
     label: "บรรจุ แต่งตั้ง ย้าย โอน",
     role: "placement",
     children: [
@@ -305,7 +297,6 @@ const menuList = readonly<any[]>([
   {
     key: 81,
     icon: "badge",
-    activeIcon: "badge",
     label: "ทดลองปฏิบัติหน้าที่ราชการ",
     path: "probation",
     role: "probation",
@@ -313,7 +304,6 @@ const menuList = readonly<any[]>([
   {
     key: 9,
     icon: "mdi-account-cancel-outline",
-    activeIcon: "mdi-account-cancel",
     label: "พ้นจากราชการ",
     path: "retirement",
     role: "retirement",
@@ -348,7 +338,6 @@ const menuList = readonly<any[]>([
   {
     key: 10,
     icon: "mdi-medal-outline",
-    activeIcon: "mdi-medal",
     label: "เครื่องราชฯ",
     path: "insignia",
     role: "insignia",
@@ -388,39 +377,38 @@ const menuList = readonly<any[]>([
   {
     key: 11,
     icon: "mdi-calendar",
-    activeIcon: "mdi-calendar",
     label: "การลา",
     path: "leave",
     role: "leave",
     children: [
       {
         label: "รอบการปฏิบัติงาน",
-        path: "/round-time",
+        path: "roundTime",
         role: "leave",
       },
       {
         label: "แก้ไขรอบการปฎิบัติงานผู้ใช้งาน",
-        path: "/change-round",
+        path: "changeRound",
         role: "leave",
       },
       {
         label: "รายการลงเวลาปฏิบัติงาน",
-        path: "/work-list",
+        path: "workList",
         role: "leave",
       },
       {
         label: "ลงเวลากรณีพิเศษ",
-        path: "/timestamp-special",
+        path: "timestampSpecial",
         role: "leave",
       },
       {
         label: "รายการลา",
-        path: "/leave",
+        path: "leave",
         role: "leave",
       },
       {
         label: "รายงานสถิติการลา",
-        path: "/leave-report",
+        path: "leaveReport",
         role: "leave",
       },
     ],
@@ -428,7 +416,6 @@ const menuList = readonly<any[]>([
   {
     key: 12,
     icon: "mdi-scale-balance",
-    activeIcon: "mdi-scale-balance",
     label: "วินัย",
     role: "discipline",
     children: [
@@ -497,7 +484,6 @@ const menuList = readonly<any[]>([
   {
     key: 13,
     icon: "mdi-account-check",
-    activeIcon: "mdi-account-check",
     label: "ประเมินบุคคล",
     role: "evaluate",
     children: [
@@ -530,12 +516,11 @@ const menuList = readonly<any[]>([
   {
     key: 14,
     icon: "mdi-cash",
-    activeIcon: "mdi-cash",
     label: "เงินเดือน/ค่าจ้าง",
     role: "salary",
     children: [
       {
-        label: "ผังบัญชีเงินเดือนข้าราชการ ฯ",
+        label: "ผังบัญชีเงินเดือนข้าราชการฯ",
         path: "salaryChart",
         role: "salary",
       },
@@ -550,7 +535,7 @@ const menuList = readonly<any[]>([
         role: "salary",
       },
       {
-        label: "เลื่อนเงินเดือนข้าราชการ ฯ",
+        label: "เลื่อนเงินเดือนข้าราชการฯ",
         path: "salaryLists",
         role: "salary",
       },
@@ -569,7 +554,6 @@ const menuList = readonly<any[]>([
   {
     key: 15,
     icon: "mdi-account-star",
-    activeIcon: "mdi-account-star",
     label: "ประเมินผลการปฏิบัติราชการระดับบุคคล",
     role: "evaluateKPI",
     children: [
diff --git a/src/modules/09_leave/router.ts b/src/modules/09_leave/router.ts
index abcdc7ff7..ecf45eaf1 100644
--- a/src/modules/09_leave/router.ts
+++ b/src/modules/09_leave/router.ts
@@ -14,7 +14,7 @@ const leaveReport = () =>
 export default [
   {
     path: "/round-time",
-    name: "/round-time",
+    name: "roundTime",
     component: RoundMain,
     meta: {
       Auth: true,
@@ -24,7 +24,7 @@ export default [
   },
   {
     path: "/change-round",
-    name: "/change-round",
+    name: "changeRound",
     component: ChangeRoundMain,
     meta: {
       Auth: true,
@@ -34,17 +34,7 @@ export default [
   },
   {
     path: "/work-list",
-    name: "/work-list",
-    component: workMain,
-    meta: {
-      Auth: true,
-      Key: [9],
-      Role: "leave",
-    },
-  },
-  {
-    path: "/work-list",
-    name: "/work-list",
+    name: "workList",
     component: workMain,
     meta: {
       Auth: true,
@@ -54,7 +44,7 @@ export default [
   },
   {
     path: "/timestamp-special",
-    name: "/timestamp-special",
+    name: "timestampSpecial",
     component: SpecialTimeMain,
     meta: {
       Auth: true,
@@ -64,7 +54,7 @@ export default [
   },
   {
     path: "/leave",
-    name: "/leave",
+    name: "leave",
     component: leaveMain,
     meta: {
       Auth: true,
@@ -74,7 +64,7 @@ export default [
   },
   {
     path: "/leave/detail/:id",
-    name: "/leave/detail",
+    name: "leaveDetail",
     component: leaveDetail,
     meta: {
       Auth: true,
@@ -84,7 +74,7 @@ export default [
   },
   {
     path: "/leave-reject/detail/:id",
-    name: "/leave-reject/detail",
+    name: "leaveRejectDetail",
     component: leaveDetailReject,
     meta: {
       Auth: true,
@@ -94,7 +84,7 @@ export default [
   },
   {
     path: "/leave-report",
-    name: "/leave-report",
+    name: "leaveReport",
     component: leaveReport,
     meta: {
       Auth: true,