From 37722a0916487bddc507d37181662c90ab87fdd0 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:27:52 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B9=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts | 26 +++++++++++++-------------
 src/views/MainLayout.vue           | 12 ++----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 605053b4c..af5588930 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -201,20 +201,20 @@ const menuList = readonly<any[]>([
       {
         key: 6.3,
         label: "การทดลองงาน" /* การทดลองงาน */,
-        path: "",
+        path: "probation",
         role: "probation",
-        children: [
-          {
-            label: "รายการคำขอโอน",
-            path: "probationTranfer",
-            role: "probation",
-          },
-          {
-            label: "รายการรับโอน",
-            path: "probationReceive",
-            role: "probation",
-          },
-        ],
+      },
+      {
+        key: 6.4,
+        label: "รายการคำขอโอน" /* */,
+        path: "tranfer",
+        role: "placement",
+      },
+      {
+        key: 6.5,
+        label: "รายการรับโอน" /* */,
+        path: "receive",
+        role: "placement",
       },
     ],
   },
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index d226736cd..76ee21a07 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -731,21 +731,13 @@ if (keycloak.tokenParsed != null) {
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
-                <div
-                  v-if="
-                    menuItem.key == 5 || menuItem.key == 6 || menuItem.key == 8
-                  "
-                >
+                <div v-if="menuItem.key == 5 || menuItem.key == 8">
                   <div v-for="(subMenu, i) in menuItem.children" :key="i">
                     <q-expansion-item
                       switch-toggle-side
                       dense-toggle
                       :label="subMenu.label"
-                      v-if="
-                        subMenu.key !== 5.1 &&
-                        subMenu.key !== 6.1 &&
-                        subMenu.key !== 6.2
-                      "
+                      v-if="subMenu.key !== 5.1"
                       class="expan2"
                       dense
                     >