From 0d5db849140d573494164faa7747094a460174f8 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 13 Sep 2023 19:24:42 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20pop-up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ExitInterview/exitMain.vue     |  2 +-
 .../components/4_Allocate/DialogForm.vue      | 43 ++++++++-----------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/modules/06_retirement/components/ExitInterview/exitMain.vue b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
index 788fb5f45..1919fa77f 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
@@ -590,7 +590,7 @@ const saveAppoint = async () => {
           :close="closeModal"
         />
         <q-separator />
-        <q-card-section class="q-p-sm q-gutter-md">
+        <q-card-section class="q-p-sm q-gutter-md bg-grey-1">
           <div class="col-xs-12 col-sm-12 col-md-12">
             <datepicker
               menu-class-name="modalfix"
diff --git a/src/modules/07_insignia/components/4_Allocate/DialogForm.vue b/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
index a222c1fec..180de42cb 100644
--- a/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
+++ b/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
@@ -2,12 +2,13 @@
 import { ref, watch } from "vue";
 import { QForm, useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
-
+import DialogHeader from "@/components/DialogHeader.vue";
 import { useRouter } from "vue-router";
+
 const $q = useQuasar();
 const myForm = ref<QForm | null>(null); //form data input
 const mixin = useCounterMixin();
-const { dialogConfirm,dialogMessageNotify } = mixin;
+const { dialogConfirm, dialogMessageNotify } = mixin;
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
 const amount = ref<number | null>();
@@ -46,37 +47,23 @@ const clickSave = () => {
     myForm.value.validate().then(async (success) => {
       if (success) {
         dialogConfirm($q, () => props.save(grandCross.value, amount.value));
-      }else {
-        dialogMessageNotify($q,"กรุณาข้อมูลให้ครบ")
+      } else {
+        dialogMessageNotify($q, "กรุณาข้อมูลให้ครบ");
       }
-    })
+    });
   }
 };
-
-
 </script>
 
 <template>
   <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 800px">
-      <q-toolbar class="q-py-sm">
-        <q-toolbar-title class="text-h6">จัดสรรเครื่องราชฯ </q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="closeModal"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
+      <DialogHeader tittle="จัดสรรเครื่องราชฯ" :close="closeModal" />
       <q-separator />
 
       <q-form ref="myForm">
-        <div class="q-pa-md">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+        <div class="q-pa-md bg-grey-1">
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-6">
               <q-select
                 hide-bottom-space
@@ -89,7 +76,7 @@ const clickSave = () => {
                 map-options
                 outlined
                 options-cover
-                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`,]"
+                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`]"
                 v-model="grandCross"
                 :label="
                   routeName == 'insigniaAllocate'
@@ -97,7 +84,6 @@ const clickSave = () => {
                     : `เลือกหน่วยงาน`
                 "
               />
-
             </div>
             <div class="col-xs-12 col-sm-6">
               <q-input
@@ -109,7 +95,7 @@ const clickSave = () => {
                 lazy-rules
                 type="number"
                 label="จำนวน"
-                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`,]"
+                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`]"
               />
               <!-- :rules="[(val:any) =>val.length != 13 ||`${'กรุณากรอกเลขบัตรประจำตัวประชาชนให้ครบ'}`,]" -->
             </div>
@@ -120,7 +106,12 @@ const clickSave = () => {
       <q-separator />
       <div class="row justify-end q-py-sm">
         <div class="q-px-md">
-          <q-btn label="บันทึก" @click="clickSave" color="public" :disable="grandCross == '' || amount == null || amount == 0" />
+          <q-btn
+            label="บันทึก"
+            @click="clickSave"
+            color="public"
+            :disable="grandCross == '' || amount == null || amount == 0"
+          />
         </div>
       </div>
     </q-card>