From e89d03cfa2fbad85fb04df0cd031c188704ac97a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 28 May 2024 14:49:06 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=81=E0=B8=A5=E0=B9=88=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?=
 =?UTF-8?q?=20=3D>=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=82?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B2=E0=B8=94=20Popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopupReplyInbox.vue            | 49 +++++++++----------
 .../00_support/components/FormChat.vue        |  2 +-
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/components/PopupReplyInbox.vue b/src/components/PopupReplyInbox.vue
index 1eed8b2..0cdb863 100644
--- a/src/components/PopupReplyInbox.vue
+++ b/src/components/PopupReplyInbox.vue
@@ -10,7 +10,7 @@ import { useQuasar } from "quasar";
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
 const $q = useQuasar();
 
-const { showLoader, hideLoader, success, messageError } = mixin;
+const { showLoader, hideLoader, success, messageError, dialogConfirm } = mixin;
 
 const myForm = ref<any>();
 const props = defineProps({
@@ -30,35 +30,34 @@ const props = defineProps({
 
 const subject = ref<string>("");
 const body = ref<string>("");
-async function submit() {
-  myForm.value.validate().then(async (result: boolean) => {
-    if (result) {
-      // props.savaForm(reason.value);
-      showLoader();
-      await http
-        .put(config.API.replyMessage(props.idInbox), {
-          subject: subject.value,
-          body: body.value,
-        })
-        .then((res) => {
-          props.clickClose()
-          success($q, "ส่งข้อความสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    }
+function onSubmit() {
+  dialogConfirm($q, () => {
+    showLoader();
+    http
+      .put(config.API.replyMessage(props.idInbox), {
+        subject: subject.value,
+        body: body.value,
+      })
+      .then(() => {
+        props.clickClose();
+        success($q, "ส่งข้อความสำเร็จ");
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
   });
 }
 </script>
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 40vw; max-width: 40vw">
-      <q-form ref="myForm">
+    <q-card
+      :style="$q.screen.gt.xs ? 'width: 40vw; max-width: 40vw' : 'width: 100%'"
+    >
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
         <DialogHeader tittle="ส่งข้อความ" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
@@ -98,7 +97,7 @@ async function submit() {
             unelevated
             label="ส่งข้อความ"
             color="public"
-            @click="submit"
+            type="submit"
             class="q-px-md"
           >
             <!-- icon="mdi-content-save-outline" -->
diff --git a/src/modules/00_support/components/FormChat.vue b/src/modules/00_support/components/FormChat.vue
index b2a698d..99746d0 100644
--- a/src/modules/00_support/components/FormChat.vue
+++ b/src/modules/00_support/components/FormChat.vue
@@ -11,7 +11,7 @@ const { date2Thai } = useCounterMixin();
 const { scrollContainer } = storeToRefs(store);
 
 function getOnlineStatus(option: "icon" | "status") {
-  const isAdmin = store.userStatus.some((u) => u.role.includes("admin"));
+  const isAdmin = store.userStatus.some((u: any) => u.role.includes("admin"));
   if (option === "icon") return isAdmin ? "green" : "grey";
   if (option === "status") return isAdmin ? "ออนไลน์" : "ออฟไลน์";
 }