fix download excel ในจัดการคำขอของเครื่องราช

src/modules/07_insignia/components/2_Manage/Tab1.vue

@@ -347,17 +347,17 @@ const fecthlistperson = async (id: string) => {
 const clickAdd = async () => {
   dataPerson.id
     ? await myForm.value!.validate().then((result: boolean) => {
-        if (result) {
+      if (result) {
-          dialogConfirm(
+        dialogConfirm(
-            $q,
+          $q,
-            async () => {
+          async () => {
-              await addlistperson(dataPerson.id);
+            await addlistperson(dataPerson.id);
-            },
+          },
-            "ยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ",
+          "ยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ",
-            "ต้องการยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ นี้หรือไม่?"
+          "ต้องการยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ นี้หรือไม่?"
-          );
+        );
-        }
+      }
-      })
+    })
     : dialogMessageNotify($q, "กรุณาเลือกราชชื่อที่ต้องการเพิ่ม");
 };
 //เพิ่มราชชื่อข้าราชการ
@@ -416,11 +416,10 @@ const downloadFileexcel = async () => {
   showLoader();
   await http
     .put(config.API.insigniaDowanload(DataStore.requestId), {
-      responseType: "blob",
       profileType:
         DataStore.employeeClass == "all" ? null : DataStore.employeeClass,
       InsigniaId: DataStore.typeinsignia == "all" ? null : findInsigniaId.id,
-    })
+    }, { responseType: "blob" })
     .then(async (res) => {
       await downloadFile(
         res,
@@ -696,221 +695,100 @@ const clearInsigniaFilters = (name: string) => {
   <div class="col-12 row q-pa-md">
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
-        <q-select
+        <q-select class="col-4" v-if="roleDataStore.adminRole" v-model="organization" label="หน่วยงาน" dense emit-value
-          class="col-4"
+          map-options :options="filterOrganizationOP" option-value="id" option-label="name" lazy-rules use-input
-          v-if="roleDataStore.adminRole"
+          hide-bottom-space :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false"
-          v-model="organization"
+          style="min-width: 150px" @update:model-value="changtypeOc" @filter="(inputValue: any,
-          label="หน่วยงาน"
+            doneFn: Function) => filterSelector(inputValue, doneFn, 'filterOrganizationOP'
-          dense
+            )" />
-          emit-value
+        <q-select class="col-1" v-model="DataStore.typeinsignia" label="ประเภทเครื่องราชฯ ที่ยืนขอ" dense emit-value
-          map-options
+          map-options :options="typeinsigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-          :options="filterOrganizationOP"
+          use-input :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false"
-          option-value="id"
+          style="min-width: 180px" @update:model-value="
-          option-label="name"
-          lazy-rules
-          use-input
-          hide-bottom-space
-          :readonly="false"
-          :borderless="false"
-          :outlined="true"
-          :hide-dropdown-icon="false"
-          style="min-width: 150px"
-          @update:model-value="changtypeOc"
-          @filter="(inputValue:any,
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'filterOrganizationOP'
-                      ) "
-        />
-        <q-select
-          class="col-1"
-          v-model="DataStore.typeinsignia"
-          label="ประเภทเครื่องราชฯ ที่ยืนขอ"
-          dense
-          emit-value
-          map-options
-          :options="typeinsigniaOptions"
-          option-value="id"
-          option-label="name"
-          lazy-rules
-          hide-bottom-space
-          use-input
-          :readonly="false"
-          :borderless="false"
-          :outlined="true"
-          :hide-dropdown-icon="false"
-          style="min-width: 180px"
-          @update:model-value="
             DataStore.searchDataTable(
               DataStore.typeinsignia,
               DataStore.employeeClass
             )
-          "
+            " @filter="(inputValue: any,
-          @filter="(inputValue:any,
+    doneFn: Function) => filterSelector(inputValue, doneFn, 'typeinsigniaOptions'
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'typeinsigniaOptions'
+    )">
-                      ) "
-        >
           <template v-if="DataStore.typeinsignia !== 'all'" v-slot:append>
-            <q-icon
+            <q-icon name="cancel" @click.stop.prevent="
-              name="cancel"
+              clearInsigniaFilters('typeinsigniaOptions'),
-              @click.stop.prevent="
-                clearInsigniaFilters('typeinsigniaOptions'),
-                  DataStore.searchDataTable(
-                    DataStore.typeinsignia,
-                    DataStore.employeeClass
-                  )
-              "
-              class="cursor-pointer"
-            />
-          </template>
-        </q-select>
-        <div>
-          <q-select
-            class="col-2"
-            v-model="DataStore.employeeClass"
-            dense
-            outlined
-            lazy-rules
-            hide-bottom-space
-            :label="`${'สถานภาพ'}`"
-            emit-value
-            use-input
-            map-options
-            option-label="name"
-            :options="employeeClassOps"
-            option-value="id"
-            :readonly="false"
-            :borderless="false"
-            style="min-width: 150px"
-            @update:model-value="
               DataStore.searchDataTable(
                 DataStore.typeinsignia,
                 DataStore.employeeClass
               )
-            "
+              " class="cursor-pointer" />
-            @filter="(inputValue:any,
+          </template>
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps'
+        </q-select>
-                      ) "
+        <div>
-          >
+          <q-select class="col-2" v-model="DataStore.employeeClass" dense outlined lazy-rules hide-bottom-space
+            :label="`${'สถานภาพ'}`" emit-value use-input map-options option-label="name" :options="employeeClassOps"
+            option-value="id" :readonly="false" :borderless="false" style="min-width: 150px" @update:model-value="
+              DataStore.searchDataTable(
+                DataStore.typeinsignia,
+                DataStore.employeeClass
+              )
+              " @filter="(inputValue: any,
+    doneFn: Function) => filterSelector(inputValue, doneFn, 'employeeClassOps'
+    )">
             <template v-if="DataStore.employeeClass !== 'all'" v-slot:append>
