diff --git a/src/modules/07_insignia/views/06_ReportMain.vue b/src/modules/07_insignia/views/06_ReportMain.vue
index 5f02e0595..e2e651ec6 100644
--- a/src/modules/07_insignia/views/06_ReportMain.vue
+++ b/src/modules/07_insignia/views/06_ReportMain.vue
@@ -1,51 +1,433 @@
 <script setup lang="ts">
-import { useRouter } from "vue-router";
-const router = useRouter();
+import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { VuePDF, usePDF } from "@tato30/vue-pdf";
+
+import { useRoute } from "vue-router";
+import { checkPermission } from "@/utils/permissions";
+import { useCounterMixin } from "@/stores/mixin";
+import { useStructureTree } from "@/stores/structureTree";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type { DataStructureTree } from "@/interface/main";
+import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
+
+import LoadView from "@/components/LoadView.vue";
+
+const $q = useQuasar();
+const route = useRoute();
+const { fetchStructureTree } = useStructureTree();
+const { messageError, showLoader, hideLoader } = useCounterMixin();
+
+const employeeClass = ref<string>("officer");
+const employeeClassOption = ref<OptionData[]>([
+  { id: "officer", name: "ข้าราชการ กทม. สามัญ" },
+  { id: "employee", name: "ลูกจ้างประจำ กทม." },
+]);
+
+const typeReport = ref<string>("");
+const optionReport = ref<OptionData[]>([
+  {
+    id: "45",
+    name: "บัญชีรายชื่อข้าราชการผู้ขอพระราชทานเครื่องราชอิสริยาภรณ์",
+  },
+  { id: "44", name: " บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี" },
+  { id: "43", name: " บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ 5 ปี" },
+]);
+
+const roundId = ref<string>("");
+const roundOtionMain = ref<any[]>([]);
+const roundOtion = ref<any[]>([]);
+
+/** tree*/
+const filterTree = ref<string>("");
+const nodeId = ref<string>("");
+const nodeLevel = ref<number>(0);
+const node = ref<DataStructureTree[]>([]);
+const expanded = ref<string[]>([]);
+
+const splitterModel = ref(14);
+const numOfPages = ref<number>(0);
+const page = ref<number>(1);
+const pdfSrc = ref<any>();
+
+const isLoadPDF = ref<boolean>(false);
+
+// /**
+//  * ฟังก์ชัน Redirect ไปหน้ารายงานที่เลือก
+//  * @param type  ประเภทรายงาน
+//  */
+// function nextPage(type: string) {
+//   router.push(`/insignia/report/${type}`);
+// }
+
+async function fetchDataTree() {
+  node.value = await fetchStructureTree(route.meta.Key as string, true);
+}
 
 /**
- * ฟังก์ชัน Redirect ไปหน้ารายงานที่เลือก
- * @param type  ประเภทรายงาน
+ * ฟังก์ชันคึงข้อมูลรอบการเสนอขอ
  */
