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

---
 .../components/4_Allocate/DialogEdit.vue        | 17 +++--------------
 .../components/4_Allocate/OrgAdd.vue            | 13 ++++++++++---
 .../components/5_Borrow/DialogForm.vue          | 16 +++-------------
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/modules/07_insignia/components/4_Allocate/DialogEdit.vue b/src/modules/07_insignia/components/4_Allocate/DialogEdit.vue
index cb095dcf7..384817beb 100644
--- a/src/modules/07_insignia/components/4_Allocate/DialogEdit.vue
+++ b/src/modules/07_insignia/components/4_Allocate/DialogEdit.vue
@@ -2,6 +2,7 @@
 import { ref, watch } from "vue";
 import { QForm, useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 const mixin = useCounterMixin();
 const { dialogConfirm } = mixin;
@@ -58,23 +59,11 @@ const clickSave = () => {
 <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="q-pa-md bg-grey-1">
           <div
             class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
           >
diff --git a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
index 7095a5a26..6c9591fbc 100644
--- a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
+++ b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
@@ -272,7 +272,14 @@
       </q-form>
     </q-card>
   </q-dialog>
-  <q-dialog v-model="addNote" persistent>
+  <DialogPopupReason
+    :modal="addNote"
+    title="คืนเครื่องราชฯ"
+    label="กรอกเหตุผลที่ต้องการคืนเครื่องราชฯ"
+    :click-close="clickCloseNote"
+    :savaForm="saveNote"
+  />
+  <!-- <q-dialog v-model="addNote" persistent>
     <q-card style="min-width: 350px">
       <DialogHeader tittle="คืนเครื่องราชฯ  " :close="clickCloseNote" />
 
@@ -290,7 +297,7 @@
         <q-btn label="บันทึก" @click="saveNote" color="public" />
       </q-card-actions>
     </q-card>
-  </q-dialog>
+  </q-dialog> -->
 </template>
 
 <script setup lang="ts">
@@ -299,7 +306,7 @@ import type { QTableProps } from "quasar";
 import router from "@/router";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
-
+import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
 import DialogHeader from "@/modules/07_insignia/components/DialogHeader.vue";
 import cardTop from "@/modules/07_insignia/components/2_Manage/StatCard.vue";
 import type { FormProprsalsRound } from " @/modules/07_insignia/interface/request/Main.ts";
diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index 991eb5d37..8377c9aa8 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -5,6 +5,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import type { DataOption } from "@/modules/04_registry/components/profileType";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 const $q = useQuasar();
 const myForm = ref<QForm>();
@@ -230,22 +231,11 @@ const closeDialog = () => {
 <template>
   <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 900px" 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="closeDialog"
-          style="color: #ff8080; background-color: #ffdede"
-          ><q-tooltip>ปิด</q-tooltip></q-btn
-        >
-      </q-toolbar>
+      <DialogHeader tittle="ยืม-คืนเครื่องราชฯ" :close="closeDialog" />
       <q-separator />
 
       <q-form ref="myForm">
-        <div class="q-pa-md">
+        <div class="q-pa-md bg-grey-1">
           <div
             class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
           >