-              <q-icon
+              <q-icon name="cancel" @click.stop.prevent="
-                name="cancel"
+                clearInsigniaFilters('employeeClassOps'),
-                @click.stop.prevent="
+                DataStore.searchDataTable(
-                  clearInsigniaFilters('employeeClassOps'),
+                  DataStore.typeinsignia,
-                    DataStore.searchDataTable(
+                  DataStore.employeeClass
-                      DataStore.typeinsignia,
+                )
-                      DataStore.employeeClass
+                " class="cursor-pointer" />
-                    )
-                "
-                class="cursor-pointer"
-              />
             </template>
           </q-select>
         </div>
         <div>
-          <q-btn
+          <q-btn size="md" icon="mdi-download" flat round color="primary" @click="downloadFileexcel">
-            size="md"
-            icon="mdi-download"
-            flat
-            round
-            color="primary"
-            @click="downloadFileexcel"
-          >
             <q-tooltip>ดาวน์โหลด</q-tooltip>
           </q-btn>
-          <q-btn
+          <q-btn size="12px" flat round color="add" icon="mdi-plus" @click="clickmodalAdd" v-if="(DataStore.isLock == false &&
-            size="12px"
+              DataStore.requestStatus == 'st5' &&
-            flat
+              roleDataStore.adminRole) ||
-            round
+            checkStatus == true
-            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
+        <q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
-          class="col-xs-12 col-sm-3 col-md-2"
+          debounce="300" placeholder="ค้นหา">
-          standout
-          dense
-          v-model="filterKeyword"
-          ref="filterRef"
-          outlined
-          debounce="300"
-          placeholder="ค้นหา"
-        >
           <template v-slot:append>
             <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon
+            <q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
-              v-if="filterKeyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
           </template>
         </q-input>
 
