diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
new file mode 100644
index 000000000..045fb2ffa
--- /dev/null
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -0,0 +1,440 @@
+<script setup lang="ts">
+import { onMounted, ref, watch } from "vue";
+import { useCounterMixin } from "@/stores/mixin";
+import { useQuasar } from "quasar";
+
+const mixin = useCounterMixin();
+const { dialogRemove, dialogConfirm } = mixin;
+const $q = useQuasar();
+
+const modalNote = ref<boolean>(false);
+const organization = ref<string>(1);
+const organizationOptions = ref<any>([{ id: 1, name: "ทั้งหมด" }]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "citizenId",
+  "name",
+  "position",
+  "level",
+  "salary",
+  "organization",
+  "insigniaType",
+  "insigniaSend",
+  "insigniaLevel",
+  "dateSend",
+]);
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "citizenId",
+    align: "left",
+    label: "เลขบัตรประชาชน",
+    sortable: true,
+    field: "citizenId",
+    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: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "level",
+    align: "left",
+    label: "อันดับ/ระดับ",
+    sortable: true,
+    field: "level",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "salary",
+    align: "left",
+    label: "เงินเดือน",
+    sortable: true,
+    field: "salary",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organization",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaType",
+    align: "left",
+    label: "ประเภทเครื่องราชฯ ปัจจุบัน",
+    sortable: true,
+    field: "insigniaType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaSend",
+    align: "left",
+    label: "ประเภทเครื่องราชฯ ที่ยื่นขอ",
+    sortable: true,
+    field: "insigniaSend",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaLevel",
+    align: "left",
+    label: "ชั้นเครื่องราชฯ",
+    sortable: true,
+    field: "insigniaLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "dateSend",
+    align: "left",
+    label: "วันที่ยื่นขอ",
+    sortable: true,
+    field: "dateSend",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "1",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "2",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "3",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "4",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+]);
+
+const Note = ref<string>("");
+
+const clickNote = (props: any) => {
+  modalNote.value = true;
+};
+const clickDelete = () => {
+  dialogRemove($q);
+};
+const clickSavenote = () => {
+  dialogConfirm($q);
+};
+
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+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>
+<template>
+  <div class="col-12 row q-pa-md">
+    <div class="row col-12">
+      <div class="row col-12 q-col-gutter-sm">
+        <q-select
+          v-model="organization"
+          label="หน่วยงาน"
+          dense
+          emit-value
+          map-options
+          :options="organizationOptions"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="min-width: 150px"
+        />
+        <div>
+          <q-btn size="md" icon="mdi-download" flat round color="primary">
+            <q-tooltip>ดาวน์โหลด</q-tooltip>
+          </q-btn>
+          <q-btn size="12px" flat round color="add" icon="mdi-plus">
+            <q-tooltip>เพิ่ม</q-tooltip>
+          </q-btn>
+        </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 q-pt-sm">
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          class="custom-header-table"
+          :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="citizenId" :props="props">
+                {{ props.row.citizenId }}
+              </q-td>
+              <q-td key="name" :props="props">
+                {{ props.row.name }}
+              </q-td>
+              <q-td key="position" :props="props">
+                {{ props.row.position }}
+              </q-td>
+              <q-td key="level" :props="props">
+                {{ props.row.level }}
+              </q-td>
+              <q-td key="salary" :props="props">
+                {{ props.row.salary }}
+              </q-td>
+              <q-td key="organization" :props="props">
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="insigniaType" :props="props">
+                {{ props.row.insigniaType }}
+              </q-td>
+              <q-td key="insigniaSend" :props="props">
+                {{ props.row.insigniaSend }}
+              </q-td>
+              <q-td key="insigniaLevel" :props="props">
+                {{ props.row.insigniaLevel }}
+              </q-td>
+              <q-td key="dateSend" :props="props">
+                {{ props.row.dateSend }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  icon="mdi-dots-vertical"
+                  size="12px"
+                  color="grey-7"
+                  flat
+                  round
+                  dense
+                >
+                  <q-menu transition-show="jump-down" transition-hide="jump-up">
+                    <q-list dense style="min-width: 100px">
+                      <q-item
+                        clickable
+                        v-close-popup
+                        @click="clickNote(props.row)"
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
+                          <q-tooltip>หมายเหตุ</q-tooltip>
+                          <q-icon
+                            color="blue"
+                            size="xs"
+                            name="mdi-alert-circle-outline"
+                          />
+                        </q-item-section>
+                        <q-item-section>หมายเหตุ</q-item-section>
+                      </q-item>
+                      <q-item
+                        clickable
+                        v-close-popup
+                        @click="clickDelete(props.row)"
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
+                          <q-tooltip>ลบข้อมูล</q-tooltip>
+                          <q-icon color="red" size="xs" name="mdi-delete" />
+                        </q-item-section>
+                        <q-item-section>ลบ</q-item-section>
+                      </q-item>
+                    </q-list>
+                  </q-menu>
+                </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>
+  </div>
+
+  <q-dialog v-model="modalNote" persistent>
+    <q-card style="min-width: 350px">
+      <q-toolbar>
+        <q-toolbar-title class="text-subtitle2 text-bold">
+          หมายเหตุ
+        </q-toolbar-title>
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="modalNote = false"
+          style="color: #ff8080; background-color: #ffdede"
+        /> </q-toolbar
+      ><q-separator />
+      <q-card-section class="q-pt-none"></q-card-section>
+      <q-card-section class="q-pt-none">
+        <q-input
+          dense
+          outlined
+          type="textarea"
+          label="กรอกหมายเหตุ"
+          v-model="Note"
+          @keyup.enter="modalNote = false"
+        />
+      </q-card-section>
+      <q-card-actions align="right" class="bg-white text-teal">
+        <q-btn label="บันทึก" @click="clickSavenote" color="public" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue
new file mode 100644
index 000000000..06e7fcf32
--- /dev/null
+++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue
@@ -0,0 +1,339 @@
+<script setup lang="ts">
+import { onMounted, ref, watch } from "vue";
+
+const organization = ref<string>(1);
+const organizationOptions = ref<any>([{ id: 1, name: "ทั้งหมด" }]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "citizenId",
+  "name",
+  "position",
+  "level",
+  "salary",
+  "organization",
+  "insigniaType",
+  "insigniaSend",
+  "insigniaLevel",
+]);
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "citizenId",
+    align: "left",
+    label: "เลขบัตรประชาชน",
+    sortable: true,
+    field: "citizenId",
+    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: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "level",
+    align: "left",
+    label: "อันดับ/ระดับ",
+    sortable: true,
+    field: "level",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "salary",
+    align: "left",
+    label: "เงินเดือน",
+    sortable: true,
+    field: "salary",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organization",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaType",
+    align: "left",
+    label: "ประเภทเครื่องราชฯ ปัจจุบัน",
+    sortable: true,
+    field: "insigniaType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaSend",
+    align: "left",
+    label: "ประเภทเครื่องราชฯ ที่ยื่นขอ",
+    sortable: true,
+    field: "insigniaSend",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaLevel",
+    align: "left",
+    label: "ชั้นเครื่องราชฯ",
+    sortable: true,
+    field: "insigniaLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "dateSend",
+    align: "left",
+    label: "วันที่ยื่นขอ",
+    sortable: true,
+    field: "dateSend",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "1",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "2",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "3",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "4",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+]);
+
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+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>
+<template>
+  <div class="col-12 row q-pa-md">
+    <div class="row col-12">
+      <div class="row col-12 q-col-gutter-sm">
+        <q-select
+          v-model="organization"
+          label="หน่วยงาน"
+          dense
+          emit-value
+          map-options
+          :options="organizationOptions"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="min-width: 150px"
+        />
+        <!-- <div>
+          <q-btn size="md" icon="mdi-download" flat round color="primary">
+            <q-tooltip>ดาวน์โหลด</q-tooltip>
+          </q-btn>
+          <q-btn size="12px" flat round color="add" icon="mdi-plus">
+            <q-tooltip>เพิ่ม</q-tooltip>
+          </q-btn>
+        </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 q-pt-sm">
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          class="custom-header-table"
+          :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-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr
+              :props="props"
+              class="cursor-pointer"
+              @click="nextPage(props.row)"
+            >
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="citizenId" :props="props">
+                {{ props.row.citizenId }}
+              </q-td>
+              <q-td key="name" :props="props">
+                {{ props.row.name }}
+              </q-td>
+              <q-td key="position" :props="props">
+                {{ props.row.position }}
+              </q-td>
+              <q-td key="level" :props="props">
+                {{ props.row.level }}
+              </q-td>
+              <q-td key="salary" :props="props">
+                {{ props.row.salary }}
+              </q-td>
+              <q-td key="organization" :props="props">
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="insigniaType" :props="props">
+                {{ props.row.insigniaType }}
+              </q-td>
+              <q-td key="insigniaSend" :props="props">
+                {{ props.row.insigniaSend }}
+              </q-td>
+              <q-td key="insigniaLevel" :props="props">
+                {{ props.row.insigniaLevel }}
+              </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>
+  </div>
+</template>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue
new file mode 100644
index 000000000..06e7fcf32
--- /dev/null
+++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue
@@ -0,0 +1,339 @@
+<script setup lang="ts">
+import { onMounted, ref, watch } from "vue";
+
+const organization = ref<string>(1);
+const organizationOptions = ref<any>([{ id: 1, name: "ทั้งหมด" }]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "citizenId",
+  "name",
+  "position",
+  "level",
+  "salary",
+  "organization",
+  "insigniaType",
+  "insigniaSend",
+  "insigniaLevel",
+]);
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "citizenId",
+    align: "left",
+    label: "เลขบัตรประชาชน",
+    sortable: true,
+    field: "citizenId",
+    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: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "level",
+    align: "left",
+    label: "อันดับ/ระดับ",
+    sortable: true,
+    field: "level",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "salary",
+    align: "left",
+    label: "เงินเดือน",
+    sortable: true,
+    field: "salary",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organization",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaType",
+    align: "left",
+    label: "ประเภทเครื่องราชฯ ปัจจุบัน",
+    sortable: true,
+    field: "insigniaType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaSend",
+    align: "left",
+    label: "ประเภทเครื่องราชฯ ที่ยื่นขอ",
+    sortable: true,
+    field: "insigniaSend",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insigniaLevel",
+    align: "left",
+    label: "ชั้นเครื่องราชฯ",
+    sortable: true,
+    field: "insigniaLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "dateSend",
+    align: "left",
+    label: "วันที่ยื่นขอ",
+    sortable: true,
+    field: "dateSend",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "1",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "2",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "3",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "4",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+]);
+
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+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>
+<template>
+  <div class="col-12 row q-pa-md">
+    <div class="row col-12">
+      <div class="row col-12 q-col-gutter-sm">
+        <q-select
+          v-model="organization"
+          label="หน่วยงาน"
+          dense
+          emit-value
+          map-options
+          :options="organizationOptions"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="min-width: 150px"
+        />
+        <!-- <div>
+          <q-btn size="md" icon="mdi-download" flat round color="primary">
+            <q-tooltip>ดาวน์โหลด</q-tooltip>
+          </q-btn>
+          <q-btn size="12px" flat round color="add" icon="mdi-plus">
+            <q-tooltip>เพิ่ม</q-tooltip>
+          </q-btn>
+        </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 q-pt-sm">
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          class="custom-header-table"
+          :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-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr
+              :props="props"
+              class="cursor-pointer"
+              @click="nextPage(props.row)"
+            >
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="citizenId" :props="props">
+                {{ props.row.citizenId }}
+              </q-td>
+              <q-td key="name" :props="props">
+                {{ props.row.name }}
+              </q-td>
+              <q-td key="position" :props="props">
+                {{ props.row.position }}
+              </q-td>
+              <q-td key="level" :props="props">
+                {{ props.row.level }}
+              </q-td>
+              <q-td key="salary" :props="props">
+                {{ props.row.salary }}
+              </q-td>
+              <q-td key="organization" :props="props">
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="insigniaType" :props="props">
+                {{ props.row.insigniaType }}
+              </q-td>
+              <q-td key="insigniaSend" :props="props">
+                {{ props.row.insigniaSend }}
+              </q-td>
+              <q-td key="insigniaLevel" :props="props">
+                {{ props.row.insigniaLevel }}
+              </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>
+  </div>
+</template>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab4.vue b/src/modules/07_insignia/components/2_Manage/Tab4.vue
new file mode 100644
index 000000000..079f68c1f
--- /dev/null
+++ b/src/modules/07_insignia/components/2_Manage/Tab4.vue
@@ -0,0 +1,315 @@
+<script setup lang="ts">
+import { onMounted, ref, watch } from "vue";
+
+const organization = ref<string>(1);
+const organizationOptions = ref<any>([{ id: 1, name: "ทั้งหมด" }]);
+const visibleColumns = ref<string[]>([
+  "no",
+  // "citizenId",
+  // "name",
+  // "position",
+  // "level",
+  // "salary",
+  "organization",
+  // "insigniaType",
+  // "insigniaSend",
+  // "insigniaLevel",
+  // "dateSend",
+]);
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    width: "0px",
+  },
+  // {
+  //   name: "citizenId",
+  //   align: "left",
+  //   label: "เลขบัตรประชาชน",
+  //   sortable: true,
+  //   field: "citizenId",
+  //   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: "position",
+  //   align: "left",
+  //   label: "ตำแหน่ง",
+  //   sortable: true,
+  //   field: "position",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  // {
+  //   name: "level",
+  //   align: "left",
+  //   label: "อันดับ/ระดับ",
+  //   sortable: true,
+  //   field: "level",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  // {
+  //   name: "salary",
+  //   align: "left",
+  //   label: "เงินเดือน",
+  //   sortable: true,
+  //   field: "salary",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  {
+    name: "organization",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    width: "100px",
+  },
+  // {
+  //   name: "insigniaType",
+  //   align: "left",
+  //   label: "ประเภทเครื่องราชฯ ปัจจุบัน",
+  //   sortable: true,
+  //   field: "insigniaType",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  // {
+  //   name: "insigniaSend",
+  //   align: "left",
+  //   label: "ประเภทเครื่องราชฯ ที่ยื่นขอ",
+  //   sortable: true,
+  //   field: "insigniaSend",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  // {
+  //   name: "insigniaLevel",
+  //   align: "left",
+  //   label: "ชั้นเครื่องราชฯ",
+  //   sortable: true,
+  //   field: "insigniaLevel",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  // {
+  //   name: "dateSend",
+  //   align: "left",
+  //   label: "วันที่ยื่นขอ",
+  //   sortable: true,
+  //   field: "dateSend",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+]);
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "1",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "2",
+    citizenId: "1xxxxxxxxxx",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "3",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+  {
+    no: "4",
+    citizenId: "1xxxxxxxxxx",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    salary: "15000",
+    organization: "บริหาร",
+    insigniaType: "ทวีติยาภรณ์ช้างเผือก",
+    insigniaSend: "ตริตาภรณ์ช้างเผือก",
+    insigniaLevel: "ต่ำกว่าสายสะพาย",
+    dateSend: "31 ม.ค. 2566",
+  },
+]);
+
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+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>
+<template>
+  <div class="col-12 row q-pa-md">
+    <div class="row col-12">
+      <!-- <div class="row col-12 q-col-gutter-sm">
+        <q-select
+          v-model="organization"
+          label="หน่วยงาน"
+          dense
+          emit-value
+          map-options
+          :options="organizationOptions"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="min-width: 150px"
+        />
+        <div>
+          <q-btn size="md" icon="mdi-download" flat round color="primary">
+            <q-tooltip>ดาวน์โหลด</q-tooltip>
+          </q-btn>
+          <q-btn size="12px" flat round color="add" icon="mdi-plus">
+            <q-tooltip>เพิ่ม</q-tooltip>
+          </q-btn>
+        </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 q-pt-sm">
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          class="custom-header-table"
+          :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-th auto-width /> -->
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td key="no" style="width: 50px" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="organization" style="width: 300px" :props="props">
+                {{ props.row.organization }}
+              </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>
+  </div>
+</template>
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index 6b57e514f..8221935d7 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -1,268 +1,3 @@
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    รายชื่อข้าราชการสามัญฯ ที่มีสิทธิ์ยื่นขอพระราชทานเครื่องราชย์อิสริยาภรณ์
-  </div>
-  <q-card bordered class="q-py-sm row col-12">
-    <div class="col-12 row bg-white">
-      <div class="fit q-px-md q-py-sm">
-        <div class="row col-12 q-col-gutter-md fit">
-          <cardTop
-            :amount="stat.total"
-            label="หน่วยงานทั้งหมด"
-            color="#016987"
-          />
-          <cardTop
-            :amount="stat.sendName"
-            label="หน่วยงานที่ส่งรายชื่อเเล้ว"
-            color="#02A998"
-          />
-          <cardTop
-            :amount="stat.nonSend"
-            label="หน่วยงานที่ยังไม่ได้ส่งรายชื่อ"
-            color="#2EA0FF"
-          />
-          <cardTop
-            :amount="stat.personSend"
-            label="จำนวนคนที่ยื่นขอ"
-            color="#4154B3"
-          />
-        </div>
-      </div>
-    </div>
-  </q-card>
-  <q-card flat bordered class="col-12 q-mt-sm">
-    <div class="row col-12">
-      <q-tabs
-        v-model="tab"
-        dense
-        class="text-grey"
-        active-color="primary"
-        active-class="bg-teal-1"
-        indicator-color="primary"
-        align="left"
-      >
-        <q-tab name="haveInsignia" label="ผู้ที่ได้รับพระราชทานเครื่องราชฯ" />
-        <q-tab name="rightInsignia" label="ผู้ที่มีสิทธ์ที่จะไม่ยื่นขอ" />
-        <q-tab name="nonInsignia" label="หน่วยงานที่ยังไม่ได้ส่งรายชื่อ" />
-      </q-tabs>
-    </div>
-    <q-separator />
-    <div class="col-12 row q-pa-md">
-      <div class="row col-12">
-        <div class="row col-12 q-col-gutter-sm">
-          <q-select
-            v-model="organization"
-            label="หน่วยงาน"
-            dense
-            emit-value
-            map-options
-            :options="organizationOptions"
-            option-value="id"
-            option-label="name"
-            lazy-rules
-            hide-bottom-space
-            :readonly="false"
-            :borderless="false"
-            :outlined="true"
-            :hide-dropdown-icon="false"
-            style="min-width: 150px"
-          />
-          <div>
-            <q-btn
-              @click="clickAdd()"
-              size="12px"
-              flat
-              round
-              color="add"
-              icon="mdi-plus"
-            >
-              <q-tooltip>เพิ่ม</q-tooltip>
-            </q-btn>
-            <q-btn size="md" icon="mdi-download" flat round color="primary">
-              <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 q-pt-sm">
-          <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-th auto-width />
-              </q-tr>
-            </template>
-            <template v-slot:body="props">
-              <q-tr
-                :props="props"
-                class="cursor-pointer"
-                @click="nextPage(props.row)"
-              >
-                <q-td key="no" :props="props">
-                  {{ props.rowIndex + 1 }}
-                </q-td>
-                <q-td key="citizenId" :props="props">
-                  {{ props.row.citizenId }}
-                </q-td>
-                <q-td key="name" :props="props">
-                  {{ props.row.name }}
-                </q-td>
-                <q-td key="position" :props="props">
-                  {{ props.row.position }}
-                </q-td>
-                <q-td key="level" :props="props">
-                  {{ props.row.level }}
-                </q-td>
-                <q-td key="salary" :props="props">
-                  {{ props.row.salary }}
-                </q-td>
-                <q-td key="organization" :props="props">
-                  {{ props.row.organization }}
-                </q-td>
-                <q-td key="insigniaType" :props="props">
-                  {{ props.row.insigniaType }}
-                </q-td>
-                <q-td key="insigniaSend" :props="props">
-                  {{ props.row.insigniaSend }}
-                </q-td>
-                <q-td key="insigniaLevel" :props="props">
-                  {{ props.row.insigniaLevel }}
-                </q-td>
-                <q-td key="dateSend" :props="props">
-                  {{ props.row.dateSend }}
-                </q-td>
-                <q-td auto-width>
-                  <q-btn
-                    dense
-                    size="12px"
-                    flat
-                    round
-                    color="blue"
-                    @click="clickNote(props.row.id)"
-                    icon="mdi-alert-circle-outline"
-                  >
-                    <q-tooltip>หมายเหตุ</q-tooltip>
-                  </q-btn>
-                </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>
-    </div>
-  </q-card>
-
-  <q-dialog v-model="addNote" persistent>
-    <q-card style="min-width: 350px">
-      <DialogHeader tittle="หมายเหตุ " :close="clickClose" />
-
-      <q-card-section class="q-pt-none">
-        <q-input
-          dense
-          type="textarea"
-          label="กรอกหมายเหตุ"
-          v-model="Note"
-          autofocus
-          @keyup.enter="addNote = false"
-        />
-      </q-card-section>
-      <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="บันทึก" @click="saveNote" color="public" />
-      </q-card-actions>
-    </q-card>
-  </q-dialog>
-</template>
-
 <script setup lang="ts">
 import { onMounted, ref, useAttrs, reactive, watch } from "vue";
 import type { QTableProps } from "quasar";
