From eb6b05d73861d007e5fa49ee66c88c69c78c5afd Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Thu, 17 Aug 2023 15:51:08 +0700
Subject: [PATCH] =?UTF-8?q?UI=20=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B9=80=E0=B8=AB=E0=B8=A3=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=8D=E0=B8=95=E0=B8=A3=E0=B8=B2=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=97=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A2=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B9=81?=
 =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=9E=E0=B8=A3=E0=B8=B0=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=AB=E0=B8=A3=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=8D=E0=B8=88=E0=B8=B1=E0=B8=81=E0=B8=A3=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=94=E0=B8=B4=E0=B8=A1=E0=B8=B2=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            |  10 +-
 .../CoinRequest/coinRequestMain.vue           | 335 +++++++++
 .../coinAllocate/coinAllocateAdd.vue          |  78 ++
 .../coinAllocate/coinAllocateDetail.vue       | 419 +++++++++++
 .../coinAllocate/coinAllocateDetailAdd.vue    | 690 ++++++++++++++++++
 .../coinAllocate/coinAllocateMain.vue         | 363 +++++++++
 .../coinReport/coinReportDetail.vue           | 271 +++++++
 .../components/coinReport/coinReportMain.vue  |  38 +
 .../components/dialog/DialogHeader.vue        |  28 +
 src/modules/09_coin/router.ts                 |  78 +-
 10 files changed, 2304 insertions(+), 6 deletions(-)
 create mode 100644 src/modules/09_coin/components/CoinRequest/coinRequestMain.vue
 create mode 100644 src/modules/09_coin/components/coinAllocate/coinAllocateAdd.vue
 create mode 100644 src/modules/09_coin/components/coinAllocate/coinAllocateDetail.vue
 create mode 100644 src/modules/09_coin/components/coinAllocate/coinAllocateDetailAdd.vue
 create mode 100644 src/modules/09_coin/components/coinAllocate/coinAllocateMain.vue
 create mode 100644 src/modules/09_coin/components/coinReport/coinReportDetail.vue
 create mode 100644 src/modules/09_coin/components/coinReport/coinReportMain.vue
 create mode 100644 src/modules/09_coin/components/dialog/DialogHeader.vue

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 6277348a8..b7d75e34f 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -395,11 +395,11 @@ const menuList = readonly<any[]>([
             path: "coinRequest",
             role: "coin",
           },
-          {
-            label: "ประวัติการยื่นขอ",
-            path: "coinHistory",
-            role: "coin",
-          },
+          // {
+          //   label: "ประวัติการยื่นขอ",
+          //   path: "coinHistory",
+          //   role: "coin",
+          // },
           {
             label: "จัดสรรเหรียญตรา",
             path: "coinAllocate",
diff --git a/src/modules/09_coin/components/CoinRequest/coinRequestMain.vue b/src/modules/09_coin/components/CoinRequest/coinRequestMain.vue
new file mode 100644
index 000000000..925ebdf02
--- /dev/null
+++ b/src/modules/09_coin/components/CoinRequest/coinRequestMain.vue
@@ -0,0 +1,335 @@
+<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";
+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);
+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 round = ref<string>("รอบการเสนอพระราชทานเครื่องราชปี 2556");
+const optionRound = [
+  "รอบการเสนอพระราชทานเครื่องราชปี 2557",
+  "รอบการเสนอพระราชทานเครื่องราชปี 2558",
+  "รอบการเสนอพระราชทานเครื่องราชปี 2556",
+];
+const visibleColumns = ref<string[]>([
+  "no",
+  "fullname",
+  "requestType",
+
+]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+
+// หัวตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "fullname",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: "fullname",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "requestType",
+    align: "left",
+    label: "ประเภทคำร้องขอเเก้ไข",
+    sortable: true,
+    field: "requestType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  
+]);
+
+// ข้อมูลตาราง (จำลอง)
+const rows = ref<any[]>([
+  {
+    no: "1",
+    fullname: "นายใจดี ยอดใจ ",
+    requestType: "xxxxxx",
+  },
+  {
+    no: "2",
+    fullname: "นายใจดี ยอดใจ ",
+    requestType: "xxxxxx",
+  },
+  {
+    no: "3",
+    fullname: "นายใจดี ยอดใจ ",
+    requestType: "xxxxxx",
+  },
+]);
+
+
+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>
+<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>
+          <div class=" col-12 row items-center">
+            <div class="q-pl-sm q-mr-md text-weight-bold text-grey-6">รอบ</div>
+
+            <q-select borderless v-model="round" :options="optionRound" />
+          </div>
+        </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">
+        <d-table
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="Order"
+          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.row.no }}
+              </q-td>
+              <q-td key="fullname" :props="props">
+                {{ props.row.fullname }}
+              </q-td>
+              <q-td
+                key="requestType"
+                :props="props"
+                @click="clickEdit(props.row)"
+              >
+                {{ props.row.requestType }}
+              </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>
+        </d-table>
+      </div>
+    </div>
+  </q-card>
+</template>
diff --git a/src/modules/09_coin/components/coinAllocate/coinAllocateAdd.vue b/src/modules/09_coin/components/coinAllocate/coinAllocateAdd.vue
new file mode 100644
index 000000000..ea7e35e85
--- /dev/null
+++ b/src/modules/09_coin/components/coinAllocate/coinAllocateAdd.vue
@@ -0,0 +1,78 @@
+<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.push(`/coin/allocate/list-allocate`)"
+        />
+        <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>
+  
\ No newline at end of file
diff --git a/src/modules/09_coin/components/coinAllocate/coinAllocateDetail.vue b/src/modules/09_coin/components/coinAllocate/coinAllocateDetail.vue
new file mode 100644
index 000000000..b778cfbd5
--- /dev/null
+++ b/src/modules/09_coin/components/coinAllocate/coinAllocateDetail.vue
@@ -0,0 +1,419 @@
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    <q-btn
+      icon="mdi-arrow-left"
+      unelevated
+      round
+      dense
+      flat
+      color="primary"
+      class="q-mr-sm"
+      @click="router.push(`/coin/allocate/list-allocate`)"
+    />
+    หน่วยงานจัดสรรเหรียนตรา {{ 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" @click="detailbyOrg()">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="organization" :props="props" @click="detailbyOrg()">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="totalInsignia" :props="props" @click="detailbyOrg()">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.totalInsignia }}
+              </q-td>
+              <q-td key="allocate" :props="props" @click="detailbyOrg()">
+                <!-- @click="redirectToPage(props.row.id)" -->
+                {{ props.row.allocate }}
+              </q-td>
+              <q-td key="remain" :props="props" @click="detailbyOrg()">
+                <!-- @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>
+  <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-select
+            outlined
+            class="full-width inputgreen cursor-pointer custom-input"
+            standout
+            dense
+            hide-bottom-space
+            :rules="[(val) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]"
+            lazy-rules
+            option-label="label"
+            option-value="id"
+            emit-value
+            :options="options"
+            v-model="orgSelect"
+            :label="`${'เลือกหน่วยงาน'}`"
+            map-options
+          />
+          <q-input
+            outlined
+            dense
+            lazy-rules
+            v-model="Amountallocate"
+            :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`]"
+            hide-bottom-space
+            :label="`${'จำนวนโคตาเครื่องราชฯ'}`"
+            type="number"
+          />
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right" class="bg-white text-teal">
+          <q-btn label="บันทึก" @click="saveAdd" color="public" />
+        </q-card-actions>
+      </q-form>
+    </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 cardTop from "@/modules/07_insignia/components/2_Manage/StatCard.vue";
+import DialogHeader from "@/modules/09_coin/components/dialog/DialogHeader.vue";
+const name = ref<string>("");
+const orgSelect = ref<string>("");
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const clickClose = async () => {
+  modal.value = false;
+};
+const Amountallocate = ref<number>();
+const options = ref<any[]>([
+  { label: "โครงสร้างเเละอัตรากำลัง", id: "xxxxx1" },
+  { label: "การเรียนรู้มหานคร", id: "xxxxx2" },
+  { label: "สารสนเทศทรัพยากรบุคคล", id: "xxxxx3" },
+  { label: "วินัยเเละเสริมสร้างจริยธรรม", id: "xxxxx4" },
+]);
+const saveAdd = () => {
+  console.log(`dataSave==>${orgSelect.value},${Amountallocate.value}`)
+  modal.value = 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 = () => {
+  modal.value = true;
+};
+const detailbyOrg = () => {
+  router.push(`/coin/allocate/detail-add`);
+};
+// 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/09_coin/components/coinAllocate/coinAllocateDetailAdd.vue b/src/modules/09_coin/components/coinAllocate/coinAllocateDetailAdd.vue
new file mode 100644
index 000000000..e8c118990
--- /dev/null
+++ b/src/modules/09_coin/components/coinAllocate/coinAllocateDetailAdd.vue
@@ -0,0 +1,690 @@
+<template>
+    <div class="toptitle text-dark 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)"
+        />
+      รายชื่อที่จัดสรรเหรียนตรา {{ 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"
+                    outline
+                    
+                  />
+                </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";
+  
+  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>
+  
\ No newline at end of file
diff --git a/src/modules/09_coin/components/coinAllocate/coinAllocateMain.vue b/src/modules/09_coin/components/coinAllocate/coinAllocateMain.vue
new file mode 100644
index 000000000..6b5536ebc
--- /dev/null
+++ b/src/modules/09_coin/components/coinAllocate/coinAllocateMain.vue
@@ -0,0 +1,363 @@
+<script setup lang="ts">
+import { ref, useAttrs } from "vue";
+import type { QTableProps } from "quasar";
+import router from "@/router";
+import { useQuasar } from "quasar";
+
+const $q = useQuasar(); //ใช้ noti quasar
+const modal = ref<boolean>(false);
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const visibleColumns = ref<string[]>([
+  "no",
+  "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<any[]>([
+  { 
+    id:"xxxxx1",
+    no: "1",
+    year: "2566",
+    insignia: "เบญจมาภรณ์มงกุฎไทย",
+    total: 10,
+    done: 9,
+    remain: 1,
+  },
+  {
+    id:"xxxxx2",
+    no: "2",
+    year: "2566",
+    insignia: "จัตุรถาภรณ์มงกุฎไทย",
+    total: 20,
+    done: 18,
+    remain: 2,
+  },
+  {
+    id:"xxxxx3",
+    no: "3",
+    year: "2566",
+    insignia: "ทวีติยาภรณ์มงกุฎไทย",
+    total: 15,
+    done: 10,
+    remain: 5,
+  },
+  {
+    id:"xxxxx4",
+    no: "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(`/coin/allocate/allocate-add`);
+};
+const redirectToPage = (id?: string) => {
+  router.push(`/coin/allocate/detail/${id}`);
+};
+// ค้นหาในตาราง
+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>
+<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">
+          <d-table
+            ref="table"
+            :columns="columns"
+            :rows="rows"
+            :filter="filterKeyword"
+            row-key="id"
+            flat
+            bordered
+            :paging="true"
+            dense
+            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>
+          </d-table>
+        </div>
+      </div>
+    </q-card>
+  </template>
+  
+
+  
+  <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>
+  
\ No newline at end of file
diff --git a/src/modules/09_coin/components/coinReport/coinReportDetail.vue b/src/modules/09_coin/components/coinReport/coinReportDetail.vue
new file mode 100644
index 000000000..790750219
--- /dev/null
+++ b/src/modules/09_coin/components/coinReport/coinReportDetail.vue
@@ -0,0 +1,271 @@
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { VuePDF, usePDF } from "@tato30/vue-pdf";
+
+const pdfSrc = ref<any>();
+const numOfPages = ref<number>(0);
+const page = ref<number>(1);
+const dialog = ref<boolean>(false);
+onMounted(async () => {
+  const pdfData = usePDF(
+    "https://raw.githubusercontent.com/mozilla/pdf.js/ba2edeae/web/compressed.tracemonkey-pldi-09.pdf"
+  );
+
+  setTimeout(() => {
+    pdfSrc.value = pdfData.pdf.value;
+    numOfPages.value = pdfData.pages.value;
+  }, 1000);
+  console.log(pdfData);
+});
+
+const splitterModel = ref(14);
+const selectReport = ref<any>({ id: 1, name: "รายงานขร.1" });
+const optionsReport = ref<any>([
+  { id: 1, name: "รายงานขร.1" },
+  { id: 2, name: "รายงานขร.2" },
+  { id: 3, name: "รายงานขร.3" },
+  { id: 4, name: "รายงานขร.4" },
+]);
+const selectList = ref<any>({ id: 0, name: "เลือกกรอบการยื่นขอ" });
+const optionsList = ref<any>([
+  { id: 1, name: "list 1" },
+  { id: 2, name: "list 2" },
+]);
+const nextPage = () => {
+  if (page.value < numOfPages.value) {
+    page.value++;
+  }
+};
+const backPage = () => {
+  if (page.value !== 1) {
+    page.value--;
+  }
+};
+
+const backHistory = () => {
+  window.history.back();
+};
+</script>
+
+<template>
+  <div class="toptitle">
+    <q-btn
+      icon="mdi-arrow-left"
+      unelevated
+      round
+      dense
+      flat
+      color="primary"
+      class="q-mr-sm"
+      @click="backHistory"
+    />
+    บัญชีเเสดงจำนวนชั้นตราเหรียญจักรพรรดิมาลา ซึ่งขอพระราชทานให้เเก่ข้าราชการ
+  </div>
+  <div>
+    <q-card flat bordered class="col-12 q-mt-sm">
+      <div class="q-pa-md q-gutter-y-md">
+        <q-toolbar style="padding: 0" >
+
+          <q-select
+            dense
+            outlined
+            v-model="selectList"
+            :options="optionsList"
+            :label="optionsList.name"
+            option-value="id"
+            option-label="name"
+          />
+          <q-space />
+          <div class="q-pa-ms q-gutter-sm" style="padding: 0">
+            <q-btn outline color="primary" icon="mdi-arrow-down-bold-circle-outline" label="ดาวน์โหลด" />
+            <q-btn icon="mdi-eye-outline" color="primary" label="แสดงรางงาน" />
+            <!-- <q-btn
+              color="primary"
+              icon="mdi-fullscreen"
+              @click="dialog = true"
+            /> -->
+          </div>
+        </q-toolbar>
+        <q-splitter
+          v-model="splitterModel"
+          horizontal
+          style="
+            height: 70vh;
+            border: 1px solid rgb(210, 210, 210);
+            border-radius: 5px;
+          "
+          before-class="overflow-hidden disable"
+          separator-class="bg-white disabled"
+        >
+          <template v-slot:before>
+            <div class="q-pa-md">
+              <div class="row items-start items-center">
+                <div class="col">
+                  <q-btn
+                    padding="xs"
+                    icon="mdi-chevron-left"
+                    color="grey-2"
+                    text-color="grey-5"
+                    size="md"
+                    class="my-auto"
+                    @click="backPage"
+                    :disable="page == 1"
+                  />
+                </div>
+                <div class="col-12 col-md-auto">
+                  <div class="q-pa-md flex">
+                    หน้าที่ {{ page }} จาก {{ numOfPages }}
+                  </div>
+                </div>
+                <div class="col text-right">
+                  <q-btn
+                    padding="xs"
+                    icon="mdi-chevron-right"
+                    color="grey-2"
+                    text-color="grey-5"
+                    size="md"
+                    @click="nextPage"
+                    :disable="page === numOfPages"
+                  />
+                </div>
+              </div>
+            </div>
+          </template>
+          <template v-slot:after>
+            <div class="q-pa-md">
+              <VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
+            </div>
+          </template>
+          <template v-slot:default>
+            <div class="q-pa-md">
+              <div class="row items-start items-center">
+                <div class="col">
+                  <q-btn
+                    padding="xs"
+                    icon="mdi-chevron-left"
+                    color="grey-2"
+                    text-color="grey-5"
+                    size="md"
+                    class="my-auto"
+                    @click="backPage"
+                    :disable="page == 1"
+                  />
+                </div>
+                <div class="col-12 col-md-auto">
+                  <div class="q-pa-md flex">
+                    หน้าที่ {{ page }} จาก {{ numOfPages }}
+                  </div>
+                </div>
+                <div class="col text-right">
+                  <q-btn
+                    padding="xs"
+                    icon="mdi-chevron-right"
+                    color="grey-2"
+                    text-color="grey-5"
+                    size="md"
+                    @click="nextPage"
+                    :disable="page === numOfPages"
+                  />
+                </div>
+              </div>
+            </div>
+          </template>
+        </q-splitter>
+      </div>
+    </q-card>
+  </div>
+
+  <!-- Dialog Full Screen -->
+  <q-dialog
+    v-model="dialog"
+    persistent
+    :maximized="true"
+    transition-show="slide-up"
+    transition-hide="slide-down"
+  >
+    <q-card class="bg-white">
+      <div class="flex justify-end items-center align-center q-mr-md q-mt-sm">
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          style="color: #ff8080; background-color: #ffdede"
+          size="12px"
+          v-close-popup
+        />
+      </div>
+      <div class="q-pa-md">
+        <div class="row items-start items-center">
+          <div class="col">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-left"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              class="my-auto"
+              @click="backPage"
+              :disable="page == 1"
+            />
+          </div>
+          <div class="col-12 col-md-auto">
+            <div class="q-pa-md flex">
+              หน้าที่ {{ page }} จาก {{ numOfPages }}
+            </div>
+          </div>
+          <div class="col text-right">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-right"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              @click="nextPage"
+              :disable="page === numOfPages"
+            />
+          </div>
+        </div>
+        <div class="row items- items-center">
+          <VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
+        </div>
+        <div class="row items- items-end">
+          <div class="col">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-left"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              class="my-auto"
+              @click="backPage"
+              :disable="page == 1"
+            />
+          </div>
+          <div class="col-12 col-md-auto">
+            <div class="q-pa-md flex">
+              หน้าที่ {{ page }} จาก {{ numOfPages }}
+            </div>
+          </div>
+          <div class="col text-right">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-right"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              @click="nextPage"
+              :disable="page === numOfPages"
+            />
+          </div>
+        </div>
+      </div>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style lang="scss" scope>
+.disabled {
+  pointer-events: none;
+}
+</style>
diff --git a/src/modules/09_coin/components/coinReport/coinReportMain.vue b/src/modules/09_coin/components/coinReport/coinReportMain.vue
new file mode 100644
index 000000000..7f460bec7
--- /dev/null
+++ b/src/modules/09_coin/components/coinReport/coinReportMain.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    รางงานเครื่องราชอิสริยาภรณ์
+  </div>
+  <div>
+    <q-card flat bordered class="col-12 q-mt-sm">
+      <div class="q-pa-md">
+        <q-item to="/coin/coinReport/detail" dense class="hover-green">
+          <q-item-section avatar>
+            <q-icon color="primary" name="mdi-file" size="xs" />
+          </q-item-section>
+          <q-item-section class="text-dark">
+            บัญชีแสดงจำนวนชั้นตราเหรียนจักรพรรดิมาลา ซึ่งขอพระราชทานให้เเก่ข้าราชการ
+          </q-item-section>
+        </q-item>
+
+        <q-item to="/coin/coinReport/detail" dense class="hover-green">
+          <q-item-section avatar>
+            <q-icon color="primary" name="mdi-file" size="xs" />
+          </q-item-section>
+          <q-item-section class="text-dark">
+            บันทึกรายชื่อข้าราชการผู้ขอพระราชทานเหรียญจักรพรรคดิมาลาและประวัติข้าราชการสามัญฯ
+          </q-item-section>
+        </q-item>
+
+      </div>
+    </q-card>
+  </div>
+</template>
+
+<style lang="scss" scope>
+.hover-green:hover {
+  background-color: $teal-1;
+}
+
+</style>
diff --git a/src/modules/09_coin/components/dialog/DialogHeader.vue b/src/modules/09_coin/components/dialog/DialogHeader.vue
new file mode 100644
index 000000000..eb1561f11
--- /dev/null
+++ b/src/modules/09_coin/components/dialog/DialogHeader.vue
@@ -0,0 +1,28 @@
+<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>
+  
\ No newline at end of file
diff --git a/src/modules/09_coin/router.ts b/src/modules/09_coin/router.ts
index ede52ede8..6507166d6 100644
--- a/src/modules/09_coin/router.ts
+++ b/src/modules/09_coin/router.ts
@@ -8,7 +8,13 @@ const coinProposals = () =>
   import("@/modules/09_coin/components/1_Proposals/listProposals.vue");
 const coinRoundAdd = () =>
   import("@/modules/09_coin/components/1_Proposals/addProposals.vue");
-
+const coinRequestMain = () => import("@/modules/09_coin/components/CoinRequest/coinRequestMain.vue")
+const coinAllocateMain = () => import("@/modules/09_coin/components/coinAllocate/coinAllocateMain.vue")
+const coinAllocateAdd = () => import("@/modules/09_coin/components/coinAllocate/coinAllocateAdd.vue")
+const coinAllocateDetail = () => import("@/modules/09_coin/components/coinAllocate/coinAllocateDetail.vue")
+const coinAllocateDetailAdd = () => import("@/modules/09_coin/components/coinAllocate/coinAllocateDetailAdd.vue")
+const coinReport = () => import("@/modules/09_coin/components/coinReport/coinReportMain.vue")
+const coinReportDetail = () => import("@/modules/09_coin/components/coinReport/coinReportDetail.vue")
 export default [
   {
     path: "/coin",
@@ -60,4 +66,74 @@ export default [
       Role: "coin",
     },
   },
+  {
+    path: "/coin/request",
+    name: "coinRequest",
+    component: coinRequestMain,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/coin/allocate/list-allocate",
+    name: "coinAllocate",
+    component: coinAllocateMain,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/coin/allocate/allocate-add",
+    name: "coinAllocate-Add",
+    component: coinAllocateAdd,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/coin/allocate/detail/:id",
+    name: "coinAllocate-detail",
+    component: coinAllocateDetail,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/coin/allocate/detail-add",
+    name: "coinAllocate-detailAdd",
+    component: coinAllocateDetailAdd,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/coin/coinReport",
+    name: "coinReport",
+    component: coinReport,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
+  {
+    path: "/coin/coinReport/detail",
+    name: "coinReportDetail",
+    component: coinReportDetail,
+    meta: {
+      Auth: true,
+      Key: [8.2],
+      Role: "coin",
+    },
+  },
 ];