diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
index 74c9b65ef..dfc4cabaa 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
@@ -13,7 +13,7 @@ const $q = useQuasar();
 const router = useRouter();
 const route = useRoute();
 const mixin = useCounterMixin();
-const { messageError, showLoader, hideLoader } = mixin;
+const { messageError, showLoader, hideLoader, dialogMessageNotify } = mixin;
 
 const profile_id = ref<string>("");
 const birthdate = ref<string>("");
@@ -75,6 +75,8 @@ async function fetchData() {
           scoreSum.value = data.scoreResult.scoreSum;
           examResultinscore.value = data.scoreResult.examResult;
         }
+      } else {
+        dialogMessageNotify($q, "แข่งขัน ไม่พบข้อมูล");
       }
     })
     .catch((e) => {
diff --git a/src/modules/21_report/components/01_org/DialogOrg.vue b/src/modules/21_report/components/01_org/DialogOrg.vue
new file mode 100644
index 000000000..bb0c75997
--- /dev/null
+++ b/src/modules/21_report/components/01_org/DialogOrg.vue
@@ -0,0 +1,152 @@
+<script setup lang="ts">
+import { ref, watch, reactive } from "vue";
+import { useRoute } from "vue-router";
+import { useStructureTree } from "@/stores/structureTree";
+
+import { useReportStore } from "@/modules/21_report/store";
+
+import type {
+  DataStructureTree,
+  DataNodeData,
+} from "@/modules/21_report/interface/Main";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+
+const store = useReportStore();
+const route = useRoute();
+const { fetchStructureTree } = useStructureTree();
+
+const modal = defineModel<boolean>("modal", { required: true });
+const orgName = defineModel<string>("name", { required: true });
+
+const filter = ref<string>("");
+
+const node = ref<DataStructureTree[]>([]);
+const expanded = ref<string[]>([]);
+const nodeData = reactive<DataNodeData>({
+  name: "",
+  nodeId: null,
+  node: null,
+});
+
+/** ปิด dialog */
+function close() {
+  modal.value = false;
+}
+
+async function fetchTree() {
+  const data = await fetchStructureTree(route.meta.Key as string, true);
+  if (data) {
+    node.value = data;
+    store.formFilter.node = nodeData.node;
+    store.formFilter.nodeId = nodeData.nodeId;
+  }
+}
+
+/** ค้นหาข้อมูลรายชื่อข้อมูลทะเบียนประวัติตามหน่วยงาน/ส่วนราชการ*/
+function sendNode() {
+  nodeData.node = store.formFilter.node;
+  nodeData.nodeId = store.formFilter.nodeId;
+  orgName.value = nodeData.name;
+  modal.value = false;
+}
+
+/**
+ * ฟังก์ชันเลือกหน่วยงาน/ส่วนราชการ
+ * @param data  ข้อมูลหน่วยงาน/ส่วนราชการที่ต้องการค้นหาร
+ * เพื่อค้นหาข้อมูลตามหน่วยงาน/ส่วนราชการ
+ */
+function updateSelectedTreeMain(data: DataStructureTree) {
+  if (nodeData.node === data.orgLevel && nodeData.nodeId === data.orgTreeId) {
+    store.formFilter.node = null;
+    store.formFilter.nodeId = null;
+    nodeData.name = "";
+  } else {
+    store.formFilter.node = data.orgLevel;
+    store.formFilter.nodeId = data.orgTreeId;
+    nodeData.name = data.orgName;
+  }
+}
+
+watch(
+  () => modal.value,
+  async () => {
+    if (modal.value) {
+      await fetchTree();
+    }
+  }
+);
+</script>
+
+<template>
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 850px; max-width: 80vw">
+      <DialogHeader tittle="เลือกหน่วยงาน/ส่วนราชการ" :close="close" />
+
+      <q-separator />
+
+      <q-card-section class="q-pa-sm">
+        <div class="row q-col-gutter-sm">
+          <div class="col-12">
+            <q-input dense outlined v-model="filter" label="ค้นหา">
+              <template v-slot:append>
+                <q-icon
+                  v-if="filter !== ''"
+                  name="clear"
+                  class="cursor-pointer"
+                  @click="filter = ''"
+                />
+                <q-icon v-else name="search" color="grey-5" />
+              </template>
+            </q-input>
+          </div>
+          <div class="col-12">
+            <q-tree
+              class="tree-container"
+              dense
+              :nodes="node"
+              node-key="orgTreeName"
+              label-key="labelName"
+              v-model:expanded="expanded"
+              :filter="filter.trim()"
+              no-results-label="ไม่พบข้อมูลที่ค้นหา"
+              no-nodes-label="ไม่มีข้อมูล"
+              v-model:selected="nodeData.nodeId"
+            >
+              <template v-slot:default-header="prop">
+                <q-item
+                  clickable
+                  @click.stop="updateSelectedTreeMain(prop.node)"
+                  :active="store.formFilter.nodeId === prop.node.orgTreeId"
+                  active-class="my-list-link text-primary text-weight-medium"
+                  class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
+                >
+                  <div>
+                    <div class="text-weight-medium">
+                      {{ prop.node.orgTreeName }}
+                    </div>
+                    <div class="text-weight-light text-grey-8">
+                      {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
+                      {{
+                        prop.node.orgTreeShortName == null
+                          ? null
+                          : prop.node.orgTreeShortName
+                      }}
+                    </div>
+                  </div>
+                </q-item>
+              </template>
+            </q-tree>
+          </div>
+        </div>
+      </q-card-section>
+      <q-separator />
+
+      <q-card-actions align="right">
+        <q-btn label="ค้นหา" color="secondary" @click="sendNode">
+          <q-tooltip>ค้นหา</q-tooltip></q-btn
+        >
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
diff --git a/src/modules/21_report/interface/Main.ts b/src/modules/21_report/interface/Main.ts
index bb4059f08..a8675cc90 100644
--- a/src/modules/21_report/interface/Main.ts
+++ b/src/modules/21_report/interface/Main.ts
@@ -84,6 +84,112 @@ interface DataOption {
   name: string;
 }
 
+interface RangeAge {
+  min: number;
+  max: number;
+}
+
+interface DataStructureTree {
+  labelName: string;
+  orgCode: string;
+  orgLevel: number;
+  orgName: string;
+  orgRevisionId: string;
+  orgRootName: string;
+  orgTreeCode: string;
+  orgTreeFax: string;
+  orgTreeId: string;
+  orgTreeName: string;
+  orgTreeOrder: number;
+  orgTreePhoneEx: string;
+  orgTreePhoneIn: string;
+  orgTreeRank: string;
+  orgTreeRankSub: string;
+  orgTreeShortName: string;
+  responsibility: string;
+  totalPosition: number;
+  totalPositionCurrentUse: number;
+  totalPositionCurrentVacant: number;
+  totalPositionNextUse: number;
+  totalPositionNextVacant: number;
+  totalRootPosition: number;
+  totalRootPositionCurrentUse: number;
+  totalRootPositionCurrentVacant: number;
+  totalRootPositionNextUse: number;
+  totalRootPositionNextVacant: number;
+  children: DataStructureTree[];
+  orgRootCode: string;
+  orgRootShortName: string;
+}
+
+interface DataNodeData {
+  name: string;
+  nodeId: string | null | undefined;
+  node: string | null | undefined | number;
+}
+
+interface FormFilter {
+  page: number;
+  pageSize: number;
+  keyword: string;
+  type: string;
+  searchType?: string;
+  posType: string;
+  posLevel: string;
+  retireYear: string | null;
+  rangeYear: { min: number; max: number };
+  isShowRetire: boolean | null;
+  isProbation: boolean | null;
+  isAll?: boolean;
+  nodeId?: string | null;
+  node?: string | null | number;
+  retireType?: null | string;
+}
+
+interface PosType {
+  id: string;
+  posTypeName: string;
+  posTypeRank: number;
+  posLevels: PosLevel[];
+  createdAt: Date | null;
+  lastUpdatedAt: Date | null;
+  lastUpdateFullName: string;
+}
+
+interface PosLevel {
+  id: string;
+  posLevelName: string;
+  posLevelRank: number;
+  posLevelAuthority: string;
+  createdAt: Date | null;
+  lastUpdatedAt: Date | null;
+  lastUpdateFullName: string;
+}
+
+interface OptionExecutive {
+  id: string;
+  posExecutiveName: string;
+}
+
+interface ResOptionPerson {
+  createdAt: string;
+  createdFullName: string;
+  createdUserId: string;
+  id: string;
+  lastUpdateFullName: string;
+  lastUpdateUserId: string;
+  lastUpdatedAt: string;
+  name: string;
+}
+
+interface DataEducationLevel {
+  createdAt: string;
+  createdFullName: string;
+  id: string;
+  lastUpdatedAt: string;
+  name: string;
+  rank: number;
+}
 export type {
   ListDataText,
   DataSurvey,
@@ -93,4 +199,13 @@ export type {
   ProbationReportType,
   FileType,
   DataOption,
+  RangeAge,
+  DataStructureTree,
+  DataNodeData,
+  FormFilter,
+  PosType,
+  PosLevel,
+  OptionExecutive,
+  ResOptionPerson,
+  DataEducationLevel
 };
diff --git a/src/modules/21_report/store.ts b/src/modules/21_report/store.ts
new file mode 100644
index 000000000..815a65d79
--- /dev/null
+++ b/src/modules/21_report/store.ts
@@ -0,0 +1,33 @@
+import { defineStore } from "pinia";
+import { ref, reactive } from "vue";
+
+import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
+import type {
+  DataType,
+  DataLevel,
+} from "@/modules/04_registryPerson/interface/response/Main";
+import type { FormFilter } from "@/modules/21_report/interface/Main";
+
+export const useReportStore = defineStore("reportStore", () => {
+  const formFilter = reactive<FormFilter>({
+    page: 1,
+    pageSize: 12,
+    keyword: "",
+    type: "officer",
+    posType: "",
+    posLevel: "",
+    retireYear: "",
+    rangeYear: { min: 0, max: 60 },
+    isShowRetire: false,
+    isProbation: false,
+    isAll: true,
+    nodeId: null,
+    node: null,
+    searchType: "fullName",
+    retireType: null,
+  });
+
+  return {
+    formFilter,
+  };
+});
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 842d1e43b..4f54be26a 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, computed } from "vue";
-import { useQuasar } from "quasar";
+import { useQuasar, type QTableProps } from "quasar";
 import { VuePDF, usePDF } from "@tato30/vue-pdf";
 import axios from "axios";
 import genReportXLSX from "@/plugins/genreportxlsx";
@@ -9,31 +9,41 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
-
+import { useReportStore } from "@/modules/21_report/store";
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
+import type {
+  RangeAge,
+  PosType,
+  PosLevel,
+  DataOption,
+  OptionExecutive,
+  ResOptionPerson,
+  DataEducationLevel,
+} from "@/modules/21_report/interface/Main";
 
 import LoadView from "@/components/LoadView.vue";
+import DialogOrg from "@/modules/21_report/components/01_org/DialogOrg.vue";
 
 const $q = useQuasar();
-const { messageError, showLoader, hideLoader } = useCounterMixin();
+const storeReport = useReportStore();
+
+const mixin = useCounterMixin();
+const { messageError, showLoader, hideLoader, date2Thai } = mixin;
+
 const loadingBtn = ref<boolean>(false);
-const year = ref<number>(new Date().getFullYear());
+const total = ref<number>(0);
 const employeeClass = ref<string>("officer");
 const employeeClassOption = ref<OptionData[]>([
   { id: "officer", name: "ข้าราชการ กทม. สามัญ" },
   { id: "employee", name: "ลูกจ้างประจำ กทม." },
 ]);
 
-const splitterModel = ref(14);
-const numOfPages = ref<number>(0);
-const page = ref<number>(1);
-const pdfSrc = ref<any>();
-
-interface RangeAge {
-  min: number;
-  max: number;
-}
+const rows = ref<any[]>([]);
+const detailReport = ref<any>();
 
+/** ช่วงเวลา */
+const dateStart = ref<Date | null>(null); //บรรจุตั้งเเต่วันที่
+const dateEnd = ref<Date | null>(null); //บรรจุถึงวันที่
 const objMarkerLabel = computed(() => {
   return { 39: `ช่วงอายุ ${rangeAge.value.min}-${rangeAge.value.max} ปี` };
 });
@@ -43,38 +53,432 @@ const rangeAge = ref<RangeAge>({
   max: 60,
 });
 
-const detailReport = ref<any>();
+/** ตัวแปรประเภทตำแหน่ง */
+const posType = ref<string>(""); //ประเภทตำแหน่ง
+const posTypeMainOp = ref<PosType[]>([]); //ตัวเลือกประเภทตำแหน่งหลัก
+const posTypeOp = ref<PosType[]>(posTypeMainOp.value); //ตัวเลือกประเภทตำแหน่ง
 
-/** ไปหน้าต่อไปของรายงาน */
-function nextPage() {
-  if (page.value < numOfPages.value) {
-    page.value++;
+const posLevel = ref<string>(""); //ตัวแปร ระดับตำแหน่ง
+const posLevelMainOp = ref<PosLevel[]>([]); //ตัวเลิอก ระดับตำแหน่งหลัก
+const posLevelOp = ref<PosLevel[]>(posLevelMainOp.value); //ตัวเลิอก ระดับตำแหน่ง
+
+const position = ref<string>(""); //ตำแหน่งในสายงาน
+const positionOp = ref<DataOption[]>([]); //ตำแหน่งในสายงาน option
+const positionMainOp = ref<DataOption[]>([]); //ตำแหน่งในสายงาน optionMain
+
+const positionExecutive = ref<string>(""); //ตำแหน่งทางการบริหาร
+const executiveOps = ref<DataOption[]>([]); //ตัวเลือกรายการตำแหน่งทางการบริหาร
+const executiveOpsMain = ref<DataOption[]>([]); //ตัวเลือกรายการตำแหน่งทางการบริหาร
+
+/** สภานภาพ */
+const gender = ref<string>(""); //เพศ
+const genderOpsMain = ref<DataOption[]>([]); //ตัวเลือกหลัก เพศ
+const genderOps = ref<DataOption[]>([]); //ตัวเลือก เพศ
+
+const status = ref<string>(""); //สถานภาพ
+const statusOpsMain = ref<DataOption[]>([]); //ตัวเลือกหลัก สถานภาพ
+const statusOps = ref<DataOption[]>([]); //ตัวเลือก สถานภาพ
+
+const education = ref<string>("");
+const educationOp = ref<DataOption[]>([]);
+const educationOpMain = ref<DataOption[]>([]);
+
+/** ตัวแปรสังกัด */
+const modalOrg = ref<boolean>(false);
+const org = ref<string>("");
+
+const visibleColumns = ref<string[]>([
+  "no",
+  "fullName",
+  "posNo",
+  "position",
+  "posPath",
+  "posType",
+  "posLevel",
+  "org",
+  "positionExecutive",
+  "gender",
+  "status",
+  "education",
+  "date",
+  "age",
+  "currentPosition",
+  "lengthPosition",
+]);
+
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "fullName",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: "fullName",
+    headerStyle: "font-size: 14px; min-width: 200px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่งในสายงาน",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "posPath",
+    align: "left",
+    label: "ตำแหน่งประเภท",
+    sortable: true,
+    field: "posType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "posLevel",
+    align: "left",
+    label: "ระดับ",
+    sortable: true,
+    field: "posLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.posTypeShortName
+        ? row.posTypeShortName + " " + row.posLevel
+        : row.posLevel;
+    },
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "org",
+    align: "left",
+    label: "สังกัด",
+    sortable: true,
+    field: "org",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "positionExecutive",
+    align: "left",
+    label: "ตำแหน่งทางการบริหาร",
+    sortable: true,
+    field: "positionExecutive",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "gender",
+    align: "left",
+    label: "เพศ",
+    sortable: true,
+    field: "gender",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานภาพ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "education",
+    align: "left",
+    label: "วุฒิการศึกษา",
+    sortable: true,
+    field: "education",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "date",
+    align: "left",
+    label: "วันที่บรรจุ",
+    sortable: true,
+    field: "date",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "age",
+    align: "left",
+    label: "อายุ",
+    sortable: true,
+    field: "age",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "currentPosition",
+    align: "left",
+    label: "ระยะเวลาดำรงตำแหน่งปัจจุบัน",
+    sortable: true,
+    field: "currentPosition",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "lengthPosition",
+    align: "left",
+    label: "ระยะเวลาดำรงตำแหน่งในเเต่ละระดับ",
+    sortable: true,
+    field: "lengthPosition",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+]);
+
+function onOpenOrg() {
+  modalOrg.value = true;
+}
+
+/**
+ * ฟังก์ชั่นค้นหาข้อมูลของ Option Filter
+ * @param val คำที่ค้นหา
+ * @param update Function
+ * @param typeOp ประเภทของ Select
+ */
+function filterOption(val: string, update: any, typeOp: string) {
+  update(() => {
+    const needle = val.toLowerCase();
+    if (typeOp == "type") {
+      posTypeOp.value = posTypeMainOp.value.filter(
+        (v: any) => v.posTypeName.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (typeOp == "level") {
+      posLevelOp.value = posLevelMainOp.value.filter(
+        (v: any) => v.posLevelName.toString().toLowerCase().indexOf(needle) > -1
+      );
+    } else if (typeOp == "pos") {
+      positionOp.value = positionMainOp.value.filter(
+        (v: DataOption) => v.name.indexOf(val) > -1
+      );
+    } else if (typeOp == "Executive") {
+      executiveOps.value = executiveOpsMain.value.filter(
+        (v: DataOption) => v.name.indexOf(val) > -1
+      );
+    } else if (typeOp == "gender") {
+      genderOps.value = genderOpsMain.value.filter(
+        (v: DataOption) => v.name.indexOf(val) > -1
+      );
+    } else if (typeOp == "status") {
+      statusOps.value = statusOpsMain.value.filter(
+        (v: DataOption) => v.name.indexOf(val) > -1
+      );
+    } else if (typeOp == "education") {
+      educationOp.value = educationOpMain.value.filter(
+        (v: DataOption) => v.name.indexOf(val) > -1
+      );
+    }
+  });
+}
+
+/**
+ * อัปเดตข้อมูล ระดับตามประเภท
+ * @param val ประเภท
+ */
+function updateLevel(val: string) {
+  posType.value = val;
+
+  if (val) {
+    const listData: any = posTypeMainOp.value.find(
+      (item: PosType) => item.posTypeName == val
+    );
+    if (employeeClass.value === "officer") {
+      posLevelMainOp.value = listData ? listData.posLevels : [];
+    } else {
+      posLevelMainOp.value = listData
+        ? listData.posLevels.map((e: any) => ({
+            ...e,
+            posLevelName: `${listData?.posTypeShortName} ${e.posLevelName}`,
+          }))
+        : [];
+    }
   }
 }
 
-/** กลับหน้าก่อนหน้าของรายงาน */
-function backPage() {
-  if (page.value !== 1) {
-    page.value--;
-  }
+/**
+ * ฟังก์เรียกข้อมูลรายการประเภทตำแหน่ง
+ */
+async function getType() {
+  posType.value = "";
+  posLevel.value = "";
+  posTypeMainOp.value = [];
+  posTypeOp.value = [];
+  posLevelOp.value = [];
+  const apiPath =
+    employeeClass.value === "officer"
+      ? config.API.orgPosType
+      : config.API.orgEmployeeType;
+  await http.get(apiPath).then(async (res) => {
+    posTypeMainOp.value = await res.data.result;
+  });
 }
 
-async function getReport() {
+/** ดึงข้อมูลตำแหน่ง */
+async function getOptions() {
+  await http.get(config.API.orgSalaryPosition).then((res) => {
+    const dataOp = res.data.result;
+    const uniqueNames = new Set();
+    const filteredData = dataOp
+      .filter((item: any) => {
+        if (!uniqueNames.has(item.positionName)) {
+          uniqueNames.add(item.positionName);
+          return true;
+        }
+        return false;
+      })
+      .map((item: any) => ({
+        id: item.positionName,
+        name: item.positionName,
+      }));
+
+    positionMainOp.value = filteredData;
+  });
+}
+
+/**
+ * ฟังก์เรียกข้อมูลรายการตำแหน่งทางการบริหาร
+ */
+async function getExecutive() {
+  await http
+    .get(config.API.orgPosExecutive)
+    .then(async (res) => {
+      const list = await res.data.result.map((e: OptionExecutive) => ({
+        id: e.id,
+        name: e.posExecutiveName,
+      }));
+      executiveOpsMain.value = list;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+}
+
+/** ดึงข้อมูลรายละเอียดข้อมูลทางกายภาพ */
+function getDataPerson() {
+  http.get(config.API.profileNewMetaMain).then((res) => {
+    const data = res.data.result;
+    let optiongenders: DataOption[] = [];
+    data.genders.map((r: ResOptionPerson) => {
+      optiongenders.push({
+        id: r.id.toString(),
+        name: r.name.toString(),
+      });
+    });
+    genderOpsMain.value = optiongenders;
+
+    let optionrelationships: DataOption[] = [];
+    data.relationships.map((r: ResOptionPerson) => {
+      optionrelationships.push({
+        id: r.id.toString(),
+        name: r.name.toString(),
+      });
+    });
+    statusOpsMain.value = optionrelationships;
+  });
+}
+
+/** function ดึง ข้อมูลระดับการศึกษา*/
+function getEducationLevel() {
+  http
+    .get(config.API.orgEducationLevel)
+    .then(async (res) => {
+      const list = res.data.result.map((r: DataEducationLevel) => ({
+        id: r.id,
+        name: r.name,
+      }));
+      educationOpMain.value = list;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+}
+
+async function onSearch() {
   loadingBtn.value = true;
+
+  const queryParams = {
+    nodeId: storeReport.formFilter.nodeId,
+
+    posType: posType.value,
+    posLevel: posLevel.value,
+    position: position.value,
+    positionExecutive: positionExecutive.value,
+    gender: gender.value,
+    status: status.value,
+    education: education.value,
+    ageMin: rangeAge.value.min,
+    ageMax: rangeAge.value.max,
+    dateStart: dateStart.value,
+    dateEnd: dateEnd.value,
+  };
+  showLoader();
   await http
     .get(
       config.API.reportOrgByType(
         employeeClass.value == "officer" ? "officer" : "emp"
-      ) +
-        `?rootId=&year=${year.value}&ageMin=${rangeAge.value.min}&ageMax=${rangeAge.value.max}`
+      ),
+      { params: queryParams }
     )
     .then(async (res) => {
       const data = res.data.result;
-      detailReport.value = data;
-      await fetchDocumentTemplate(data);
+      rows.value = data;
     })
     .catch((e) => {
       messageError($q, e);
+      hideLoader();
     })
     .finally(() => {
       setTimeout(() => {
@@ -83,42 +487,21 @@ async function getReport() {
     });
 }
 
-/**
- * function เรียกไฟล์ PDF
- * @param data  ข้อมูลบัญชีวันลา
- */
-async function fetchDocumentTemplate(data: any) {
-  await axios
-    .post(`${config.API.reportTemplate}/xlsx`, data, {
-      headers: {
-        accept: "application/pdf",
-        "content-Type": "application/json",
-      },
-      responseType: "blob",
-    })
-    .then(async (res) => {
-      const blob = new Blob([res.data]);
-      const objectUrl = URL.createObjectURL(blob);
-      const pdfData = usePDF(`${objectUrl}`);
-
-      setTimeout(() => {
-        pdfSrc.value = pdfData.pdf.value;
-        numOfPages.value = pdfData.pages.value;
-      }, 1500);
-    })
-    .catch(async (e) => {
-      messageError($q, JSON.parse(await e.response.data.text()));
-    });
-}
-
 onMounted(async () => {
   showLoader();
-  Promise.all([getReport()])
+  Promise.all([
+    getType(),
+    getOptions(),
+    getExecutive(),
+    getDataPerson(),
+    getEducationLevel(),
+  ])
     .then(() => {
       hideLoader();
     })
     .catch((e) => {
       messageError($q, e);
+      hideLoader();
     })
     .finally(() => {
       setTimeout(() => {
@@ -135,286 +518,535 @@ onMounted(async () => {
 
   <div class="q-pa-sm q-gutter-sm">
     <q-card flat bordered class="col-12">
-      <div class="row q-col-gutter-sm q-pa-sm">
-        <div class="row col-12">
-          <q-select
-            outlined
-            dense
-            v-model="employeeClass"
-            :options="employeeClassOption"
-            label="สภานภาพ"
-            emit-value
-            map-options
-            option-label="name"
-            option-value="id"
-            style="width: 230px"
-            @update:model-value="getReport"
-          >
-          </q-select>
-
-          <q-space />
-          <q-btn
-            :loading="loadingBtn"
-            flat
-            round
-            color="primary"
-            icon="download"
-            v-if="checkPermission($route)?.attrIsGet"
-          >
-            <q-menu>
-              <q-list style="min-width: 150px">
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    genReportXLSX(
-                      detailReport,
-                      `${
-                        employeeClass == 'officer'
-                          ? 'รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ'
-                          : 'รายงานสถิติข้อมูลลูกจ้างประจำ กทม.'
-                      }`,
-                      'pdf'
-                    )
-                  "
-                >
-                  <q-item-section avatar
-                    ><q-icon color="red" name="mdi-file-pdf"
-                  /></q-item-section>
-                  <q-item-section>ไฟล์ .pdf</q-item-section>
-                </q-item>
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    genReportXLSX(
-                      detailReport,
-                      `${
-                        employeeClass == 'officer'
-                          ? 'รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ'
-                          : 'รายงานสถิติข้อมูลลูกจ้างประจำ กทม.'
-                      }`,
-                      'xlsx'
-                    )
-                  "
-                >
-                  <q-item-section avatar
-                    ><q-icon color="green" name="mdi-file-excel"
-                  /></q-item-section>
-                  <q-item-section>ไฟล์ .xlsx</q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
-          </q-btn>
-        </div>
-
-        <div class="row col-12">
-          <q-card bordered class="col-12 filter-card q-pa-sm">
-            <div class="row col-12 q-col-gutter-sm items-center">
-              <div class="col-md-4 col-xs-12">
-                <datepicker
-                  menu-class-name="modalfix"
-                  v-model="year"
-                  :locale="'th'"
-                  autoApply
-                  year-picker
-                  :enableTimePicker="false"
-                  @update:model-value="getReport"
-                >
-                  <template #year="{ year }">{{ year + 543 }}</template>
-                  <template #year-overlay-value="{ value }">{{
-                    parseInt(value + 543)
-                  }}</template>
-                  <template #trigger>
-                    <q-input
-                      dense
-                      outlined
-                      :model-value="year === 0 ? 'ทั้งหมด' : Number(year) + 543"
-                      :label="`${'ปีงบประมาณ'}`"
-                      bg-color="white"
-                    >
-                      <template v-slot:prepend>
-                        <q-icon
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </template>
-                </datepicker>
-              </div>
-              <div class="col-md-4 col-xs-12">
-                <div class="q-px-lg">
-                  <q-range
-                    v-model="rangeAge"
-                    :min="18"
-                    :max="60"
-                    label
-                    :marker-labels="objMarkerLabel"
-                    color="primary"
-                    @change="getReport"
-                  >
-                  </q-range>
-                </div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-      </div>
-    </q-card>
-    <q-card flat bordered class="col-12">
-      <q-card-section :horizontal="$q.screen.gt.sm">
-        <!-- <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm">
-          <div class="col">
-            <q-input dense outlined v-model="filterTree" label="ค้นหา">
-              <template v-slot:append>
-                <q-icon name="search" />
+      <q-form
+        greedy
+        @submit.prevent
+        @validation-success="onSearch"
+        class="q-px-sm q-pt-sm"
+      >
+        <div class="row q-col-gutter-sm q-mb-sm">
+          <div class="col-3">
+            <q-select
+              outlined
+              dense
+              v-model="employeeClass"
+              :options="employeeClassOption"
+              label="สภานภาพ"
+              emit-value
+              map-options
+              option-label="name"
+              option-value="id"
+            >
+            </q-select>
+          </div>
+          <div class="col-lg-8 col-md-7 col-sm-6">
+            <q-input
+              outlined
+              dense
+              :model-value="org"
+              label="สังกัด"
+              @click="onOpenOrg"
+            >
+              <template v-if="org" v-slot:append>
+                <q-icon
+                  name="cancel"
+                  @click.stop.prevent="org = ''"
+                  class="cursor-pointer"
+                />
               </template>
             </q-input>
           </div>
-
-          <div class="bg-white tree-container q-pa-xs">
-            <q-tree
-              dense
-              :nodes="node"
-              node-key="orgTreeId"
-              label-key="labelName"
-              v-model:expanded="expanded"
-              :filter="filterTree.trim()"
-              no-results-label="ไม่พบข้อมูลที่ค้นหา"
-              no-nodes-label="ไม่มีข้อมูล"
+          <q-space />
+          <div>
+            <q-btn
+              :loading="loadingBtn"
+              flat
+              round
+              color="primary"
+              icon="download"
+              v-if="checkPermission($route)?.attrIsGet"
+              :disable="!org"
             >
-              <template v-slot:default-header="prop">
-                <q-item
-                  @click.stop="
-                    onSelectedNode(prop.node.orgTreeId, prop.node.orgLevel)
-                  "
-                  :active="nodeId === prop.node.orgTreeId"
-                  clickable
-                  active-class="my-list-link text-primary text-weight-medium"
-                  class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
-                >
-                  <div>
-                    <div class="text-weight-medium">
-                      {{ prop.node.orgTreeName }}
-                    </div>
-                    <div class="text-weight-light text-grey-8">
-                      {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
-                      {{
-                        prop.node.orgTreeShortName == null
-                          ? null
-                          : prop.node.orgTreeShortName
-                      }}
-                    </div>
-                  </div>
-                </q-item>
-              </template>
-            </q-tree>
+              <q-menu>
+                <q-list style="min-width: 150px">
+                  <q-item
+                    clickable
+                    v-close-popup
+                    @click="
+                      genReportXLSX(
+                        detailReport,
+                        `${
+                          employeeClass == 'officer'
+                            ? 'รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ'
+                            : 'รายงานสถิติข้อมูลลูกจ้างประจำ กทม.'
+                        }`,
+                        'pdf'
+                      )
+                    "
+                  >
+                    <q-item-section avatar
+                      ><q-icon color="red" name="mdi-file-pdf"
+                    /></q-item-section>
+                    <q-item-section>ไฟล์ .pdf</q-item-section>
+                  </q-item>
+                  <q-item
+                    clickable
+                    v-close-popup
+                    @click="
+                      genReportXLSX(
+                        detailReport,
+                        `${
+                          employeeClass == 'officer'
+                            ? 'รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ'
+                            : 'รายงานสถิติข้อมูลลูกจ้างประจำ กทม.'
+                        }`,
+                        'xlsx'
+                      )
+                    "
+                  >
+                    <q-item-section avatar
+                      ><q-icon color="green" name="mdi-file-excel"
+                    /></q-item-section>
+                    <q-item-section>ไฟล์ .xlsx</q-item-section>
+                  </q-item>
+                </q-list>
+              </q-menu>
+            </q-btn>
           </div>
-        </q-card-section> -->
+        </div>
 
-        <q-separator :vertical="$q.screen.gt.xs" />
-
-        <q-card-section class="col-lg-12 col-md-12 col-xs-12 scroll">
-          <q-splitter
-            v-model="splitterModel"
-            horizontal
-            style="
-              height: 65vh;
-              border: 1px solid rgb(210, 210, 210);
-              border-radius: 5px;
+        <q-card bordered class="filter-card q-pa-sm q-mb-sm">
+          <div class="row q-col-gutter-y-sm">
+            <div class="col-12">
+              <div class="row q-col-gutter-sm items-center">
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    class="bg-white"
+                    hide-bottom-space
+                    outlined
+                    dense
+                    lazy-rules
+                    borderless
+                    hide-selected
+                    :model-value="posType == '' ? 'ทั้งหมด' : posType"
+                    :label="`${
+                      employeeClass == 'officer' ? 'ประเภทตำแหน่ง' : 'กลุ่มงาน'
+                    }`"
+                    emit-value
+                    map-options
+                    :options="posTypeOp"
+                    option-value="posTypeName"
+                    option-label="posTypeName"
+                    use-input
+                    fill-input
+                    @update:model-value="(value:string)=>(posLevel = '',updateLevel(value))"
+                    @filter="(inputValue:any, doneFn:Function) =>
+              filterOption(inputValue, doneFn,'type')
             "
-            before-class="overflow-hidden disable"
-            separator-class="bg-white disabled"
-          >
-            <template v-slot:before>
-              <div class="q-px-sm">
-                <div class="row items-start items-center">
-                  <div class="col">
-                    <q-btn
-                      padding="xs"
-                      icon="mdi-chevron-left"
-                      color="grey-2"
-                      text-color="grey-5"
-                      size="md"
-                      class="my-auto"
-                      @click="backPage"
-                      :disable="page == 1"
-                    />
-                  </div>
-                  <div class="col-12 col-md-auto">
-                    <div class="q-pa-md flex">
-                      หน้าที่ {{ page }} จาก {{ numOfPages }}
-                    </div>
-                  </div>
-                  <div class="col text-right">
-                    <q-btn
-                      padding="xs"
-                      icon="mdi-chevron-right"
-                      color="grey-2"
-                      text-color="grey-5"
-                      size="md"
-                      @click="nextPage"
-                      :disable="page === numOfPages"
-                    />
-                  </div>
+                  >
+                    <template v-if="posType" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="(posType = ''), (posLevel = '')"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      />
+                    </template>
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                  </q-select>
+                </div>
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    class="bg-white"
+                    hide-bottom-space
+                    outlined
+                    dense
+                    :readonly="!posType"
+                    lazy-rules
+                    borderless
+                    hide-selected
+                    :model-value="posLevel == '' ? 'ทั้งหมด' : posLevel"
+                    :label="`${
+                      employeeClass == 'officer'
+                        ? 'ระดับตำแหน่ง'
+                        : 'ระดับชั้นงาน'
+                    }`"
+                    emit-value
+                    map-options
+                    :options="posLevelOp"
+                    option-value="posLevelName"
+                    option-label="posLevelName"
+                    use-input
+                    fill-input
+                    @filter="(inputValue:any, doneFn:Function) =>
+              filterOption(inputValue, doneFn,'level')
+              
+            "
+                    @update:model-value="(value:string)=>(posLevel = value)"
+                  >
+                    <template v-if="posLevel" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="posLevel = ''"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      />
+                    </template>
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                  </q-select>
+                </div>
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    dense
+                    :model-value="position == '' ? 'ทั้งหมด' : position"
+                    label="ตำแหน่งในสายงาน"
+                    outlined
+                    emit-value
+                    map-options
+                    fill-input
+                    hide-selected
+                    lazy-rules
+                    bg-color="white"
+                    :rules="[(val:string) => !!val || `${'กรุณาเลือกตำแหน่งในสายงาน'}`,]"
+                    hide-bottom-space
+                    option-label="name"
+                    option-value="name"
+                    :options="positionOp"
+                    use-input
+                    @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn,'pos') "
+                    @update:model-value="(value:string)=>(position = value)"
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                    <template v-if="position" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="position = ''"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      /> </template
+                  ></q-select>
+                </div>
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    label="ตำแหน่งทางการบริหาร"
+                    :model-value="
+                      positionExecutive == '' ? 'ทั้งหมด' : positionExecutive
+                    "
+                    :options="executiveOps"
+                    emit-value
+                    dense
+                    map-options
+                    outlined
+                    option-label="name"
+                    option-value="name"
+                    fill-input
+                    use-input
+                    hide-selected
+                    bg-color="white"
+                    @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn,'Executive') "
+                    @update:model-value="(value:string)=>(positionExecutive = value)"
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                    <template v-if="positionExecutive" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="positionExecutive = ''"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      />
+                    </template>
+                  </q-select>
+                </div>
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    label="เพศ"
+                    :model-value="gender == '' ? 'ทั้งหมด' : gender"
+                    :options="genderOps"
+                    emit-value
+                    dense
+                    map-options
+                    outlined
+                    option-label="name"
+                    option-value="name"
+                    fill-input
+                    use-input
+                    hide-selected
+                    bg-color="white"
+                    @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn,'gender') "
+                    @update:model-value="(value:string)=>(gender = value)"
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                    <template v-if="gender" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="gender = ''"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      />
+                    </template>
+                  </q-select>
                 </div>
-              </div>
-            </template>
-            <template v-slot:after>
-              <div class="q-pa-md">
-                <LoadView v-if="loadingBtn" />
-                <VuePDF
-                  v-else
-                  ref="vuePDFRef"
-                  :pdf="pdfSrc"
-                  :page="page"
-                  fit-parent
-                />
-              </div>
-            </template>
-            <template v-slot:default>
-              <div class="q-pa-md">
-                <div class="row items-start items-center">
-                  <div class="col">
-                    <q-btn
-                      padding="xs"
-                      icon="mdi-chevron-left"
-                      color="grey-2"
-                      text-color="grey-5"
-                      size="md"
-                      class="my-auto"
-                      @click="backPage"
-                      :disable="page == 1"
-                    />
-                  </div>
 
-                  <div class="col-12 col-md-auto">
-                    <div class="q-pa-md flex">
-                      หน้าที่ {{ page }} จาก {{ numOfPages }}
-                    </div>
-                  </div>
-                  <div class="col text-right">
-                    <q-btn
-                      padding="xs"
-                      icon="mdi-chevron-right"
-                      color="grey-2"
-                      text-color="grey-5"
-                      size="md"
-                      @click="nextPage"
-                      :disable="page === numOfPages"
-                    />
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    label="สถานภาพ"
+                    :model-value="status == '' ? 'ทั้งหมด' : status"
+                    :options="statusOps"
+                    emit-value
+                    dense
+                    map-options
+                    outlined
+                    option-label="name"
+                    option-value="name"
+                    fill-input
+                    use-input
+                    hide-selected
+                    bg-color="white"
+                    @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn,'status') "
+                    @update:model-value="(value:string)=>(status = value)"
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                    <template v-if="status" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="status = ''"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      />
+                    </template>
+                  </q-select>
+                </div>
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <q-select
+                    label="วุฒิการศึกษา"
+                    :model-value="education == '' ? 'ทั้งหมด' : education"
+                    :options="educationOp"
+                    emit-value
+                    dense
+                    map-options
+                    outlined
+                    option-label="name"
+                    option-value="name"
+                    fill-input
+                    use-input
+                    hide-selected
+                    bg-color="white"
+                    @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn,'education') "
+                    @update:model-value="(value:string)=>(education = value)"
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                    <template v-if="education" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="education = ''"
+                        class="cursor-pointer"
+                        style="opacity: 0.6"
+                      />
+                    </template>
+                  </q-select>
+                </div>
+              </div>
+            </div>
+            <div class="col-12">
+              <div class="row q-col-gutter-sm items-center">
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <datepicker
+                    menu-class-name="modalfix"
+                    v-model="dateStart"
+                    :locale="'th'"
+                    autoApply
+                    date-picker
+                    :enableTimePicker="false"
+                    @update:model-value="dateEnd = null"
+                  >
+                    <template #year="{ year }">{{ year + 543 }}</template>
+                    <template #year-overlay-value="{ value }">{{
+                      parseInt(value + 543)
+                    }}</template>
+                    <template #trigger>
+                      <q-input
+                        dense
+                        outlined
+                        :model-value="
+                          dateStart === null ? '' : date2Thai(dateStart)
+                        "
+                        :label="`${'บรรจุตั้งเเต่วันที่'}`"
+                        bg-color="white"
+                      >
+                        <template v-slot:prepend>
+                          <q-icon
+                            name="event"
+                            class="cursor-pointer"
+                            style="color: var(--q-primary)"
+                          >
+                          </q-icon>
+                        </template>
+                        <template v-if="dateStart" v-slot:append>
+                          <q-icon
+                            name="cancel"
+                            @click.stop.prevent="
+                              (dateStart = null), (dateEnd = null)
+                            "
+                            class="cursor-pointer"
+                            style="opacity: 0.6"
+                          />
+                        </template>
+                      </q-input>
+                    </template>
+                  </datepicker>
+                </div>
+                <div class="col-lg-2 col-md-4 col-sm-12">
+                  <datepicker
+                    menu-class-name="modalfix"
+                    v-model="dateEnd"
+                    :locale="'th'"
+                    autoApply
+                    :readonly="!dateStart"
+                    date-picker
+                    :enableTimePicker="false"
+                    :min-date="dateStart"
+                  >
+                    <template #year="{ year }">{{ year + 543 }}</template>
+                    <template #year-overlay-value="{ value }">{{
+                      parseInt(value + 543)
+                    }}</template>
+                    <template #trigger>
+                      <q-input
+                        dense
+                        :readonly="!dateStart"
+                        outlined
+                        :model-value="
+                          dateEnd === null ? '' : date2Thai(dateEnd)
+                        "
+                        :label="`${'บรรจุถึงวันที่'}`"
+                        bg-color="white"
+                      >
+                        <template v-slot:prepend>
+                          <q-icon
+                            name="event"
+                            class="cursor-pointer"
+                            style="color: var(--q-primary)"
+                          >
+                          </q-icon>
+                        </template>
+                      </q-input>
+                    </template>
+                  </datepicker>
+                </div>
+                <div class="col-lg-3 col-md-4 col-sm-12">
+                  <div class="q-px-lg">
+                    <q-range
+                      v-model="rangeAge"
+                      :min="18"
+                      :max="60"
+                      label
+                      :marker-labels="objMarkerLabel"
+                      color="primary"
+                    >
+                    </q-range>
                   </div>
                 </div>
               </div>
-            </template>
-          </q-splitter>
-        </q-card-section>
+            </div>
+          </div>
+        </q-card>
+
+        <div class="row items-center">
+          <div class="col-1">
+            <q-btn label="ค้นหา" unelevated color="public" type="submit">
+            </q-btn>
+          </div>
+          <div
+            class="offset-lg-8 offset-md-7 offset-sm-7 offset-xs-5 col-xs-6 col-sm-4 col-md-4 col-lg-3"
+          >
+            <div
+              class="row items-center q-pa-sm"
+              style="border: #c8d3db solid 1px; border-radius: 5px"
+            >
+              <div class="text-weight-medium">จำนวนที่พบทั้งหมด</div>
+              <q-space />
+              <q-badge color="primary" class="q-pa-xs">
+                {{ total.toLocaleString() }}
+              </q-badge>
+            </div>
+          </div>
+        </div>
+      </q-form>
+      <q-card-section class="q-pa-sm">
+        <d-table
+          :columns="columns"
+          :rows="rows"
+          row-key="id"
+          :visible-columns="visibleColumns"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width />
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div v-if="col.name === 'no'">
+                  {{ props.rowIndex + 1 }}
+                </div>
+                <div v-else class="table_ellipsis">
+                  {{ col.value ? col.value : "-" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
       </q-card-section>
     </q-card>
   </div>
+
+  <DialogOrg v-model:modal="modalOrg" v-model:name="org" />
 </template>
 
 <style lang="scss" scope>