-function nextPage(type: string) {
-  router.push(`/insignia/report/${type}`);
+async function fecthlistRound() {
+  showLoader();
+  await http
+    .get(config.API.listRoundInsignia(), { params: { path: "REPORT" } })
+    .then((res: any) => {
+      roundOtionMain.value = res.data.result.map((e: any) => ({
+        id: e.period_id,
+        year: e.period_year,
+        name: e.period_name,
+      }));
+      roundOtion.value = roundOtionMain.value;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 }
+
+/**
+ * function ค้นหาข้อมูลใน option
+ * @param val คำค้นหา
+ * @param update function
+ * @param name ชื่อ Selec
+ */
+function filterSelector(val: string, update: Function, name: string) {
+  update(() => {
+    const needle = val.toLowerCase();
+    if (name === "round") {
+      roundOtion.value = roundOtionMain.value.filter(
+        (v: OptionData) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    }
+  });
+}
+
+function onSelectedNode(id: string, level: number) {
+  nodeId.value = id;
+  nodeLevel.value = level;
+  onUpdateFilter();
+}
+
+/**
+ * ฟังก์ชันโหลดไฟล์
+ * @param type  ประเภทไฟล์
+ * @param download
+ */
+async function onUpdateFilter() {
+  if (typeReport.value && roundId.value && nodeId.value) {
+    isLoadPDF.value = true;
+    pdfSrc.value = undefined;
+
+    await http
+      .get(config.API.reportInsignia(typeReport.value, "pdf", roundId.value), {
+        responseType: "blob",
+      })
+      .then(async (res) => {
+        const url = URL.createObjectURL(new Blob([res.data]));
+        const pdfData = await usePDF(url);
+        await setTimeout(() => {
+          pdfSrc.value = pdfData.pdf.value;
+          numOfPages.value = pdfData.pages.value;
+        }, 1000);
+      })
+      .catch(async (e) => {
+        messageError($q, JSON.parse(await e.response.data.text()));
+      })
+      .finally(() => {
+        isLoadPDF.value = false;
+      });
+  }
+}
+
+/** ไปหน้าต่อไปของรายงาน */
+function nextPage() {
+  if (page.value < numOfPages.value) {
+    page.value++;
+  }
+}
+
+/** กลับหน้าก่อนหน้าของรายงาน */
+function backPage() {
+  if (page.value !== 1) {
+    page.value--;
+  }
+}
+
+function downloadReport(type: string) {}
+
+onMounted(async () => {
+  await Promise.all([fetchDataTree(), fecthlistRound()]);
+});
 </script>
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     รายงานเครื่องราชอิสริยาภรณ์
   </div>
-  <div>
-    <q-card flat bordered class="col-12 q-mt-sm">
-      <div class="q-pa-md">
-        <q-item clickable @click="nextPage('45')" dense class="hover-green">
-          <q-item-section avatar>
-            <q-icon color="primary" name="mdi-file" size="xs" />
-          </q-item-section>
-          <q-item-section class="text-dark">
-            บัญชีรายชื่อข้าราชการผู้ขอพระราชทานเครื่องราชอิสริยาภรณ์
-          </q-item-section>
-        </q-item>
 
-        <q-item clickable @click="nextPage('43')" dense class="hover-green">
-          <q-item-section avatar>
-            <q-icon color="primary" name="mdi-file" size="xs" />
-          </q-item-section>
-          <q-item-section class="text-dark">
-            บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี
-          </q-item-section>
-        </q-item>
+  <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="onUpdateFilter"
+          >
+          </q-select>
 
-        <q-item clickable @click="nextPage('44')" dense class="hover-green">
-          <q-item-section avatar>
-            <q-icon color="primary" name="mdi-file" size="xs" />
-          </q-item-section>
-          <q-item-section class="text-dark">
-            บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ
-          </q-item-section>
-        </q-item>
+          <q-space />
+          <q-btn
+            flat
+            round
+            :disable="!nodeId || !employeeClass || !roundId"
+            color="primary"
+            icon="download"
+            v-if="checkPermission($route)?.attrIsGet"
+          >
+            <q-menu>
+              <q-list style="min-width: 150px">
+                <q-item clickable v-close-popup @click="downloadReport('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="downloadReport('docx')">
+                  <q-item-section avatar
+                    ><q-icon color="blue" name="mdi-file-word"
+                  /></q-item-section>
+                  <q-item-section>ไฟล์ .docx</q-item-section>
+                </q-item>
+                <q-item clickable v-close-popup @click="downloadReport('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">
+              <div class="col-md-4 col-xs-12">
+                <q-select
+                  class="bg-white"
+                  hide-bottom-space
+                  outlined
+                  dense
+                  lazy-rules
+                  borderless
+                  v-model="typeReport"
+                  :label="`${'รายงาน'}`"
+                  emit-value
+                  map-options
+                  :options="optionReport"
+                  option-value="id"
+                  option-label="name"
+                  @update:model-value="onUpdateFilter"
+                />
+              </div>
+
+              <div class="col-md-4 col-xs-12">
+                <q-select
+                  class="bg-white"
+                  use-input
+                  fill-input
+                  hide-selected
+                  dense
+                  lazy-rules
+                  outlined
+                  v-model="roundId"
+                  :options="roundOtion"
+                  label="เลือกรอบ"
+                  option-value="id"
+                  option-label="name"
+                  emit-value
+                  map-options
+                  @update:model-value="onUpdateFilter"
+                  @filter="(inputValue:string,doneFn:Function) => 
+                  filterSelector(inputValue, doneFn,'round') "
+                >
+                  <template v-slot:no-option>
+                    <q-item>
+                      <q-item-section class="text-grey">
+                        ไม่มีข้อมูล
+                      </q-item-section>
+                    </q-item>
+                  </template>
+                </q-select>
+              </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" />
+              </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="ไม่มีข้อมูล"
+            >
+              <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>
+          </div>
+        </q-card-section>
+
+        <q-separator :vertical="$q.screen.gt.xs" />
+
+        <q-card-section class="col-lg-9 col-md-8 col-xs-12 scroll">
+          <q-splitter
+            v-model="splitterModel"
+            horizontal
+            style="
+              height: 65vh;
+              border: 1px solid rgb(210, 210, 210);
+              border-radius: 5px;
+            "
+            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>
+                </div>
+              </div>
+            </template>
+            <template v-slot:after>
+              <div class="q-pa-md">
+                <LoadView v-if="isLoadPDF" />
+                <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>
+                </div>
+              </div>
+            </template>
+          </q-splitter>
+        </q-card-section>
+      </q-card-section>
+    </q-card>
   </div>
 </template>
 
@@ -57,4 +439,18 @@ function nextPage(type: string) {
 .q-item.hover-green {
   padding: 10px;
 }
+
+.tree-container {
+  overflow: auto;
+  height: 60vh;
+  border: 1px solid #e6e6e7;
+  border-radius: 10px;
+}
+.my-list-link {
+  color: rgb(118, 168, 222);
+  border-radius: 5px;
+  background: #a3d3fb48 !important;
+  font-weight: 600;
+  border: 1px solid rgba(175, 185, 196, 0.217);
+}
 </style>
diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index 7422243b0..c26c5863b 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -289,6 +289,7 @@ onMounted(() => {
 
           <q-space />
           <q-btn
+            :disable="!isReport || !nodeId || !employeeClass"
             flat
             round
             color="primary"
@@ -360,7 +361,7 @@ onMounted(() => {
         <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">
-              <div class="col-3">
+              <div class="col-md-3 col-xs-12">
                 <q-select
                   class="bg-white"
                   hide-bottom-space
@@ -379,8 +380,11 @@ onMounted(() => {
                 />
               </div>
 
-              <div class="col-9 row q-col-gutter-sm" v-if="typeReport">
-                <div>
+              <div
+                class="row col-md-9 col-xs-12 q-col-gutter-sm"
+                v-if="typeReport"
+              >
+                <div class="col-md-3 col-xs-12">
                   <q-select
                     class="bg-white"
                     outlined
@@ -399,107 +403,115 @@ onMounted(() => {
                   </q-select>
                 </div>
 
-                <div class="row q-col-gutter-sm" v-if="yearType !== 'MONTH'">
-                  <datepicker
-                    v-model="year"
-                    :locale="'th'"
-                    autoApply
-                    year-picker
-                    :enableTimePicker="false"
-                    @update:model-value="updateLeaveday"
-                  >
-                    <template #year="{ year }">{{ year + 543 }}</template>
-                    <template #year-overlay-value="{ value }">{{
-                      parseInt(value + 543)
-                    }}</template>
-                    <template #trigger>
-                      <q-input
-                        class="bg-white"
-                        dense
-                        outlined
-                        :model-value="Number(year) + 543"
-                        :label="`${'ปีงบประมาณ'}`"
-                      >
-                        <template v-slot:prepend>
-                          <q-icon
-                            name="event"
-                            class="cursor-pointer"
-                            style="color: var(--q-primary)"
-                          >
-                          </q-icon>
-                        </template>
-                      </q-input>
-                    </template>
-                  </datepicker>
-
-                  <datepicker
-                    menu-class-name="modalfix"
-                    v-model="dateStart"
-                    :locale="'th'"
-                    autoApply
-                    :enableTimePicker="false"
-                    week-start="0"
-                    readonly
-                  >
-                    <template #year="{ year }">{{ year + 543 }}</template>
-                    <template #year-overlay-value="{ value }">{{
-                      parseInt(value + 543)
-                    }}</template>
-                    <template #trigger>
-                      <q-input
-                        class="bg-white"
-                        outlined
-                        dense
-                        borderless
-                        :model-value="dateStart ? date2Thai(dateStart) : null"
-                        :label="`${'ตั้งเเต่วันที่'}`"
-                        readonly
-                      >
-                        <template v-slot:prepend>
-                          <q-icon
-                            name="event"
-                            class="cursor-pointer"
-                            color="primary"
-                          >
-                          </q-icon>
-                        </template>
-                      </q-input>
-                    </template>
-                  </datepicker>
-                  <datepicker
-                    menu-class-name="modalfix"
-                    v-model="dateEnd"
-                    :locale="'th'"
-                    autoApply
-                    :enableTimePicker="false"
-                    week-start="0"
-                    readonly
-                  >
-                    <template #year="{ year }">{{ year + 543 }}</template>
-                    <template #year-overlay-value="{ value }">{{
-                      parseInt(value + 543)
-                    }}</template>
-                    <template #trigger>
-                      <q-input
-                        class="bg-white"
-                        outlined
-                        dense
-                        borderless
-                        :model-value="dateEnd ? date2Thai(dateEnd) : null"
-                        :label="`${'ถึงวันที่'}`"
-                        readonly
-                      >
-                        <template v-slot:prepend>
-                          <q-icon
-                            name="event"
-                            class="cursor-pointer"
-                            color="primary"
-                          >
-                          </q-icon>
-                        </template>
-                      </q-input>
-                    </template>
-                  </datepicker>
+                <div
+                  class="col-md-9 col-xs-12 row q-col-gutter-sm"
+                  v-if="yearType !== 'MONTH'"
+                >
+                  <div class="col-md-4">
+                    <datepicker
+                      v-model="year"
+                      :locale="'th'"
+                      autoApply
+                      year-picker
+                      :enableTimePicker="false"
+                      @update:model-value="updateLeaveday"
+                    >
+                      <template #year="{ year }">{{ year + 543 }}</template>
+                      <template #year-overlay-value="{ value }">{{
+                        parseInt(value + 543)
+                      }}</template>
+                      <template #trigger>
+                        <q-input
+                          class="bg-white"
+                          dense
+                          outlined
+                          :model-value="Number(year) + 543"
+                          :label="`${'ปีงบประมาณ'}`"
+                        >
+                          <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">
+                    <datepicker
+                      menu-class-name="modalfix"
+                      v-model="dateStart"
+                      :locale="'th'"
+                      autoApply
+                      :enableTimePicker="false"
+                      week-start="0"
+                      readonly
+                    >
+                      <template #year="{ year }">{{ year + 543 }}</template>
+                      <template #year-overlay-value="{ value }">{{
+                        parseInt(value + 543)
+                      }}</template>
+                      <template #trigger>
+                        <q-input
+                          class="bg-white"
+                          outlined
+                          dense
+                          borderless
+                          :model-value="dateStart ? date2Thai(dateStart) : null"
+                          :label="`${'ตั้งเเต่วันที่'}`"
+                          readonly
+                        >
+                          <template v-slot:prepend>
+                            <q-icon
+                              name="event"
+                              class="cursor-pointer"
+                              color="primary"
+                            >
+                            </q-icon>
+                          </template>
+                        </q-input>
+                      </template>
+                    </datepicker>
+                  </div>
+                  <div class="col-md-4">
+                    <datepicker
+                      menu-class-name="modalfix"
+                      v-model="dateEnd"
+                      :locale="'th'"
+                      autoApply
+                      :enableTimePicker="false"
+                      week-start="0"
+                      readonly
+                    >
+                      <template #year="{ year }">{{ year + 543 }}</template>
+                      <template #year-overlay-value="{ value }">{{
+                        parseInt(value + 543)
+                      }}</template>
+                      <template #trigger>
+                        <q-input
+                          class="bg-white"
+                          outlined
+                          dense
+                          borderless
+                          :model-value="dateEnd ? date2Thai(dateEnd) : null"
+                          :label="`${'ถึงวันที่'}`"
+                          readonly
+                        >
+                          <template v-slot:prepend>
+                            <q-icon
+                              name="event"
+                              class="cursor-pointer"
+                              color="primary"
+                            >
+                            </q-icon>
+                          </template>
+                        </q-input>
+                      </template>
+                    </datepicker>
+                  </div>
                 </div>
 
                 <div class="row" v-else>
diff --git a/src/modules/09_leave/views/07_ReportCheckin.vue b/src/modules/09_leave/views/07_ReportCheckin.vue
index e19a341ec..8bedf36d6 100644
--- a/src/modules/09_leave/views/07_ReportCheckin.vue
+++ b/src/modules/09_leave/views/07_ReportCheckin.vue
@@ -287,7 +287,6 @@ onMounted(() => {
               option-label="name"
               option-value="id"
               @update:model-value="updateFilterType(filterType)"
-              style="width: 230px"
             >
             </q-select>
           </div>
@@ -318,7 +317,7 @@ onMounted(() => {
         <div class="col-12 row">
           <q-card bordered class="col-12 filter-card q-pa-sm">
             <div class="row col-12 q-col-gutter-sm">
-              <div class="q-pr-xs col-2">
+              <div class="col-lg-2 col-md-4 col-xs-12">
                 <q-select
                   class="bg-white"
                   hide-bottom-space
@@ -337,7 +336,7 @@ onMounted(() => {
                 />
               </div>
 
-              <div class="q-pr-xs col-2" v-if="typeReport">
+              <div class="col-lg-2 col-md-4 col-xs-12" v-if="typeReport">
                 <q-select
                   class="bg-white"
                   outlined
@@ -363,7 +362,7 @@ onMounted(() => {
               </div>
 
               <div
-                class="q-pr-xs col-3"
+                class="col-lg-2 col-md-4 col-xs-12"
                 v-if="filterType === 'DAY' && typeReport"
               >
                 <datepicker
@@ -402,7 +401,7 @@ onMounted(() => {
               </div>
 
               <div
-                class="q-pr-xs col-3"
+                class="col-lg-2 col-md-4 col-xs-12"
                 v-if="filterType === 'WEEKLY' && typeReport"
               >
                 <datepicker
@@ -439,7 +438,7 @@ onMounted(() => {
               </div>
 
               <div
-                class="q-pr-xs col-3"
+                class="col-lg-2 col-md-4 col-xs-12"
                 v-if="filterType === 'MONTH' && typeReport"
               >
                 <datepicker