From bad243a65bade32d119a541f595627d2a6621df8 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 18 Oct 2023 09:35:16 +0700
Subject: [PATCH] =?UTF-8?q?-=20=E0=B9=80=E0=B8=9B=E0=B8=B4=E0=B8=94?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2=20-=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=82?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=20folder=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B8=9E=E0=B8=B7=E0=B9=89=E0=B8=99=E0=B8=90?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=A7=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            | 62 +++++++++----------
 .../Channel/MainPage.vue                      |  0
 .../Channel/addChannel.vue                    |  0
 .../Director/MainPage.vue                     |  0
 src/modules/11_discipline/router.ts           | 12 ++--
 5 files changed, 34 insertions(+), 40 deletions(-)
 rename src/modules/11_discipline/components/{ุ6_Information => 6_BasicInformation}/Channel/MainPage.vue (100%)
 rename src/modules/11_discipline/components/{ุ6_Information => 6_BasicInformation}/Channel/addChannel.vue (100%)
 rename src/modules/11_discipline/components/{ุ6_Information => 6_BasicInformation}/Director/MainPage.vue (100%)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 823f4a2e1..2e0f66e5a 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -290,12 +290,6 @@ const menuList = readonly<any[]>([
         path: "resign",
         role: "retirement",
       },
-      // {
-      //   key: 7.3,
-      //   label: "คำสั่งลาออก",
-      //   path: "resign-order",
-      //   role: "retirement",
-      // },
       {
         key: 7.3,
         label: "Exit interview",
@@ -374,34 +368,34 @@ const menuList = readonly<any[]>([
       },
     ],
   },
-  // {
-  //   key: 9,
-  //   icon: "mdi-calendar",
-  //   activeIcon: "mdi-calendar",
-  //   label: "การลา",
-  //   path: "leave",
-  //   role: "coin",
-  //   children: [
-  //     {
-  //       key: 9.1,
-  //       label: "รายการลงเวลาปฏิบัติงาน",
-  //       path: "/work-list",
-  //       role: "coin",
-  //     },
-  //     {
-  //       key: 9.2,
-  //       label: "รายการลา",
-  //       path: "/leave-list",
-  //       role: "coin",
-  //     },
-  //     {
-  //       key: 9.3,
-  //       label: "รายงานสถิติ",
-  //       path: "/statistics-report",
-  //       role: "coin",
-  //     },
-  //   ],
-  // },
+  {
+    key: 9,
+    icon: "mdi-calendar",
+    activeIcon: "mdi-calendar",
+    label: "การลา",
+    path: "leave",
+    role: "coin",
+    children: [
+      {
+        key: 9.1,
+        label: "รายการลงเวลาปฏิบัติงาน",
+        path: "/work-list",
+        role: "coin",
+      },
+      {
+        key: 9.2,
+        label: "รายการลา",
+        path: "/leave-list",
+        role: "coin",
+      },
+      {
+        key: 9.3,
+        label: "รายงานสถิติ",
+        path: "/statistics-report",
+        role: "coin",
+      },
+    ],
+  },
   {
     key: 11,
     icon: "mdi-scale-balance",
diff --git a/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
similarity index 100%
rename from src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue
rename to src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
diff --git a/src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/addChannel.vue
similarity index 100%
rename from src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue
rename to src/modules/11_discipline/components/6_BasicInformation/Channel/addChannel.vue
diff --git a/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
similarity index 100%
rename from src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue
rename to src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts
index 55124354e..d0a715198 100644
--- a/src/modules/11_discipline/router.ts
+++ b/src/modules/11_discipline/router.ts
@@ -16,12 +16,16 @@ const report = () =>
   import("@/modules/11_discipline/components/5_Report/MainPage.vue");
 const directorMain = () =>
   import(
-    "@/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue"
+    "@/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue"
   );
 const channelMain = () =>
   import(
-    "@/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue"
+    "@/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue"
   );
+  const channelAdd = () =>
+  import(
+    "@/modules/11_discipline/components/6_BasicInformation/Channel/addChannel.vue"
+  );  
 const complaintAdd = () =>
   import("@/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue");
 const reportType = () =>
@@ -31,10 +35,6 @@ const InvestigateDisciplinaryAdd = () =>
   import(
     "@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue"
   );
-const channelAdd = () =>
-  import(
-    "@/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue"
-  );
 const orderPage = () => import("@/modules/11_discipline/components/4_Order/OrderPage.vue")
 export default [
   {