-        <q-select
+        <q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
-          v-model="visibleColumns"
+          emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
-          multiple
+          class="col-xs-12 col-sm-3 col-md-2" />
-          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
+        <q-table ref="table" :columns="columns" :rows="DataStore.rows" :filter="filterKeyword" row-key="name" flat
-          ref="table"
+          bordered :paging="true" dense class="custom-header-table" :visible-columns="visibleColumns"
-          :columns="columns"
+          :pagination-label="paginationLabel" v-model:pagination="pagination">
-          :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></q-th>
-              <q-th
+              <q-th auto-width v-if="(DataStore.isLock == false &&
-                auto-width
+                  DataStore.requestStatus == 'st5') ||
-                v-if="
+                checkStatus == true
-                  (DataStore.isLock == false &&
+                " />
-                    DataStore.requestStatus == 'st5') ||
-                  checkStatus == true
-                "
-              />
               <q-th v-else></q-th>
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr
+            <q-tr :props="props" class="cursor-pointer" @click.stop="nextPage(props.row.profileId)">
-              :props="props"
-              class="cursor-pointer"
-              @click.stop="nextPage(props.row.profileId)"
-            >
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -945,112 +823,50 @@ const clearInsigniaFilters = (name: string) => {
                 {{ props.row.dateSend }}
               </q-td>
               <q-td key="note" class="text-center">
-                <q-btn
+                <q-btn v-if="props.row.reason" icon="mdi-information-outline" size="12px" color="blue" flat round dense
-                  v-if="props.row.reason"
+                  @click.stop="clickShowreson(props.row.name, props.row.reason)">
-                  icon="mdi-information-outline"
-                  size="12px"
-                  color="blue"
-                  flat
-                  round
-                  dense
-                  @click.stop="clickShowreson(props.row.name, props.row.reason)"
-                >
                   <q-tooltip>หมายเหตุ</q-tooltip>
                 </q-btn>
               </q-td>
               <q-td key="warn" class="text-center" v-if="props.row.statusMark">
-                <q-btn
+                <q-btn icon="mdi-information-outline" size="12px" color="red" flat round dense @click.stop="
-                  icon="mdi-information-outline"
+                  clickShowWarn(
-                  size="12px"
+                    props.row.markDiscipline,
-                  color="red"
+                    props.row.markLeave,
-                  flat
+                    props.row.markRate
-                  round
+                  )
-                  dense
+                  ">
-                  @click.stop="
+                  <q-tooltip>แจ้งเตือน</q-tooltip></q-btn>
-                    clickShowWarn(
-                      props.row.markDiscipline,
-                      props.row.markLeave,
-                      props.row.markRate
-                    )
-                  "
-                >
-                  <q-tooltip>แจ้งเตือน</q-tooltip></q-btn
-                >
               </q-td>
               <q-td v-else auto-width></q-td>
 
-              <q-td
+              <q-td v-close-popup auto-width v-if="(DataStore.isLock == false &&
-                v-close-popup
+                  DataStore.requestStatus == 'st5' &&
-                auto-width
+                  roleDataStore.adminRole) ||
-                v-if="
+                checkStatus == true
-                  (DataStore.isLock == false &&
+                ">
-                    DataStore.requestStatus == 'st5' &&
+                <q-btn v-if="roleDataStore.adminRole ||
-                    roleDataStore.adminRole) ||
+                  (roleDataStore.insignia1Role &&
-                  checkStatus == true
+                    (requestStatus == 'st1' || requestStatus == 'st4'))
-                "
+                  " icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense @click.stop>
-              >
-                <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
+                      <q-item clickable @click.stop="clickmodalEdit(props.row)" v-close-popup>
-                        clickable
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                        @click.stop="clickmodalEdit(props.row)"
-                        v-close-popup
-                      >
-                        <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
+                      <q-item clickable @click.stop="clickReject(props.row.id)" v-close-popup>
-                        clickable
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                        @click.stop="clickReject(props.row.id)"
-                        v-close-popup
-                      >
-                        <q-item-section
-                          style="min-width: 0px"
-                          avatar
-                          class="q-py-sm"
-                        >
                           <q-tooltip>ไม่ยื่นขอ</q-tooltip>
-                          <q-icon
+                          <q-icon color="blue" size="xs" name="mdi-alert-circle-outline" />
-                            color="blue"
-                            size="xs"
-                            name="mdi-alert-circle-outline"
-                          />
                         </q-item-section>
                         <q-item-section>ไม่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item
