diff --git a/src/components/Dialogs/Information.vue b/src/components/Dialogs/Information.vue
index 05747f2de..28373e805 100644
--- a/src/components/Dialogs/Information.vue
+++ b/src/components/Dialogs/Information.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import DialogHeader from "@/components/DialogHeader.vue";
+
 const props = defineProps({
   modal: {
     type: Boolean,
@@ -20,19 +22,18 @@ const props = defineProps({
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 500px; max-width: 500px">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="header-text">{{ props.title }}</q-toolbar-title>
-        <q-btn icon="close" unelevated round dense @click="clickClose" style="color: #ff8080; background-color: #ffdede" />
-      </q-toolbar>
+    <q-card style="width: 35vw; max-width: 35vw">
+      <q-form ref="myForm">
+        <DialogHeader :tittle="props.title" :close="clickClose" />
+        <q-separator />
+        <q-card-section class="q-pa-md bg-grey-1">
+          <div class="row col-12">
 
-      <q-separator />
-      <q-card-section class="q-p-sm">
-        <div class="row col-12">
-          {{ props.desc }}
-        </div>
-      </q-card-section>
-      <q-separator />
+            {{ props.desc }}
+
+          </div>
+        </q-card-section>
+      </q-form>
     </q-card>
   </q-dialog>
 </template>
\ No newline at end of file
diff --git a/src/components/Dialogs/PopupReason.vue b/src/components/Dialogs/PopupReason.vue
index 0878d5bb3..2b97f8e21 100644
--- a/src/components/Dialogs/PopupReason.vue
+++ b/src/components/Dialogs/PopupReason.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 const reason = ref<string>("");
 const props = defineProps({
@@ -17,11 +18,11 @@ const props = defineProps({
   },
   clickClose: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
   savaForm: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 watch(props, () => {
@@ -42,43 +43,30 @@ const submit = () => {
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 500px; max-width: 500px">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="header-text">{{ props.title }}</q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="clickClose"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
-
-      <q-separator />
+    <q-card style="width: 40vw; max-width: 40vw">
       <q-form ref="myForm">
-        <q-card-section class="q-p-sm">
-          <div class="row col-12">
-            <q-input
-              type="textarea"
-              class="full-width inputgreen cursor-pointer"
-              hide-bottom-space
-              outlined
-              dense
-              lazy-rules
-              :rules="[(val) => !!val || `กรุณากรอก${label}`]"
-              v-model="reason"
-              :label="`${label}`"
-            />
+        <DialogHeader :tittle="props.title" :close="clickClose" />
+        <q-separator />
+        <q-card-section class="q-pa-sm bg-grey-1">
+          <div class="row col-12 q-col-gutter-sm">
+            <div class="col-xs-12">
+              <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
+
+                <q-input type="textarea" class="full-width inputgreen cursor-pointer" hide-bottom-space outlined dense
+                  lazy-rules :rules="[(val) => !!val || `กรุณากรอก${label}`]" v-model="reason" :label="`${label}`" />
+
+
+              </div>
+            </div>
           </div>
         </q-card-section>
-
         <q-separator />
-
-        <q-toolbar class="text-primary">
-          <q-space />
-          <q-btn label="บันทึก" color="secondary" @click="submit" />
-        </q-toolbar>
+        <q-card-actions align="right">
+          <q-btn dense unelevated label="บันทึก" color="public" @click="submit" class="q-px-md">
+            <!-- icon="mdi-content-save-outline" -->
+            <q-tooltip>บันทึก</q-tooltip>
+          </q-btn>
+        </q-card-actions>
       </q-form>
     </q-card>
   </q-dialog>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 115574033..ca40c434b 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -10,6 +10,7 @@ import config from "@/app.config";
 import { useRouter } from "vue-router";
 
 import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 const router = useRouter();
 const mixin = useCounterMixin();
@@ -566,87 +567,41 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
   if (paging2.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
+
+const closeModalEdit = () => {
+  modalEdit.value = false
+}
 </script>
 
 <template>
   <div class="col-12 row q-pa-md">
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
-        <q-select
-          v-if="roleDataStore.adminRole"
-          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"
-          @update:model-value="changtypeOc"
-        />
-        <q-select
-          v-model="DataStore.typeinsignia"
-          label="ปรเภทเครื่องราชฯ"
-          dense
-          emit-value
-          map-options
-          :options="DataStore.typeinsigniaOptions"
-          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"
+        <q-select v-if="roleDataStore.adminRole" 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"
+          @update:model-value="changtypeOc" />
+        <q-select v-model="DataStore.typeinsignia" label="ปรเภทเครื่องราชฯ" dense emit-value map-options
+          :options="DataStore.typeinsigniaOptions" 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"
           @update:model-value="
             DataStore.searchDataTable(
               DataStore.typeinsignia,
               DataStore.employeeClass
             )
-          "
-        />
+            " />
         <div>
-          <q-select
-            v-model="DataStore.employeeClass"
-            dense
-            outlined
-            lazy-rules
-            hide-bottom-space
-            :label="`${'สถานภาพ'}`"
-            emit-value
-            map-options
-            option-label="name"
-            :options="DataStore.employeeClassOps"
-            option-value="id"
-            :readonly="false"
-            :borderless="false"
-            style="min-width: 150px"
-            @update:model-value="
+          <q-select v-model="DataStore.employeeClass" dense outlined lazy-rules hide-bottom-space :label="`${'สถานภาพ'}`"
+            emit-value map-options option-label="name" :options="DataStore.employeeClassOps" option-value="id"
+            :readonly="false" :borderless="false" style="min-width: 150px" @update:model-value="
               DataStore.searchDataTable(
                 DataStore.typeinsignia,
                 DataStore.employeeClass
               )
-            "
-          />
+              " />
         </div>
         <div>
-          <q-btn
-            size="md"
-            icon="mdi-download"
-            flat
-            round
-            color="primary"
-            @click="downloadFileexcel"
-          >
+          <q-btn size="md" icon="mdi-download" flat round color="primary" @click="downloadFileexcel">
             <!-- @click="downloadReport('pdf')" -->
             <q-tooltip>ดาวน์โหลด</q-tooltip>
             <!-- <q-menu>
@@ -672,99 +627,45 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
               </q-list>
             </q-menu> -->
           </q-btn>
-          <q-btn
-            size="12px"
-            flat
-            round
-            color="add"
-            icon="mdi-plus"
-            @click="clickmodalAdd"
-            v-if="
-              (DataStore.isLock == false &&
-                DataStore.requestStatus == 'st5' &&
-                roleDataStore.adminRole) ||
-              checkStatus == true
-            "
-          >
+          <q-btn size="12px" flat round color="add" icon="mdi-plus" @click="clickmodalAdd" v-if="(DataStore.isLock == false &&
+            DataStore.requestStatus == 'st5' &&
+            roleDataStore.adminRole) ||
+            checkStatus == true
+            ">
             <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="ค้นหา"
-        >
+        <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"
-            />
+            <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"
-        />
+        <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="DataStore.rows"
-          :filter="filterKeyword"
-          row-key="name"
-          flat
-          bordered
-          :paging="true"
-          dense
-          class="custom-header-table"
-          :visible-columns="visibleColumns"
-          :pagination-label="paginationLabel"
-          v-model:pagination="pagination"
-        >
+        <q-table ref="table" :columns="columns" :rows="DataStore.rows" :filter="filterKeyword" row-key="name" flat
+          bordered :paging="true" dense class="custom-header-table" :visible-columns="visibleColumns"
+          :pagination-label="paginationLabel" v-model:pagination="pagination">
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-              <q-th
-                auto-width
-                v-if="
-                  (DataStore.isLock == false &&
-                    DataStore.requestStatus == 'st5') ||
-                  checkStatus == true
-                "
-              />
+              <q-th auto-width v-if="(DataStore.isLock == false &&
+                DataStore.requestStatus == 'st5') ||
+                checkStatus == true
+                " />
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr
-              :props="props"
-              class="cursor-pointer"
-              @click.stop="nextPage(props.row.profileId)"
-            >
+            <q-tr :props="props" class="cursor-pointer" @click.stop="nextPage(props.row.profileId)">
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -798,77 +699,33 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
               <q-td key="dateSend" :props="props">
                 {{ props.row.dateSend }}
               </q-td>
-              <q-td
-                auto-width
-                v-if="
-                  (DataStore.isLock == false &&
-                    DataStore.requestStatus == 'st5' &&
-                    roleDataStore.adminRole) ||
-                  checkStatus == true
-                "
-              >
-                <q-btn
-                  v-if="
-                    roleDataStore.adminRole ||
-                    (roleDataStore.insignia1Role &&
-                      (requestStatus == 'st1' || requestStatus == 'st4'))
-                  "
-                  icon="mdi-dots-vertical"
-                  size="12px"
-                  color="grey-7"
-                  flat
-                  round
-                  dense
-                  @click.stop
-                >
+              <q-td auto-width v-if="(DataStore.isLock == false &&
+                DataStore.requestStatus == 'st5' &&
+                roleDataStore.adminRole) ||
+                checkStatus == true
+                ">
+                <q-btn v-if="roleDataStore.adminRole ||
+                  (roleDataStore.insignia1Role &&
+                    (requestStatus == 'st1' || requestStatus == 'st4'))
+                  " icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense @click.stop>
                   <q-menu transition-show="jump-down" transition-hide="jump-up">
                     <q-list dense style="min-width: 250px">
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click.stop="clickmodalEdit(props.row)"
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
+                      <q-item clickable v-close-popup @click.stop="clickmodalEdit(props.row)">
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                           <q-tooltip>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-tooltip>
                           <q-icon color="primary" size="xs" name="mdi-pencil" />
                         </q-item-section>
-                        <q-item-section
-                          >แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section
-                        >
+                        <q-item-section>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click.stop="clickReject(props.row.id)"
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
+                      <q-item clickable v-close-popup @click.stop="clickReject(props.row.id)">
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                           <q-tooltip>ไม่ยื่นขอ</q-tooltip>
-                          <q-icon
-                            color="blue"
-                            size="xs"
-                            name="mdi-alert-circle-outline"
-                          />
+                          <q-icon color="blue" size="xs" name="mdi-alert-circle-outline" />
                         </q-item-section>
                         <q-item-section>ไม่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click.stop="clickDelete(props.row.id)"
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
+                      <q-item clickable v-close-popup @click.stop="clickDelete(props.row.id)">
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                           <q-tooltip>ลบออก</q-tooltip>
                           <q-icon color="red" size="xs" name="mdi-delete" />
                         </q-item-section>
@@ -881,16 +738,8 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
             </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>
+            <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>
@@ -903,62 +752,25 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
 
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="modalAdd = false"
-          style="color: #ff8080; background-color: #ffdede"
-        />
+        <q-btn icon="close" unelevated round dense @click="modalAdd = false"
+          style="color: #ff8080; background-color: #ffdede" />
       </q-toolbar>
       <q-separator />
       <div class="q-pa-md">
         <q-toolbar style="padding: 0">
-          <q-select
-            v-model="insigniaType"
-            label="ปรเภทเครื่องราชฯ"
-            dense
-            emit-value
-            map-options
-            :options="insigniaOptions"
-            option-value="id"
-            option-label="name"
-            lazy-rules
-            hide-bottom-space
-            :readonly="false"
-            :borderless="false"
-            :outlined="true"
-            :hide-dropdown-icon="false"
-            style="min-width: 250px"
-          />
+          <q-select v-model="insigniaType" label="ปรเภทเครื่องราชฯ" dense emit-value map-options
+            :options="insigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
+            :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 250px" />
           <q-space />
-          <q-input
-            borderless
-            outlined
-            dense
-            debounce="300"
-            placeholder="ค้นหา"
-            v-model="filterKeyword2"
-          >
+          <q-input borderless outlined dense debounce="300" placeholder="ค้นหา" v-model="filterKeyword2">
             <!-- style="width: 850px; max-width: auto"? -->
             <template v-slot:append>
               <q-icon name="search" />
             </template>
           </q-input>
         </q-toolbar>
-        <q-table
-          flat
-          bordered
-          dense
-          :rows="rows2"
-          :columns="columns2"
-          :filter="filterKeyword2"
-          row-key="name"
-          class="custom-header-table"
-          :pagination-label="paginationLabel2"
-          v-model:pagination="pagination2"
-        >
+        <q-table flat bordered dense :rows="rows2" :columns="columns2" :filter="filterKeyword2" row-key="name"
+          class="custom-header-table" :pagination-label="paginationLabel2" v-model:pagination="pagination2">
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -984,27 +796,14 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
                 {{ props.row.organizationOrganization }}
               </q-td>
               <q-td>
-                <q-btn
-                  outline
-                  :props="props"
-                  label="เพิ่ม"
-                  class="text-teal-5"
-                  @click="clickAdd(props.row.id)"
-                />
+                <q-btn outline :props="props" label="เพิ่ม" class="text-teal-5" @click="clickAdd(props.row.id)" />
                 <q-tooltip>เพิ่ม</q-tooltip>
               </q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination2.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
+            <q-pagination v-model="pagination2.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
+              boundary-links direction-links></q-pagination>
           </template>
         </q-table>
       </div>
@@ -1013,67 +812,32 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
 
   <!-- Edit -->
   <q-dialog v-model="modalEdit" persistent>
-    <q-card style="width: 450px; max-width: 80vw" class="q-pb-md">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="text-h6"
-          >แก้ไขเครื่องราชฯ ที่ยื่นขอ
-        </q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="modalEdit = false"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
-      <q-separator />
-      <div class="q-pa-md">
-        <div class="row q-col-gutter-sm">
-          <div class="col">
-            <q-select
-              v-model="insignia"
-              label="ชื่อเครื่องราชฯ"
-              dense
-              emit-value
-              map-options
-              :options="insigniaOptions"
-              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"
-            />
+    <q-card style="width: 450px; max-width: 80vw">
+      <q-form ref="myForm">
+        <DialogHeader tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ" :close="closeModalEdit" />
+        <q-separator />
+        <q-card-section class="q-pa-sm bg-grey-1">
+          <div class="row col-12 q-py-md">
+
+              <q-select v-model="insignia" label="ชื่อเครื่องราชฯ" dense emit-value map-options :options="insigniaOptions"
+                option-value="id" option-label="name" lazy-rules hide-bottom-space :readonly="false" :borderless="false"
+                :outlined="true" :hide-dropdown-icon="false" style="width: 100%" />
+
           </div>
-        </div>
-      </div>
-      <q-separator />
-      <div class="q-pa-md">
-        <div class="row justify-end">
-          <q-btn label="บันทึก" @click="clickSave" color="public"
-            ><q-tooltip>บันทึก</q-tooltip></q-btn
-          >
-        </div>
-      </div>
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right">
+          <q-btn dense unelevated label="บันทึก" color="public" @click="clickSave" class="q-px-md">
+            <!-- icon="mdi-content-save-outline" -->
+            <q-tooltip>บันทึก</q-tooltip>
+          </q-btn>
+        </q-card-actions>
+      </q-form>
     </q-card>
   </q-dialog>
 
-  <DialogPopupReason
-    :modal="modelPopupReject"
-    title="เหตุผลไม่ยื่นขอ"
-    label="หมายเหตุ"
-    :click-close="closemodelPopupReject"
-    :savaForm="savaReasonReject"
-  />
-  <DialogPopupReason
-    :modal="modelPopupDelete"
-    title="เหตุผลที่ลบออก"
-    label="หมายเหตุ"
-    :click-close="closemodelPopupDelete"
-    :savaForm="savaReasonDelete"
-  />
+  <DialogPopupReason :modal="modelPopupReject" title="เหตุผลไม่ยื่นขอ" label="หมายเหตุ"
+    :click-close="closemodelPopupReject" :savaForm="savaReasonReject" />
+  <DialogPopupReason :modal="modelPopupDelete" title="เหตุผลที่ลบออก" label="หมายเหตุ"
+    :click-close="closemodelPopupDelete" :savaForm="savaReasonDelete" />
 </template>