diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index fe7b5080c..8b9fda266 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -291,20 +291,20 @@ const menuList = readonly<any[]>([
             role: "insignia",
           },
           {
-            label: "จัดทำรายชื่อข้าราชการสามัญ",
-            path: "insigniaNameList",
+            label: "จัดการคำขอ",
+            path: "insigniaManage",
             role: "insignia",
           },
           {
-            label: "อนุมัติรายชื่อข้าราชการสามัญ",
-            path: "insigniaNameApprove",
-            role: "insignia",
-          },
-          {
-            label: "บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์",
+            label: "บันทึกผลการได้รับพระราช...",
             path: "insigniaRecord",
             role: "insignia",
           },
+          {
+            label: "จัดสรรเครื่องราชฯ",
+            path: "insigniaAllocate",
+            role: "insignia",
+          },
           {
             label: "รายงาน",
             path: "insigniaReport",
diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index 48d761c5d..1969ecb05 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -110,6 +110,20 @@
                   class="text-h5"
                 />
               </q-td>
+              <q-td key="statusRoyal" :props="props">
+                <q-icon
+                  v-if="props.row.statusRoyal == 'ยังไม่ได้เสนอ'"
+                  name="mdi-timer-sand"
+                  color="orange"
+                  class="text-h5"
+                />
+                <q-icon
+                  v-else
+                  name="mdi-check"
+                  color="positive"
+                  class="text-h5"
+                />
+              </q-td>
               <q-td auto-width>
                 <q-btn
                   dense
@@ -178,6 +192,7 @@ const visibleColumns = ref<string[]>([
   "startDate",
   "endDate",
   "status",
+  "statusRoyal",
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 
 // หัวตาราง
@@ -227,6 +242,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "statusRoyal",
+    align: "center",
+    label: "สถานะราชกิจจานุเบกษา",
+    sortable: true,
+    field: "institution",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 ]);
 
 // ข้อมูลตาราง (จำลอง)
@@ -237,6 +261,7 @@ const rows = ref<FormProprsalsRound[]>([
     startDate: "2566",
     endDate: "31 พ.ค. 2566",
     status: "เสนอเเล้ว",
+    statusRoyal: "เสนอเเล้ว",
   },
   {
     round: "รอบการเสนอขอพระราชทานเครื่องราชฯ",
@@ -244,6 +269,7 @@ const rows = ref<FormProprsalsRound[]>([
     startDate: "2566",
     endDate: "31 พ.ค. 2566",
     status: "เสนอเเล้ว",
+    statusRoyal: "เสนอเเล้ว",
   },
   {
     round: "รอบการเสนอขอพระราชทานเครื่องราชฯ",
@@ -251,6 +277,7 @@ const rows = ref<FormProprsalsRound[]>([
     startDate: "2566",
     endDate: "31 พ.ค. 2566",
     status: "เสนอเเล้ว",
+    statusRoyal: "เสนอเเล้ว",
   },
   {
     round: "รอบการเสนอขอพระราชทานเครื่องราชฯ",
@@ -258,6 +285,7 @@ const rows = ref<FormProprsalsRound[]>([
     startDate: "2566",
     endDate: "31 พ.ค. 2566",
     status: "ยังไม่ได้เสนอ",
+    statusRoyal: "ยังไม่ได้เสนอ",
   },
   {
     round: "รอบการเสนอขอพระราชทานเครื่องราชฯ",
@@ -265,6 +293,7 @@ const rows = ref<FormProprsalsRound[]>([
     startDate: "2566",
     endDate: "31 พ.ค. 2566",
     status: "เสนอเเล้ว",
+    statusRoyal: "ยังไม่ได้เสนอ",
   },
 ]);
 
diff --git a/src/modules/07_insignia/components/2_Manage/StatCard.vue b/src/modules/07_insignia/components/2_Manage/StatCard.vue
new file mode 100644
index 000000000..67ddb48bc
--- /dev/null
+++ b/src/modules/07_insignia/components/2_Manage/StatCard.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+const sizeCard = (val: number) => {
+  if (val === 5) {
+    return "width:15%;";
+  }
+};
+const props = defineProps({
+  color: {
+    type: String,
+    default: "",
+  },
+  label: {
+    type: String,
+    default: "",
+  },
+  amount: {
+    type: Number,
+    default: 0,
+  },
+});
+</script>
+<template>
+  <div
+    :style="$q.screen.lt.md ? '' : sizeCard(5)"
+    :class="$q.screen.lt.sm ? 'col-4' : ''"
+  >
+    <div
+      class="q-card q-card--bordered q-card--flat no-shadow row fit cardNum items-center q-px-sm"
+    >
+      <div class="col-12 row items-center q-pa-sm">
+        <div
+          class="col-12 text-h5 text-weight-bold"
+          :style="{ color: props.color }"
+        >
+          {{ props.amount }}
+        </div>
+        <div class="col-12 text-dark ellipsis">
+          {{ props.label }}
+        </div>
+      </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
new file mode 100644
index 000000000..6b57e514f
--- /dev/null
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -0,0 +1,715 @@
+<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";
+import type {
+  FormMainProbation,
+  FormMainProbation2,
+} from "@/modules/05_placement/interface/request/Main";
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+import http from "@/plugins/http";
+import config from "@/app.config";
+import DialogHeader from "@/modules/07_insignia/components/DialogHeader.vue";
+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";
+
+const Note = ref<string>("");
+const addNote = ref<boolean>(false);
+const saveWriteNote = ref<any[]>([]);
+const mixin = useCounterMixin();
+const { messageError, date2Thai, showLoader, hideLoader, dialogMessage } =
+  mixin;
+const router = useRouter();
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const visibleColumns = ref<string[]>([
+  "no",
+  "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 currentYear = new Date().getFullYear();
+const tab = ref<any>("haveInsignia");
+const visibleColumns2 = ref<string[]>(["no", "name", "retireNumber"]);
+// หัวตาราง2
+const columns2 = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: true,
+    field: "name",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "retireNumber",
+    align: "left",
+    label: "จำนวนผู้เกษียณ",
+    sortable: true,
+    field: "total",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows2 = ref<FormMainProbation2[]>([
+  {
+    no: "1",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานโครงสร้างและอัตรากำลัง ๒",
+  },
+  {
+    no: "2",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานโครงสร้างและอัตรากำลัง ๒",
+  },
+  {
+    no: "3",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+  {
+    no: "4",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+  {
+    no: "5",
+    name: "นางสาวฐิติรัตน์ พงษ์ศิริ",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+]);
+
+const clickDelete = (id: string) => {
+  $q.dialog({
+    title: "ยืนยันการลบข้อมูล",
+    message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {})
+    .onCancel(() => {})
+    .onDismiss(() => {});
+};
+const clickNote = () => {
+  addNote.value = true;
+};
+const clickAdd = () => {
+  //   modal.value = true;
+  $q.dialog({
+    title: "เพิ่มประกาศ",
+    message: "เลือกประกาศที่ต้องการเพิ่มข้อมูล",
+    options: {
+      type: "radio",
+      model: "opt1",
+      // inline: true
+      items: [
+        { label: "ประกาศเพิ่มผู้เกษียณ", value: "ADD" },
+        { label: "ประกาศแก้ไขข้อมูลผู้เกษียน", value: "EDIT" },
+        { label: "ประกาศยกเลิกผู้เกษียณ", value: "REMOVE" },
+      ],
+    },
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk((data) => {
+      console.log("option===>", data);
+      router.push(`/retirement/list/${type.value}/${currentYear}`);
+    })
+    .onCancel(() => {})
+    .onDismiss(() => {});
+  /* $q.dialog({
+      title: "ยืนยันการเพิ่มข้อมูลประกาศเกษียณ",
+      message: "ต้องการเพิ่มข้อมูลประกาศเกษียณใช่หรือไม่?",
+      cancel: {
+        flat: true,
+        color: "negative",
+      },
+      persistent: true,
+    })
+      .onOk(async () => {
+        router.push(`/retirement/list/${type.value}/${currentYear}`);
+      })
+      .onCancel(() => {})
+      .onDismiss(() => {}); */
+};
+const clickClose = async () => {
+  addNote.value = false;
+};
+const organization = ref<string>();
+const organizationOptions = ref<any>([{ id: 1, name: "ทั้งหมด" }]);
+const stat = ref<any>({
+  total: 0,
+  sendName: 0,
+  nonSend: 0,
+  personSend: 0,
+  disclaim: 0,
+});
+
+const saveNote = async () => {
+  if (saveWriteNote.value.length == 0) {
+    dialogMessage(
+      $q,
+      "ไม่สามารถบันทึกข้อมูลได้",
+      "กรุณาเพิ่มหมายเหตุ",
+      "warning",
+      undefined,
+      "orange",
+      undefined,
+      undefined,
+      true
+    );
+    return;
+  } else {
+    await saveTextNote();
+  }
+};
+
+const saveTextNote = async () => {};
+
+// ค้นหาในตาราง
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+
+const filterKeyword2 = ref<string>("");
+const filterRef2 = ref<any>(null);
+const resetFilter2 = () => {
+  filterKeyword2.value = "";
+  filterRef2.value.focus();
+};
+
+const attrs = ref<any>(useAttrs());
+
+const paging = ref<boolean>(true);
+const paginationLabel = (start: string, end: string, total: string) => {
+  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+  else return start + "-" + end + " ใน " + total;
+};
+const nextPage = (prop: any) => {
+  // console.log(prop.id);
+
+  router.push(`/retirement/listretire/${prop.id}/${type.value}`);
+};
+</script>
+
+<style lang="scss" scope>
+.filter-card {
+  background-color: #f1f1f1b0;
+}
+
+.toggle-expired-account {
+  font-size: 12px;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 150%;
+  color: #35373c;
+}
+
+.icon-color {
+  color: #4154b3;
+}
+
+.custom-header-table {
+  max-height: 64vh;
+
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
diff --git a/src/modules/07_insignia/components/4_Allocate/addDetail.vue b/src/modules/07_insignia/components/4_Allocate/addDetail.vue
new file mode 100644
index 000000000..7095a5a26
--- /dev/null
+++ b/src/modules/07_insignia/components/4_Allocate/addDetail.vue
@@ -0,0 +1,678 @@
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    รายชื่อที่จัดสรรเครื่องราชอิสริยาภรณ์ {{ name }} {{ organization }}
+  </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.sendInsig"
+            label="จำนวนเครื่องราช ฯ ที่จัดสรรให้หน่วยงานแล้ว"
+            color="#02A998"
+          />
+          <cardTop
+            :amount="stat.remainInsig"
+            label="จำนวนเครื่องราช ฯ คงเหลือ"
+            color="#2EA0FF"
+          />
+        </div>
+      </div>
+    </div>
+  </q-card>
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+    <div class="row q-col-gutter-sm">
+      <div class="row col-12 q-col-gutter-sm">
+        <div>
+          <q-btn
+            @click="clickAdd()"
+            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-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="id"
+          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">
+              <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="organization" :props="props">
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="positionType" :props="props">
+                {{ props.row.positionType }}
+              </q-td>
+              <q-td key="positionAdmin" :props="props">
+                {{ props.row.positionAdmin }}
+              </q-td>
+              <q-td key="positionLine" :props="props">
+                {{ props.row.positionLine }}
+              </q-td>
+              <q-td key="positionNum" :props="props">
+                {{ props.row.positionNum }}
+              </q-td>
+              <q-td key="status" :props="props">
+                {{ props.row.status }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  dense
+                  size="12px"
+                  flat
+                  round
+                  color="blue"
+                  icon="mdi-alert-circle-outline"
+                >
+                  <q-tooltip>หมายเหตุ</q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td>
+                <q-btn
+                  label="คืนแล้ว"
+                  @click="clickNote(props.row.id)"
+                  color="blue"
+                />
+              </q-td>
+            </q-tr>
+          </template>
+          <template v-slot:pagination="scope">
+            <q-pagination
+              v-model="pagination.page"
+              active-color="primary"
+              color="dark"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
+          </template>
+        </q-table>
+      </div>
+    </div>
+  </q-card>
+
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 900px; max-width: 80vw">
+      <q-form ref="myForm">
+        <DialogHeader tittle="เพิ่มรายชื่อ " :close="clickClose" />
+        <q-separator />
+        <q-card-section class="q-pa-md q-col-gutter-sm">
+          <q-input
+            class="col-12"
+            standout
+            dense
+            v-model="filterKeyword2"
+            ref="filterRef2"
+            outlined
+            debounce="300"
+            placeholder="ค้นหา"
+          >
+            <template v-slot:append>
+              <q-icon v-if="filterKeyword2 == ''" name="search" />
+              <q-icon
+                v-if="filterKeyword2 !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="resetFilter2"
+              />
+            </template>
+          </q-input>
+          <div class="col-12">
+            <q-table
+              ref="table2"
+              :columns="columns2"
+              :rows="rows2"
+              :filter="filterKeyword2"
+              row-key="Order"
+              flat
+              bordered
+              :paging="true"
+              dense
+              class="custom-header-table"
+              v-bind="attrs"
+              :visible-columns="visibleColumns2"
+              :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
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div v-if="col.name == 'no'">
+                      {{ props.rowIndex + 1 }}
+                    </div>
+                    <div v-else>
+                      {{ col.value }}
+                    </div>
+                  </q-td>
+                  <q-td auto-width>
+                    <q-btn
+                      dense
+                      class="q-px-md"
+                      outline
+                      color="primary"
+                      v-close-popup
+                      label="เพิ่ม"
+                    >
+                    </q-btn>
+                  </q-td>
+                </q-tr>
+              </template>
+              <template v-slot:pagination="scope">
+                <q-pagination
+                  v-model="pagination.page"
+                  active-color="primary"
+                  color="dark"
+                  :max="scope.pagesNumber"
+                  :max-pages="5"
+                  size="sm"
+                  boundary-links
+                  direction-links
+                ></q-pagination>
+              </template>
+            </q-table>
+          </div>
+        </q-card-section>
+      </q-form>
+    </q-card>
+  </q-dialog>
+  <q-dialog v-model="addNote" persistent>
+    <q-card style="min-width: 350px">
+      <DialogHeader tittle="คืนเครื่องราชฯ  " :close="clickCloseNote" />
+
+      <q-card-section class="q-pt-none">
+        <q-input
+          dense
+          type="textarea"
+          v-model="Note"
+          label="กรอกเหตุผลที่ต้องการคืนเครื่องราชฯ "
+          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 { ref, useAttrs } from "vue";
+import type { QTableProps } from "quasar";
+import router from "@/router";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+
+import DialogHeader from "@/modules/07_insignia/components/DialogHeader.vue";
+import cardTop from "@/modules/07_insignia/components/2_Manage/StatCard.vue";
+import type { FormProprsalsRound } from " @/modules/07_insignia/interface/request/Main.ts";
+
+const mixin = useCounterMixin();
+const { messageError, date2Thai, showLoader, hideLoader, dialogMessage } =
+  mixin;
+const name = ref<string>("");
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const saveWriteNote = ref<any[]>([]);
+const addNote = ref<boolean>(false);
+const clickNote = () => {
+  addNote.value = true;
+};
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+const stat = ref<any>({
+  total: 3,
+  sendInsig: 2,
+  remainInsig: 1,
+});
+
+const visibleColumns = ref<string[]>([
+  "no",
+  "citizenId",
+  "name",
+  "organization",
+  "positionType",
+  "positionAdmin",
+  "positionLine",
+  "positionNum",
+  "status",
+]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+
+// หัวตาราง
+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: "organization",
+    align: "left",
+    label: "สังกัด",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionType",
+    align: "left",
+    label: "ตำแหน่งประเภท",
+    sortable: true,
+    field: "positionType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionAdmin",
+    align: "left",
+    label: "ตำแหน่งทางการบริหาร",
+    sortable: true,
+    field: "positionAdmin",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionLine",
+    align: "left",
+    label: "ตำแหน่งในสายงาน/ระดับ",
+    sortable: true,
+    field: "positionLine",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionNum",
+    align: "left",
+    label: "ตำแหน่ง เลขที่",
+    sortable: true,
+    field: "positionNum",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    citizenId: "1XXXXXXXXXXXX",
+    name: "นางสาวรัชภรณ์ ภักดี",
+    organization: "ฝ่ายบริหารงานทั่วไป",
+    positionType: "บริหาร",
+    positionAdmin: "บริหาร",
+    positionLine: "ชำนาญการพิเศษ",
+    positionNum: "ลกก.3",
+    status: "ยังมีชีวิต",
+  },
+  {
+    no: "2",
+    citizenId: "1XXXXXXXXXXXX",
+    name: "นางสาวภาพรรณ ลออ",
+    organization: "ฝ่ายบริหารงานทั่วไป",
+    positionType: "บริหาร",
+    positionAdmin: "จัดการงานทั่วไป",
+    positionLine: "ชำนาญงาน",
+    positionNum: "กบห.2",
+    status: "ยังมีชีวิต",
+  },
+  {
+    no: "3",
+    citizenId: "1XXXXXXXXXXXX",
+    name: "นางสาวรัชภรณ์ ภักดี",
+    organization: "ฝ่ายบริหารงานทั่วไป",
+    positionType: "บริหาร",
+    positionAdmin: "บริหาร",
+    positionLine: "ชำนาญการพิเศษ",
+    positionNum: "ลกก.3",
+    status: "ยังมีชีวิต",
+  },
+]);
+
+const visibleColumns2 = ref<string[]>([
+  "no",
+  "name",
+  "position",
+  "level",
+  "institution",
+]);
+// หัวตาราง2
+const columns2 = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ-สกุล",
+    sortable: true,
+    field: "name",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "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: "institution",
+    align: "left",
+    label: "สังกัด",
+    sortable: true,
+    field: "institution",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง2 (จำลอง)
+const rows2 = ref<any[]>([
+  {
+    no: "1",
+    name: "นายใจดี ยอดใจ ",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานโครงสร้างและอัตรากำลัง ๒",
+  },
+  {
+    no: "2",
+    name: "นายจักกริน บัณฑิต",
+    position: "นักวิชาการพัสดุ",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานโครงสร้างและอัตรากำลัง ๒",
+  },
+  {
+    no: "3",
+    name: "นางสาวกัณฐิมา กาฬสินธุ์",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+  {
+    no: "4",
+    name: "นางสาวเมขลา กระจ่างมนตรี",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+  {
+    no: "5",
+    name: "นางสาวฐิติรัตน์ พงษ์ศิริ",
+    position: "นักจัดการงานทั่วไป",
+    level: "ปฏิบัติการ",
+    institution: "กลุ่มงานช่วยนักบริหาร",
+  },
+]);
+
+// หัวตาราง2
+const clickDelete = (id: string) => {
+  $q.dialog({
+    title: "ยืนยันการลบข้อมูล",
+    message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {})
+    .onCancel(() => {})
+    .onDismiss(() => {});
+};
+const clickClose = async () => {
+  modal.value = false;
+};
+
+const clickCloseNote = async () => {
+  addNote.value = false;
+};
+const clickAdd = () => {
+  modal.value = true;
+};
+const saveNote = async () => {
+  if (saveWriteNote.value.length == 0) {
+    dialogMessage(
+      $q,
+      "ไม่สามารถบันทึกข้อมูลได้",
+      "กรุณาเพิ่มหมายเหตุ",
+      "warning",
+      undefined,
+      "orange",
+      undefined,
+      undefined,
+      true
+    );
+    return;
+  } else {
+    await saveTextNote();
+  }
+};
+const saveTextNote = async () => {};
+
+const redirectToPage = (id?: string) => {
+  router.push({ name: "allocateDetail" });
+};
+// ค้นหาในตาราง
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+
+const filterKeyword2 = ref<string>("");
+const filterRef2 = ref<any>(null);
+const resetFilter2 = () => {
+  filterKeyword2.value = "";
+  filterRef2.value.focus();
+};
+
+const attrs = ref<any>(useAttrs());
+
+const paging = ref<boolean>(true);
+const paginationLabel = (start: string, end: string, total: string) => {
+  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+  else return start + "-" + end + " ใน " + total;
+};
+</script>
+
+<style lang="scss" scope>
+.filter-card {
+  background-color: #f1f1f1b0;
+}
+
+.toggle-expired-account {
+  font-size: 12px;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 150%;
+  color: #35373c;
+}
+
+.icon-color {
+  color: #4154b3;
+}
+
+.custom-header-table {
+  max-height: 64vh;
+
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
diff --git a/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue b/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue
new file mode 100644
index 000000000..9b3597e6a
--- /dev/null
+++ b/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="col-xs-12 col-sm-12 col-md-11">
+    <div class="toptitle col-12 row items-center">
+      <q-btn
+        icon="mdi-arrow-left"
+        unelevated
+        round
+        dense
+        flat
+        color="primary"
+        class="q-mr-sm"
+        @click="router.go(-1)"
+      />
+      <div>เพิ่มรายการเครื่องราชอิสริยาภรณ์</div>
+    </div>
+    <div class="col-12">
+      <q-card bordered>
+        <div class="col-12 row q-col-gutter-md q-pa-md">
+          <div class="col-xs-12 col-sm-12 row">
+            <q-separator />
+            <div class="col-12 row q-pa-sm q-col-gutter-sm">
+              <q-input class="col-2" dense outlined v-model="year" label="ปี" />
+              <q-input
+                class="col-8"
+                dense
+                outlined
+                v-model="typeInsig"
+                label="ประเภทเครื่องราชอิสริยาภรณ์"
+              />
+              <q-input
+                class="col-2"
+                dense
+                outlined
+                v-model="total"
+                label="จำนวน"
+              />
+            </div>
+          </div>
+        </div>
+        <q-separator />
+        <q-separator />
+        <div class="row col-12 q-pa-sm">
+          <q-space />
+          <q-btn
+            unelevated
+            dense
+            class="q-px-md items-center"
+            color="light-blue-10"
+            label="บันทึก"
+            @click="router.go(-1)"
+          />
+        </div>
+      </q-card>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import type { QTableProps } from "quasar";
+import { ref } from "vue";
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
+
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
+const router = useRouter();
+const $q = useQuasar();
+const dateStart = ref<any>(new Date());
+const dateEnd = ref<any>(new Date());
+
+const total = ref<any>("");
+const typeInsig = ref<string>("");
+const year = ref<string>("");
+const datelast = ref<string>("");
+
+const routeName = router.currentRoute.value.name;
+</script>
diff --git a/src/modules/07_insignia/components/4_Allocate/detail.vue b/src/modules/07_insignia/components/4_Allocate/detail.vue
new file mode 100644
index 000000000..514c8d7b9
--- /dev/null
+++ b/src/modules/07_insignia/components/4_Allocate/detail.vue
@@ -0,0 +1,353 @@
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    หน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์ {{ name }}
+  </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.sendInsig"
+            label="จำนวนเครื่องราช ฯ ที่จัดสรรให้หน่วยงานแล้ว"
+            color="#02A998"
+          />
+          <cardTop
+            :amount="stat.remainInsig"
+            label="จำนวนเครื่องราช ฯ คงเหลือ"
+            color="#2EA0FF"
+          />
+        </div>
+      </div>
+    </div>
+  </q-card>
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+    <div class="row q-col-gutter-sm">
+      <div class="row col-12 q-col-gutter-sm">
+        <div>
+          <q-btn
+            @click="clickAdd()"
+            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-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="id"
+          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-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="organization" :props="props">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="totalInsignia" :props="props">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.totalInsignia }}
+              </q-td>
+              <q-td key="allocate" :props="props">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.allocate }}
+              </q-td>
+              <q-td key="remain" :props="props">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.remain }}
+              </q-td>
+            </q-tr>
+          </template>
+          <template v-slot:pagination="scope">
+            <q-pagination
+              v-model="pagination.page"
+              active-color="primary"
+              color="dark"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
+          </template>
+        </q-table>
+      </div>
+    </div>
+  </q-card>
+</template>
+
+<script setup lang="ts">
+import { ref, useAttrs } from "vue";
+import type { QTableProps } from "quasar";
+import router from "@/router";
+import { useQuasar } from "quasar";
+import cardTop from "@/modules/07_insignia/components/2_Manage/StatCard.vue";
+import type { FormProprsalsRound } from " @/modules/07_insignia/interface/request/Main.ts";
+
+const name = ref<string>("");
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+const stat = ref<any>({
+  total: 10,
+  sendInsig: 9,
+  remainInsig: 1,
+});
+
+const visibleColumns = ref<string[]>([
+  "no",
+  "organization",
+  "totalInsignia",
+  "allocate",
+  "remain",
+]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    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: "totalInsignia",
+    align: "left",
+    label: "จำนวนครื่องราช ฯ ที่ได้รับ",
+    sortable: true,
+    field: "totalInsignia",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "allocate",
+    align: "left",
+    label: "จัดสรรให้ข้าราชการแล้ว",
+    sortable: true,
+    field: "allocate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "remain",
+    align: "left",
+    label: "คงเหลือ",
+    sortable: true,
+    field: "remain",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    organization: "โครงสร้างและอัตรากำลัง",
+    totalInsignia: "3",
+    allocate: 3,
+    remain: 0,
+  },
+  {
+    no: "2",
+    organization: "การเรียนรู้มหานคร",
+    totalInsignia: "3",
+    allocate: 0,
+    remain: 0,
+  },
+  {
+    no: "3",
+    organization: "สารสนเทศทรัพยากรบุคคล",
+    totalInsignia: "2",
+    allocate: 2,
+    remain: 0,
+  },
+  {
+    no: "4",
+    organization: "วินัยและเสริมสร้างจริยธรรม",
+    totalInsignia: "1",
+    allocate: 1,
+    remain: 0,
+  },
+]);
+
+// หัวตาราง2
+const clickDelete = (id: string) => {
+  $q.dialog({
+    title: "ยืนยันการลบข้อมูล",
+    message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {})
+    .onCancel(() => {})
+    .onDismiss(() => {});
+};
+
+const clickAdd = () => {
+  router.push({ name: "allocateDetailAdd" });
+};
+
+// const redirectToPage = (id?: string) => {
+//   router.push({ name: "allocateDetail" });
+// };
+// ค้นหาในตาราง
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+
+const filterKeyword2 = ref<string>("");
+const filterRef2 = ref<any>(null);
+const resetFilter2 = () => {
+  filterKeyword2.value = "";
+  filterRef2.value.focus();
+};
+
+const attrs = ref<any>(useAttrs());
+
+const paging = ref<boolean>(true);
+const paginationLabel = (start: string, end: string, total: string) => {
+  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+  else return start + "-" + end + " ใน " + total;
+};
+</script>
+
+<style lang="scss" scope>
+.filter-card {
+  background-color: #f1f1f1b0;
+}
+
+.toggle-expired-account {
+  font-size: 12px;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 150%;
+  color: #35373c;
+}
+
+.icon-color {
+  color: #4154b3;
+}
+
+.custom-header-table {
+  max-height: 64vh;
+
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
diff --git a/src/modules/07_insignia/components/4_Allocate/listAllocate.vue b/src/modules/07_insignia/components/4_Allocate/listAllocate.vue
new file mode 100644
index 000000000..d7834ae25
--- /dev/null
+++ b/src/modules/07_insignia/components/4_Allocate/listAllocate.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    จัดสรรเครื่องราชอิสริยาภรณ์
+  </div>
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+    <div class="row q-col-gutter-sm">
+      <div class="row col-12 q-col-gutter-sm">
+        <div>
+          <q-btn
+            @click="clickAdd()"
+            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-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="id"
+          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-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td
+                key="no"
+                :props="props"
+                @click="redirectToPage(props.row.id)"
+              >
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td
+                key="year"
+                :props="props"
+                @click="redirectToPage(props.row.id)"
+              >
+                {{ props.row.year }}
+              </q-td>
+              <q-td
+                key="insignia"
+                :props="props"
+                @click="redirectToPage(props.row.id)"
+              >
+                {{ props.row.insignia }}
+              </q-td>
+              <q-td
+                key="total"
+                :props="props"
+                @click="redirectToPage(props.row.id)"
+              >
+                {{ props.row.total }}
+              </q-td>
+              <q-td
+                key="done"
+                :props="props"
+                @click="redirectToPage(props.row.id)"
+              >
+                {{ props.row.done }}
+              </q-td>
+              <q-td
+                key="remain"
+                :props="props"
+                @click="redirectToPage(props.row.id)"
+              >
+                {{ props.row.remain }}
+              </q-td>
+            </q-tr>
+          </template>
+          <template v-slot:pagination="scope">
+            <q-pagination
+              v-model="pagination.page"
+              active-color="primary"
+              color="dark"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
+          </template>
+        </q-table>
+      </div>
+    </div>
+  </q-card>
+</template>
+
+<script setup lang="ts">
+import { ref, useAttrs } from "vue";
+import type { QTableProps } from "quasar";
+import router from "@/router";
+import { useQuasar } from "quasar";
+import type { FormProprsalsRound } from " @/modules/07_insignia/interface/request/Main.ts";
+
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const visibleColumns = ref<string[]>([
+  "no",
+  "year",
+  "insignia",
+  "total",
+  "done",
+  "remain",
+]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "year",
+    align: "left",
+    label: "ปี",
+    sortable: true,
+    field: "year",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "insignia",
+    align: "left",
+    label: "เครื่องราชอิสริยาภรณ์",
+    sortable: true,
+    field: "insignia",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "total",
+    align: "left",
+    label: "จำนวนทั้งหมด",
+    sortable: true,
+    field: "total",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "done",
+    align: "left",
+    label: "จัดสรรแล้ว",
+    sortable: true,
+    field: "done",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "remain",
+    align: "left",
+    label: "คงเหลือ",
+    sortable: true,
+    field: "remain",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<FormProprsalsRound[]>([
+  {
+    no: "1",
+    year: "2566",
+    insignia: "เบญจมาภรณ์มงกุฎไทย",
+    total: 10,
+    done: 9,
+    remain: 1,
+  },
+  {
+    round: "2",
+    year: "2566",
+    insignia: "จัตุรถาภรณ์มงกุฎไทย",
+    total: 20,
+    done: 18,
+    remain: 2,
+  },
+  {
+    round: "3",
+    year: "2566",
+    insignia: "ทวีติยาภรณ์มงกุฎไทย",
+    total: 15,
+    done: 10,
+    remain: 5,
+  },
+  {
+    round: "4",
+    year: "2566",
+    insignia: "เหรียญเงินช้างเผือก",
+    total: 5,
+    done: 5,
+    remain: 0,
+  },
+]);
+
+// หัวตาราง2
+const clickDelete = (id: string) => {
+  $q.dialog({
+    title: "ยืนยันการลบข้อมูล",
+    message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {})
+    .onCancel(() => {})
+    .onDismiss(() => {});
+};
+
+const clickAdd = () => {
+  router.push({ name: "allocateAdd" });
+};
+const redirectToPage = (id?: string) => {
+  router.push({ name: "allocateDetail" });
+};
+// ค้นหาในตาราง
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+
+const filterKeyword2 = ref<string>("");
+const filterRef2 = ref<any>(null);
+const resetFilter2 = () => {
+  filterKeyword2.value = "";
+  filterRef2.value.focus();
+};
+
+const attrs = ref<any>(useAttrs());
+
+const paging = ref<boolean>(true);
+const paginationLabel = (start: string, end: string, total: string) => {
+  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+  else return start + "-" + end + " ใน " + total;
+};
+</script>
+
+<style lang="scss" scope>
+.filter-card {
+  background-color: #f1f1f1b0;
+}
+
+.toggle-expired-account {
+  font-size: 12px;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 150%;
+  color: #35373c;
+}
+
+.icon-color {
+  color: #4154b3;
+}
+
+.custom-header-table {
+  max-height: 64vh;
+
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
diff --git a/src/modules/07_insignia/components/DialogHeader.vue b/src/modules/07_insignia/components/DialogHeader.vue
new file mode 100644
index 000000000..8aa03351d
--- /dev/null
+++ b/src/modules/07_insignia/components/DialogHeader.vue
@@ -0,0 +1,27 @@
+<template>
+  <q-toolbar>
+    <q-toolbar-title class="text-subtitle2 text-bold">{{
+      tittle
+    }}</q-toolbar-title>
+    <q-btn
+      icon="close"
+      unelevated
+      round
+      dense
+      @click="close"
+      style="color: #ff8080; background-color: #ffdede"
+    />
+  </q-toolbar>
+</template>
+<script setup lang="ts">
+const props = defineProps({
+  tittle: String,
+  close: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
+});
+const close = async () => {
+  props.close();
+};
+</script>
diff --git a/src/modules/07_insignia/components/RecordInsignia.vue b/src/modules/07_insignia/components/RecordInsignia.vue
index 5cae3b3c6..25d261701 100644
--- a/src/modules/07_insignia/components/RecordInsignia.vue
+++ b/src/modules/07_insignia/components/RecordInsignia.vue
@@ -22,10 +22,11 @@
     >
       <q-tab name="hight" label="ขั้นสายสะพาน" />
       <q-tab name="low" label="ขั้นต่ำกว่าสายสะพาน" />
+      <q-tab name="medal" label="เหรียญบำเหน็จบำนาญ" />
     </q-tabs>
     <q-separator />
     <div class="q-py-md q-px-lg">
-      <div>
+      <!-- <div>
         <label class="q-mr-sm">รอบ</label>
         <q-btn
           flat
@@ -36,10 +37,84 @@
           :class="getArrow(arrow)"
           @click="clickRound"
         />
-      </div>
+      </div> -->
       <Transition>
         <div v-if="arrow" class="bg-base rounded-borders q-pa-md">
           <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
+            <!-- <div class="col-xs-6 col-md-2">
+              <q-input
+                class="bg-white"
+                outlined
+                dense
+                lazy-rules
+                v-model="issue"
+                :label="`${'ฉบับ'}`"
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-xs-6 col-md-2">
+              <q-input
+                class="bg-white"
+                outlined
+                dense
+                lazy-rules
+                v-model="book"
+                :label="`${'เล่มที่'}`"
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-xs-6 col-md-2">
+              <q-input
+                class="bg-white"
+                outlined
+                dense
+                lazy-rules
+                v-model="volume"
+                :label="`${'เล่ม'}`"
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-xs-6 col-md-2">
+              <q-input
+                class="bg-white"
+                outlined
+                dense
+                lazy-rules
+                v-model="section"
+                :label="`${'ตอนที่'}`"
+                hide-bottom-space
+              />
+            </div> -->
+            <div class="col-xs-12 col-md-6">
+              <q-file
+                class="bg-white"
+                outlined
+                dense
+                v-model="government"
+                label="ราชกิจจานุเบกษา"
+                hide-bottom-space
+                lazy-rules
+              >
+                <template v-slot:prepend>
+                  <q-icon name="attach_file" color="primary" />
+                </template>
+              </q-file>
+            </div>
+            <div class="col-xs-12 col-md-6">
+              <q-file
+                class="bg-white"
+                outlined
+                dense
+                v-model="document"
+                label="เอกสารประกอบ"
+                hide-bottom-space
+                lazy-rules
+              >
+                <template v-slot:prepend>
+                  <q-icon name="attach_file" color="primary" />
+                </template>
+              </q-file>
+            </div>
             <div class="col-xs-6 col-md-2">
               <datepicker
                 menu-class-name="modalfix"
@@ -116,79 +191,8 @@
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-6 col-md-2">
-              <q-input
-                class="bg-white"
-                outlined
-                dense
-                lazy-rules
-                v-model="issue"
-                :label="`${'ฉบับ'}`"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-md-2">
-              <q-input
-                class="bg-white"
-                outlined
-                dense
-                lazy-rules
-                v-model="book"
-                :label="`${'เล่มที่'}`"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-md-2">
-              <q-input
-                class="bg-white"
-                outlined
-                dense
-                lazy-rules
-                v-model="volume"
-                :label="`${'เล่ม'}`"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-md-2">
-              <q-input
-                class="bg-white"
-                outlined
-                dense
-                lazy-rules
-                v-model="section"
-                :label="`${'ตอนที่'}`"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-12 col-md-6">
-              <q-file
-                class="bg-white"
-                outlined
-                dense
-                v-model="government"
-                label="ราชกิจจานุเบกษา"
-                hide-bottom-space
-                lazy-rules
-              >
-                <template v-slot:prepend>
-                  <q-icon name="attach_file" color="primary" />
-                </template>
-              </q-file>
-            </div>
-            <div class="col-xs-12 col-md-6">
-              <q-file
-                class="bg-white"
-                outlined
-                dense
-                v-model="document"
-                label="เอกสารประกอบ"
-                hide-bottom-space
-                lazy-rules
-              >
-                <template v-slot:prepend>
-                  <q-icon name="attach_file" color="primary" />
-                </template>
-              </q-file>
+            <div class="col-xs-12 col-md-6 justify-end">
+              <q-btn label="บันทึก" @click="save" color="public" />
             </div>
           </div>
         </div>
diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts
index 81ae5c6da..5eb982863 100644
--- a/src/modules/07_insignia/router.ts
+++ b/src/modules/07_insignia/router.ts
@@ -14,7 +14,16 @@ const insigniaProposals = () =>
   import("@/modules/07_insignia/components/1_Proposals/listProposals.vue");
 const roundAdd = () =>
   import("@/modules/07_insignia/components/1_Proposals/addProposals.vue");
-
+const listMange = () =>
+  import("@/modules/07_insignia/components/2_Manage/listManage.vue");
+const listAllocate = () =>
+  import("@/modules/07_insignia/components/4_Allocate/listAllocate.vue");
+const allocateAdd = () =>
+  import("@/modules/07_insignia/components/4_Allocate/allocateAdd.vue");
+const allocateDetail = () =>
+  import("@/modules/07_insignia/components/4_Allocate/detail.vue");
+const allocateDetailAdd = () =>
+  import("@/modules/07_insignia/components/4_Allocate/addDetail.vue");
 export default [
   {
     path: "/insignia",
@@ -87,4 +96,54 @@ export default [
       Role: "insignia",
     },
   },
+  {
+    path: "/insignia/manage/list-manage",
+    name: "insigniaManage",
+    component: listMange,
+    meta: {
+      Auth: true,
+      Key: [8.6],
+      Role: "insignia",
+    },
+  },
+  {
+    path: "/insignia/allocate/list-allocate",
+    name: "insigniaAllocate",
+    component: listAllocate,
+    meta: {
+      Auth: true,
+      Key: [8.7],
+      Role: "insignia",
+    },
+  },
+  {
+    path: "/insignia/allocate/allocate-add",
+    name: "allocateAdd",
+    component: allocateAdd,
+    meta: {
+      Auth: true,
+      Key: [8.8],
+      Role: "insignia",
+    },
+  },
+  {
+    path: "/insignia/allocate/detail",
+    name: "allocateDetail",
+    component: allocateDetail,
+    meta: {
+      Auth: true,
+      Key: [8.9],
+      Role: "insignia",
+    },
+  },
+  {
+    path: "/insignia/allocate/detail-add",
+    name: "allocateDetailAdd",
+    component: allocateDetailAdd,
+    meta: {
+      Auth: true,
+      Key: [8.9],
+      Role: "insignia",
+    },
+  },
 ];