@@ -279,6 +14,10 @@ import { useCounterMixin } from "@/stores/mixin";
 import type { resMain } from "@/modules/06_retirement/interface/response/Main";
 const yearOptions = reactive<any[]>([]);
 import cardTop from "@/modules/07_insignia/components/2_Manage/StatCard.vue";
+import tab1 from "@/modules/07_insignia/components/2_Manage/Tab1.vue";
+import tab2 from "@/modules/07_insignia/components/2_Manage/Tab2.vue";
+import tab3 from "@/modules/07_insignia/components/2_Manage/Tab3.vue";
+import tab4 from "@/modules/07_insignia/components/2_Manage/Tab4.vue";
 
 const Note = ref<string>("");
 const addNote = ref<boolean>(false);
@@ -295,7 +34,12 @@ const pagination = ref({
   page: 1,
   rowsPerPage: 10,
 });
-
+const round = ref<string>("รอบการเสนอพระราชทานเครื่องราชปี 2556");
+const optionRound = [
+  "รอบการเสนอพระราชทานเครื่องราชปี 2557",
+  "รอบการเสนอพระราชทานเครื่องราชปี 2558",
+  "รอบการเสนอพระราชทานเครื่องราชปี 2556",
+];
 const visibleColumns = ref<string[]>([
   "no",
   "citizenId",
@@ -665,6 +409,293 @@ const nextPage = (prop: any) => {
 };
 </script>
 
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    รายชื่อข้าราชการสามัญฯ ที่มีสิทธิ์ยื่นขอพระราชทานเครื่องราชย์อิสริยาภรณ์
+  </div>
+  <q-card bordered class="row col-12 q-mt-sm">
+    <div class="bg-grey-2 col-12 row items-center">
+      <div class="q-pl-sm q-mr-md text-weight-bold text-grey">รอบ</div>
+
+      <q-select borderless v-model="round" :options="optionRound" />
+    </div>
+    <div class="col-12 row bg-white">
+      <div class="fit q-px-md q-py-sm">
+        <div class="row col-12 q-col-gutter-md fit">
+          <cardTop
+            :amount="stat.total"
+            label="หน่วยงานทั้งหมด"
+            color="#016987"
+          />
+          <cardTop
+            :amount="stat.sendName"
+            label="หน่วยงานที่ส่งรายชื่อเเล้ว"
+            color="#02A998"
+          />
+          <cardTop
+            :amount="stat.nonSend"
+            label="หน่วยงานที่ยังไม่ได้ส่งรายชื่อ"
+            color="#2EA0FF"
+          />
+          <cardTop
+            :amount="stat.personSend"
+            label="จำนวนคนที่ยื่นขอ"
+            color="#4154B3"
+          />
+        </div>
+      </div>
+    </div>
+  </q-card>
+
+  <q-card flat bordered class="col-12 q-mt-sm">
+    <div class="row col-12">
+      <q-tabs
+        v-model="tab"
+        dense
+        class="text-grey"
+        active-color="primary"
+        active-class="bg-teal-1"
+        indicator-color="primary"
+        align="left"
+      >
+        <q-tab name="haveInsignia" label="ผู้ที่ได้รับพระราชทานเครื่องราชฯ" />
+        <q-tab name="personNotapply" label="คนที่ไม่ยื่นขอ" />
+        <q-tab name="personRemoved" label="คนที่ถูกลบออก" />
+        <q-tab name="nonInsignia" label="หน่วยงานที่ยังไม่ได้ส่งรายชื่อ" />
+      </q-tabs>
+    </div>
+    <q-separator />
+    <q-tab-panels v-model="tab" animated>
+      <q-tab-panel name="haveInsignia">
+        <tab1 />
+      </q-tab-panel>
+      <q-tab-panel name="personNotapply">
+        <tab2 />
+      </q-tab-panel>
+      <q-tab-panel name="personRemoved">
+        <tab3 />
+      </q-tab-panel>
+      <q-tab-panel name="nonInsignia">
+        <tab4 />
+      </q-tab-panel>
+    </q-tab-panels>
+
+    <!-- <div class="col-12 row q-pa-md">
+      <div class="row col-12">
+        <div class="row col-12 q-col-gutter-sm">
+          <q-select
+            v-model="organization"
+            label="หน่วยงาน"
+            dense
+            emit-value
+            map-options
+            :options="organizationOptions"
+            option-value="id"
+            option-label="name"
+            lazy-rules
+            hide-bottom-space
+            :readonly="false"
+            :borderless="false"
+            :outlined="true"
+            :hide-dropdown-icon="false"
+            style="min-width: 150px"
+          />
+          <div>
+            <q-btn
+              @click="clickAdd()"
+              size="12px"
+              flat
+              round
+              color="add"
+              icon="mdi-plus"
+            >
+              <q-tooltip>เพิ่ม</q-tooltip>
+            </q-btn>
+            <q-btn size="md" icon="mdi-download" flat round color="primary">
+              <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 q-pt-sm">
+          <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-th auto-width />
+              </q-tr>
+            </template>
+            <template v-slot:body="props">
+              <q-tr
+                :props="props"
+                class="cursor-pointer"
+                @click="nextPage(props.row)"
+              >
+                <q-td key="no" :props="props">
+                  {{ props.rowIndex + 1 }}
+                </q-td>
+                <q-td key="citizenId" :props="props">
+                  {{ props.row.citizenId }}
+                </q-td>
+                <q-td key="name" :props="props">
+                  {{ props.row.name }}
+                </q-td>
+                <q-td key="position" :props="props">
+                  {{ props.row.position }}
+                </q-td>
+                <q-td key="level" :props="props">
+                  {{ props.row.level }}
+                </q-td>
+                <q-td key="salary" :props="props">
+                  {{ props.row.salary }}
+                </q-td>
+                <q-td key="organization" :props="props">
+                  {{ props.row.organization }}
+                </q-td>
+                <q-td key="insigniaType" :props="props">
+                  {{ props.row.insigniaType }}
+                </q-td>
+                <q-td key="insigniaSend" :props="props">
+                  {{ props.row.insigniaSend }}
+                </q-td>
+                <q-td key="insigniaLevel" :props="props">
+                  {{ props.row.insigniaLevel }}
+                </q-td>
+                <q-td key="dateSend" :props="props">
+                  {{ props.row.dateSend }}
+                </q-td>
+                <q-td auto-width>
+                  <q-btn
+                    dense
+                    size="12px"
+                    flat
+                    round
+                    color="blue"
+                    @click="clickNote(props.row.id)"
+                    icon="mdi-alert-circle-outline"
+                  >
+                    <q-tooltip>หมายเหตุ</q-tooltip>
+                  </q-btn>
+                </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>
+    </div> -->
+  </q-card>
+
+  <q-dialog v-model="addNote" persistent>
+    <q-card style="min-width: 350px">
+      <DialogHeader tittle="หมายเหตุ " :close="clickClose" />
+
+      <q-card-section class="q-pt-none">
+        <q-input
+          dense
+          type="textarea"
+          label="กรอกหมายเหตุ"
+          v-model="Note"
+          autofocus
+          @keyup.enter="addNote = false"
+        />
+      </q-card-section>
+      <q-card-actions align="right" class="bg-white text-teal">
+        <q-btn label="บันทึก" @click="saveNote" color="public" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
 <style lang="scss" scope>
 .filter-card {
   background-color: #f1f1f1b0;