From bb7b0c37d1e0bdf20cc0164c875f11090436765b Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 24 Jul 2023 17:47:24 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=20Probation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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