+                      <q-item clickable @click.stop="clickDelete(props.row.id)" v-close-popup>
-                        clickable
+                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                        @click.stop="clickDelete(props.row.id)"
-                        v-close-popup
-                      >
-                        <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>
@@ -1061,30 +877,16 @@ const clearInsigniaFilters = (name: string) => {
                 </q-btn>
               </q-td>
               <q-td v-else auto-width></q-td>
-              <q-td
+              <q-td auto-width v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'">
-                auto-width
+                <btnDownloadFile :profileId="props.row.profileId" :round="DataStore.roundId"
-                v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
+                  :optionRound="DataStore.optionRound" />
-              >
-                <btnDownloadFile
-                  :profileId="props.row.profileId"
-                  :round="DataStore.roundId"
-                  :optionRound="DataStore.optionRound"
-                />
               </q-td>
               <q-td v-else auto-width></q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination
+            <q-pagination v-model="pagination.page" active-color="primary" color="primary" :max="scope.pagesNumber"
-              v-model="pagination.page"
+              :max-pages="5" size="sm" boundary-links direction-links></q-pagination>
-              active-color="primary"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
           </template>
         </q-table>
       </div>
@@ -1096,14 +898,8 @@ const clearInsigniaFilters = (name: string) => {
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
 
-        <q-btn
+        <q-btn icon="close" unelevated round dense @click="modalAdd = false"
-          icon="close"
+          style="color: #ff8080; background-color: #ffdede" />
-          unelevated
-          round
-          dense
-          @click="modalAdd = false"
-          style="color: #ff8080; background-color: #ffdede"
-        />
       </q-toolbar>
       <q-separator />
       <q-card-section class="q-pa-sm bg-grey-1">
@@ -1112,49 +908,24 @@ const clearInsigniaFilters = (name: string) => {
             <q-card flat bordered class="fit q-pa-sm">
               <q-toolbar style="padding: 0">
                 <q-space />
-                <q-input
+                <q-input borderless outlined dense debounce="300" placeholder="ค้นหา" v-model="filterKeyword2">
-                  borderless
-                  outlined
-                  dense
-                  debounce="300"
-                  placeholder="ค้นหา"
-                  v-model="filterKeyword2"
-                >
                   <template v-slot:append>
                     <q-icon name="search" />
                   </template>
                 </q-input>
               </q-toolbar>
-              <q-table
+              <q-table flat bordered dense :rows="rows2" :columns="columns2" :filter="filterKeyword2" row-key="fullname"
-                flat
+                class="custom-header-table" :pagination-label="paginationLabel2" v-model:pagination="pagination2">
-                bordered
-                dense
-                :rows="rows2"
-                :columns="columns2"
-                :filter="filterKeyword2"
-                row-key="fullname"
-                class="custom-header-table"
-                :pagination-label="paginationLabel2"
-                v-model:pagination="pagination2"
-              >
                 <template v-slot:header="props">
                   <q-tr :props="props">
-                    <q-th
+                    <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                      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
+                  <q-tr :props="props" class="cursor-pointer" :class="{ 'text-primary': props.row.id === dataPerson.id }"
-                    :props="props"
+                    @click="selectPerson(props.row)">
-                    class="cursor-pointer"
-                    :class="{ 'text-primary': props.row.id === dataPerson.id }"
-                    @click="selectPerson(props.row)"
-                  >
                     <q-td style="width: 75px">{{ props.rowIndex + 1 }}</q-td>
                     <q-td style="width: 250px" key="citizenId" :props="props">
                       {{ props.row.citizenId }}
@@ -1165,15 +936,8 @@ const clearInsigniaFilters = (name: string) => {
                   </q-tr>
                 </template>
                 <template v-slot:pagination="scope">
-                  <q-pagination
+                  <q-pagination v-model="pagination2.page" color="primary" :max="scope.pagesNumber" :max-pages="5"
-                    v-model="pagination2.page"
+                    size="sm" boundary-links direction-links></q-pagination>
-                    color="primary"
-                    :max="scope.pagesNumber"
-                    :max-pages="5"
-                    size="sm"
-                    boundary-links
-                    direction-links
-                  ></q-pagination>
                 </template>
               </q-table>
             </q-card>
@@ -1184,71 +948,28 @@ const clearInsigniaFilters = (name: string) => {
                 <div class="q-pa-md">
                   <div class="row q-gutter-sm">
                     <div class="col-12">
-                      <q-input
+                      <q-input borderless outlined dense label="ตำแหน่งในสายงาน" placeholder="ตำแหน่งในสายงาน"
-                        borderless
+                        v-model="dataPerson.position" readonly />
-                        outlined
-                        dense
-                        label="ตำแหน่งในสายงาน"
-                        placeholder="ตำแหน่งในสายงาน"
-                        v-model="dataPerson.position"
-                        readonly
-                      />
                     </div>
                     <div class="col-12">
-                      <q-input
+                      <q-input borderless outlined dense label="สังกัด" placeholder="สังกัด"
-                        borderless
+                        v-model="dataPerson.organizationOrganization" readonly />
-                        outlined
-                        dense
-                        label="สังกัด"
-                        placeholder="สังกัด"
-                        v-model="dataPerson.organizationOrganization"
-                        readonly
-                      />
                     </div>
                     <div class="col-12">
-                      <q-input
+                      <q-input borderless outlined dense label="ระดับ" placeholder="ระดับ " v-model="dataPerson.level"
-                        borderless
+                        readonly />
-                        outlined
-                        dense
-                        label="ระดับ"
-                        placeholder="ระดับ "
-                        v-model="dataPerson.level"
-                        readonly
-                      />
                     </div>
                     <div class="col-12">
-                      <q-select
+                      <q-select v-model="insigniaType" label="ประเภทเครื่องราชฯ" dense emit-value map-options
-                        v-model="insigniaType"
+                        :options="insigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-                        label="ประเภทเครื่องราชฯ"
+                        :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" :rules="[
-                        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"
-                        :rules="[
                           (val) => !!val || `กรุณาเลือกประเภทเครื่องราช`,
-                        ]"
+                        ]" />
-                      />
                     </div>
                     <div class="col-12">
-                      <q-input
+                      <q-input type="textarea" class="full-width inputgreen cursor-pointer" hide-bottom-space outlined
-                        type="textarea"
+                        dense lazy-rules :rules="[(val) => !!val || `กรุณากรอกหมายเหตุ`]" v-model="reason"
-                        class="full-width inputgreen cursor-pointer"
+                        :label="`หมายเหตุ`" />
-                        hide-bottom-space
-                        outlined
-                        dense
-                        lazy-rules
-                        :rules="[(val) => !!val || `กรุณากรอกหมายเหตุ`]"
-                        v-model="reason"
-                        :label="`หมายเหตุ`"
-                      />
                     </div>
                   </div>
                 </div>
@@ -1270,42 +991,18 @@ const clearInsigniaFilters = (name: string) => {
   <q-dialog v-model="modalEdit" persistent>
     <q-card style="width: 450px; max-width: 80vw">
       <q-form ref="myForm">
-        <DialogHeader
+        <DialogHeader tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ" :close="closeModalEdit" />
-          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
+            <q-select v-model="insignia" label="ชื่อเครื่องราชฯ" dense emit-value map-options :options="insigniaOptions"
-              v-model="insignia"
+              option-value="id" option-label="name" lazy-rules hide-bottom-space :readonly="false" :borderless="false"
-              label="ชื่อเครื่องราชฯ"
+              :outlined="true" :hide-dropdown-icon="false" style="width: 100%" />
-              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>
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn
+          <q-btn dense unelevated label="บันทึก" color="public" @click="clickSave" class="q-px-md">
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            @click="clickSave"
-            class="q-px-md"
-          >
             <!-- icon="mdi-content-save-outline" -->
             <q-tooltip>บันทึก</q-tooltip>
           </q-btn>
@@ -1315,59 +1012,27 @@ const clearInsigniaFilters = (name: string) => {
   </q-dialog>
 
   <!-- popup เหตุผลไม่ยื่นขอ -->
-  <DialogPopupReason
+  <DialogPopupReason :modal="modelPopupReject" title="เหตุผลการไม่ยื่นขอ" label="หมายเหตุ"
-    :modal="modelPopupReject"
+    :click-close="closemodelPopupReject" :savaForm="savaReasonReject" />
-    title="เหตุผลการไม่ยื่นขอ"
-    label="หมายเหตุ"
-    :click-close="closemodelPopupReject"
-    :savaForm="savaReasonReject"
-  />
   <!--  เหตุผลที่ลบออก -->
-  <DialogPopupReason
+  <DialogPopupReason :modal="modelPopupDelete" title="เหตุผลการลบออก" label="หมายเหตุ"
-    :modal="modelPopupDelete"
+    :click-close="closemodelPopupDelete" :savaForm="savaReasonDelete" />
-    title="เหตุผลการลบออก"
-    label="หมายเหตุ"
-    :click-close="closemodelPopupDelete"
-    :savaForm="savaReasonDelete"
-  />
   <!--  หมายเหตุ -->
-  <DialogInformation
+  <DialogInformation :modal="dialogNote" :title="dialogTitle" :desc="dialogDesc" :click-close="clickCloseReson" />
-    :modal="dialogNote"
-    :title="dialogTitle"
-    :desc="dialogDesc"
-    :click-close="clickCloseReson"
-  />
   <!-- แจ้งเตือน -->
   <q-dialog v-model="dialogWarn">
     <q-card style="width: 800px; max-width: 80vw">
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">แจ้งเตือน </q-toolbar-title>
 
-        <q-btn
+        <q-btn icon="close" unelevated round dense v-close-popup style="color: #ff8080; background-color: #ffdede" />
-          icon="close"
-          unelevated
-          round
-          dense
-          v-close-popup
-          style="color: #ff8080; background-color: #ffdede"
-        />
       </q-toolbar>
       <q-separator />
       <div class="q-pa-md">
         <div class="q-gutter-sm">
-          <q-item
+          <q-item tag="label" v-ripple v-for="list in checkboxData" :key="list.id">
-            tag="label"
-            v-ripple
-            v-for="list in checkboxData"
-            :key="list.id"
-          >
             <q-item-section avatar>
-              <q-checkbox
+              <q-checkbox v-model="list.val" :val="`${list.id}`" color="teal" disable />
-                v-model="list.val"
-                :val="`${list.id}`"
-                color="teal"
-                disable
-              />
               <!-- <q-radio v-model="checkboxList" :val="list.id" color="teal" /> -->
             </q-item-section>
             <q-item-section>