diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts
index 2f5d6c0d0..1a4623078 100644
--- a/src/api/06_retirement/api.retirement.ts
+++ b/src/api/06_retirement/api.retirement.ts
@@ -8,7 +8,7 @@ export default {
     getprofileRetire: (retireId: string) => `${retirement}/${retireId}`,
     createnote: () => `${retirement}/reason/`,
     reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
-    retirement:(type:string) => `${retirement}/${type}/2023`
+    retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
     
 
 
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/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
index fb4f94ec3..6838580bc 100644
--- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
@@ -485,7 +485,7 @@ const OriginalDataFetch = async () => {
 
 // ดูรายการหน้าต่อไป
 const redirectToPage = (id?: number) => {
-  router.push(`/retirement/dismiss-order/add`);
+  router.push(`/dismiss-order/addorder`);
 };
 
 const clickDelete = (id: string) => {
diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index cf1588bfd..b78301662 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -32,7 +32,7 @@ export default [
     },
   },
   {
-    path: "/retirement/list/:id",
+    path: "/retirement/list/:id/:year",
     name: "retirement/list/id",
     component: Listretirement,
     meta: {
@@ -92,7 +92,7 @@ export default [
     },
   },
   {
-    path: "retirement/dismiss-order/add",
+    path: "/dismiss-order/addorder",
     name: "dismiss-order-add",
     component: addOrder,
     meta: {
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index f2411c8da..7f2d40388 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -13,8 +13,12 @@
         indicator-color="primary"
         align="left"
       >
-        <q-tab name="samun" label="ขรก.กทม.สามัญ" @click="get('officer')"/>
-        <q-tab name="employee" label="ลูกจ้างประจำ" @click="get('employee')"/>
+        <q-tab name="officer" label="ขรก.กทม.สามัญ" @click="type = 'officer'" />
+        <q-tab
+          name="employee"
+          label="ลูกจ้างประจำ"
+          @click="type = 'employee'"
+        />
       </q-tabs>
     </div>
     <q-separator />
@@ -27,7 +31,7 @@
             dense
             emit-value
             map-options
-            :options="fiscalyearOP"
+            :options="yearOptions"
             option-value="id"
             option-label="name"
             lazy-rules
@@ -37,7 +41,6 @@
             :outlined="true"
             :hide-dropdown-icon="false"
             style="min-width: 150px"
-            @update:model-value="searchFilterTable"
           />
           <div>
             <q-btn
@@ -175,7 +178,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, useAttrs } from "vue";
+import { onMounted, ref, useAttrs, reactive,watch } from "vue";
 import type { QTableProps } from "quasar";
 import type {
   FormMainProbation,
@@ -185,11 +188,12 @@ import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import { useCounterMixin } from "@/stores/mixin"
-import type { resMain } from '@/modules/06_retirement/interface/response/Main'
+import { useCounterMixin } from "@/stores/mixin";
+import type { resMain } from "@/modules/06_retirement/interface/response/Main";
+const yearOptions = reactive<any[]>([]);
 
-const mixin = useCounterMixin()
-const { messageError ,date2Thai,showLoader,hideLoader} = mixin
+const mixin = useCounterMixin();
+const { messageError, date2Thai, showLoader, hideLoader } = mixin;
 const router = useRouter();
 const $q = useQuasar(); //ใช้ noti quasar
 const modal = ref<boolean>(false);
@@ -200,6 +204,7 @@ const pagination = ref({
   rowsPerPage: 10,
 });
 
+const type = ref<string>("officer");
 const visibleColumns = ref<string[]>(["no", "Date", "retireNumber"]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 
 // หัวตาราง
@@ -234,35 +239,42 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 
 // ข้อมูลตาราง (จำลอง)
+const currentYear = new Date().getFullYear();
 const rows = ref<resMain[]>([]);
-const tab = ref<any>("samun");
+const tab = ref<any>("officer");
 const visibleColumns2 = ref<string[]>(["no", "name", "retireNumber"]);
-const get = async(type:string) =>{
+  const getYear = () => {
+  yearOptions.length = 0;
+  yearOptions.push(currentYear+543);
+  console.log(yearOptions);
+  get(type.value, currentYear);
+  fiscalyear.value = currentYear+543;
 
+};
+const get = async (type: string, year: number) => {
   await http
-  .get(config.API.retirement(type))
-  .then((res)=>{
-    let data = res.data.result
-    console.log(data)
-     rows.value = data.map((items:resMain) =>({
-      id:items.id,
-      Date:date2Thai(items.createdAt),
-      year:items.year,
-      retireNumber:items.round,
-      total:items.total
-    }))
-    
-  }).catch((e) => {
-      messageError($q, e);
+    .get(config.API.retirement(type, year))
+    .then((res) => {
+      rows.value = [];
+      let data = res.data.result;
+      rows.value = data.map((items: resMain) => ({
+        id: items.id,
+        Date: date2Thai(items.createdAt),
+        year: items.year,
+        retireNumber: items.round,
+        total: items.total,
+      }));
+    })
+    .catch((e) => {
+
     })
     .finally(() => {
-      hideLoader()
+      hideLoader();
     });
-
-}
-onMounted(()=>{
-  get
-})
+};
+onMounted(() => {
+  getYear();
+});
 // หัวตาราง2
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -355,12 +367,13 @@ const clickAdd = () => {
 const clickClose = async () => {
   modal.value = false;
 };
-const fiscalyear = ref(["2566"]);
+const fiscalyear = ref<number>();
 const fiscalyearOP = ref<any>([
   { id: 1, name: "ทั้งหมด" },
   { id: 2, name: "2565" },
   { id: 3, name: "2565" },
 ]);
+
 // ค้นหาในตาราง
 const filterKeyword = ref<string>("");
 const filterRef = ref<any>(null);
@@ -383,9 +396,16 @@ const paginationLabel = (start: string, end: string, total: string) => {
   if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
-const nextPage = (val: any) => {
-  router.push(`/retirement/list/${val.no}`);
+const nextPage = () => {
+  router.push(`/retirement/list/${type.value}/${currentYear}`);
 };
+
+watch(type,()=>{
+  console.log(type.value)
+  get(type.value,currentYear)
+  console.log("🚀 ~ file: Main.vue:417 ~ watch ~ fiscalyear:",typeof fiscalyear.value)
+  
+})
 </script>
 
 <style lang="scss" scope>
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
                     >