diff --git a/src/api/index.ts b/src/api/index.ts
index bf56f79fb..292285657 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -40,6 +40,7 @@ const config = ref<any>({
     API_URI_PROFILE_SERVICE: `${window.location.protocol}//${window.location.host}/api/v1`,
     API_CANDIDATE_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
     API_REPORT_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
+    API_PLACEMENT_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
     API_URI_ORG_TREE:
       "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230707_115124.json",
     MEET_URI: "meet.frappet.com",
diff --git a/src/modules/05_placement/components/PersonalList/OrgTree.vue b/src/modules/05_placement/components/PersonalList/OrgTree.vue
index 994f207f7..62a7439cb 100644
--- a/src/modules/05_placement/components/PersonalList/OrgTree.vue
+++ b/src/modules/05_placement/components/PersonalList/OrgTree.vue
@@ -17,6 +17,7 @@ const noData = ref<string>("ไม่พบข้อมูลผังโคร
 const checkValidate = ref<boolean>(false);
 const myFormPosition = ref<any>();
 const selected = ref<string>("");
+const selectedFile = ref<string>("");
 
 // Set form field
 let dataForm = reactive({
@@ -33,18 +34,37 @@ let dataForm = reactive({
   positionSalaryAmount: null,
 });
 
-onMounted(() => {
-  loadTreeData();
-  fetchplacementPosition();
+onMounted(async () => {
+  await fetchPublishFile();
+  await loadTreeData();
+  await fetchplacementPosition();
 });
+const fetchPublishFile = async () => {
+  await http
+    .get(config.API.getPublishFileHistory)
+    .then((res) => {
+      let data = res.data.result;
+      selectedFile.value = data[0].fileName;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
+};
 
 // โหลดข้อมูลโครงสร้างจาก json
 const treeData = ref<Array<any>>([]);
 const loadTreeData = async () => {
   await http
-    .get(config.API.orgTree)
+    .get(`${config.s3ClusterUrl}${selectedFile.value}`)
     .then((res: any) => {
       treeData.value = res.data;
+
+      // Filter objects with "name" null
+      const filteredData = res.data.filter(filterByPersonIdNull);
+      treeData.value = filteredData;
     })
     .catch((e: any) => {
       messageError($q, e);
@@ -53,6 +73,18 @@ const loadTreeData = async () => {
       hideLoader();
     });
 };
+
+function filterByPersonIdNull(obj: any) {
+  if (obj.name === null) {
+    return true;
+  }
+  if (obj.children && obj.children.length > 0) {
+    obj.children = obj.children.filter(filterByPersonIdNull);
+    return obj.children.length > 0;
+  }
+  return false;
+}
+
 // โหลด position
 const placementPosition = ref<any>([]);
 const fetchplacementPosition = async () => {
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 7ae53f4ff..5b6cd79c2 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -1,10 +1,419 @@
-<script setup lang="ts"></script>
-
 <template>
-  <div class="toptitle text-dark col-12 row items-center">พ้นจากราชการ</div>
-  <div>
-    <q-card flat bordered class="col-12 q-mt-sm"> </q-card>
+  <div class="toptitle text-dark col-12 row items-center">
+    ประกาศเกษียณอายุราชการ
   </div>
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+    <div class="row q-col-gutter-sm">
+      <div class="row col-12 q-col-gutter-sm">
+        <q-select
+          class="col-xs-12 col-sm-3 col-md-1"
+          v-model="fiscalyear"
+          label="ปีงบประมาณ"
+          dense
+          emit-value
+          map-options
+          :options="fiscalyearOP"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          @update:model-value="searchFilterTable"
+        />
+        <div>
+          <q-btn
+            @click="clickAdd()"
+            size="12px"
+            flat
+            round
+            color="add"
+            icon="mdi-plus"
+          >
+            <q-tooltip>เพิ่มผู้ทดลองปฏิบัติหน้าที่ราชการ</q-tooltip>
+          </q-btn>
+          <q-menu>
+            <q-list style="min-width: 100px">
+              <q-item clickable @click="clickAdd">
+                <q-item-section>ขรก.กทม.สามัญ</q-item-section>
+              </q-item>
+              <q-item clickable @click="clickAdd">
+                <q-item-section>ลูกจ้างประจำ</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+        </div>
+        <q-space />
+
+        <q-input
+          class="col-xs-12 col-sm-3 col-md-2"
+          standout
+          dense
+          v-model="filterKeyword"
+          ref="filterRef"
+          outlined
+          debounce="300"
+          placeholder="ค้นหา"
+        >
+          <template v-slot:append>
+            <q-icon v-if="filterKeyword == ''" name="search" />
+            <q-icon
+              v-if="filterKeyword !== ''"
+              name="clear"
+              class="cursor-pointer"
+              @click="resetFilter"
+            />
+          </template>
+        </q-input>
+
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+          options-cover
+          style="min-width: 150px"
+          class="col-xs-12 col-sm-3 col-md-2"
+        />
+      </div>
+      <div class="col-12">
+        <div class="q-pa-sm">
+          <q-tabs
+            v-model="tab"
+            dense
+            class="text-grey"
+            active-color="primary"
+            indicator-color="primary"
+            align="left"
+            narrow-indicator
+          >
+            <q-tab name="samun" label="ขรก.กทม.สามัญ" />
+            <q-tab name="employee" label="ลูกจ้างประจำ" />
+          </q-tabs>
+        </div>
+
+        <q-space />
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          class="custom-header-table"
+          v-bind="attrs"
+          :visible-columns="visibleColumns"
+          :pagination-label="paginationLabel"
+          v-model:pagination="pagination"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+              <q-th auto-width />
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="Date" :props="props">
+                {{ props.row.Date }}
+              </q-td>
+              <q-td key="retireNumber" :props="props">
+                {{ props.row.retireNumber }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  dense
+                  size="12px"
+                  flat
+                  round
+                  color="red"
+                  @click="clickDelete(props.row.id)"
+                  icon="mdi-delete"
+                >
+                  <q-tooltip>ลบข้อมูล</q-tooltip>
+                </q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          <template v-slot:pagination="scope">
+            <q-pagination
+              v-model="pagination.page"
+              active-color="primary"
+              color="primary"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
+          </template>
+        </q-table>
+      </div>
+    </div>
+  </q-card>
 </template>
 
-<style lang="scss" scope></style>
+<script setup lang="ts">
+import { ref, useAttrs } from "vue";
+import type { QTableProps } from "quasar";
+import type {
+  FormMainProbation,
+  FormMainProbation2,
+} from "@/modules/05_placement/interface/request/Main";
+import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
+import router from "@/router";
+import { useQuasar } from "quasar";
+
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const visibleColumns = ref<string[]>(["no", "Date", "retireNumber"]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "Date",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: true,
+    field: "Date",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "retireNumber",
+    align: "left",
+    label: "จำนวนผู้เกษียณ",
+    sortable: true,
+    field: "retireNumber",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any>([
+  {
+    no: "1",
+    Date: "2022-9-31 ",
+    retireNumber: "5",
+  },
+  {
+    no: "1",
+    Date: "2022-9-15 ",
+    retireNumber: "7",
+  },
+  {
+    no: "1",
+    Date: "2022-8-31 ",
+    retireNumber: "15",
+  },
+  {
+    no: "1",
+    Date: "2022-9-25 ",
+    retireNumber: "20",
+  },
+]);
+const tab = ref<any>("samun");
+const visibleColumns2 = ref<string[]>(["no", "name", "retireNumber"]);
+
+// หัวตาราง2
+const columns2 = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: true,
+    field: "name",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "retireNumber",
+    align: "left",
+    label: "จำนวนผู้เกษียณ",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows2 = ref<FormMainProbation2[]>([
+  {
+    no: "1",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานโครงสร้างและอัตรากำลัง ๒",
+  },
+  {
+    no: "2",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานโครงสร้างและอัตรากำลัง ๒",
+  },
+  {
+    no: "3",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+  {
+    no: "4",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+  {
+    no: "5",
+    name: "นางสาวฐิติรัตน์ พงษ์ศิริ",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+]);
+
+const clickDelete = (id: string) => {
+  $q.dialog({
+    title: "ยืนยันการลบข้อมูล",
+    message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {})
+    .onCancel(() => {})
+    .onDismiss(() => {});
+};
+
+const clickAdd = () => {
+  //   modal.value = true;
+};
+const clickClose = async () => {
+  modal.value = false;
+};
+const fiscalyear = ref(["2566"]);
+const fiscalyearOP = ref<any>([
+  { id: 1, name: "ทั้งหมด" },
+  { id: 2, name: "2565" },
+  { id: 3, name: "2565" },
+]);
+// ค้นหาในตาราง
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+
+const filterKeyword2 = ref<string>("");
+const filterRef2 = ref<any>(null);
+const resetFilter2 = () => {
+  filterKeyword2.value = "";
+  filterRef2.value.focus();
+};
+
+const attrs = ref<any>(useAttrs());
+
+const paging = ref<boolean>(true);
+const paginationLabel = (start: string, end: string, total: string) => {
+  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+  else return start + "-" + end + " ใน " + total;
+};
+</script>
+
+<style lang="scss" scope>
+.filter-card {
+  background-color: #f1f1f1b0;
+}
+
+.toggle-expired-account {
+  font-size: 12px;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 150%;
+  color: #35373c;
+}
+
+.icon-color {
+  color: #4154b3;
+}
+
+.custom-header-table {
+  max-height: 64vh;
+
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 270be3495..76c07c0ea 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -727,7 +727,7 @@ if (keycloak.tokenParsed != null) {
                       font-size="20px"
                     />
                   </q-item-section>
-                  <q-item-section>{{ menuItem.label }}</q-item-section>
+                  <q-item-section >{{ menuItem.label }}</q-item-section>
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
@@ -751,7 +751,7 @@ if (keycloak.tokenParsed != null) {
                         :to="{ name: `${subMenu2.path}` }"
                       >
                         <q-item-section>
-                          <q-item-label>{{ subMenu2.label }} </q-item-label>
+                          <q-item-label class="font-400">{{ subMenu2.label }} </q-item-label>
                         </q-item-section>
                       </q-item>
                     </q-expansion-item>
@@ -781,7 +781,7 @@ if (keycloak.tokenParsed != null) {
                   :to="{ name: `${subMenu.path}` }"
                 >
                   <q-item-section>
-                    <q-item-label>{{ subMenu.label }}</q-item-label>
+                    <q-item-label class="font-400">{{ subMenu.label }}</q-item-label>
                   </q-item-section>
                 </q-item>
               </q-expansion-item>
@@ -930,6 +930,7 @@ if (keycloak.tokenParsed != null) {
 .menuSub .q-item {
   border-radius: 0 100px 100px 0;
   margin-right: 2%;
+  font-weight: 500 ;
 }
 .expan2 .q-item {
   padding-left: 10%;
@@ -937,6 +938,9 @@ if (keycloak.tokenParsed != null) {
 /* .menuSubAct {
   background: #1e2529d9;
 } */
+.font-400{
+  font-weight: 400 !important;
+}
 .expan2 .menuSubHover {
   padding-left: 30%;
   border-radius: 20px;