From 174530e7f9bad0a8b1072ba608e3ecd04294f140 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 10 Nov 2023 13:56:18 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20mixin=20?=
 =?UTF-8?q?messageError=20=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20result=20?=
 =?UTF-8?q?=E0=B8=81=E0=B9=88=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_leave/components/3_WorkTime/DialogForm.vue | 2 +-
 src/modules/09_leave/views/RoundMain.vue                  | 2 +-
 src/stores/mixin.ts                                       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue b/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
index 56310434a..ad6f3f720 100644
--- a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
+++ b/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
@@ -16,7 +16,7 @@ import { useQuasar } from "quasar";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, dialogConfirm, success, messageError } = mixin;
+const { dialogConfirm, success, messageError } = mixin;
 
 /** propsData จาก RoundMain */
 const props = defineProps({
diff --git a/src/modules/09_leave/views/RoundMain.vue b/src/modules/09_leave/views/RoundMain.vue
index cc98f7782..2fbae0053 100644
--- a/src/modules/09_leave/views/RoundMain.vue
+++ b/src/modules/09_leave/views/RoundMain.vue
@@ -229,7 +229,7 @@ const pagination = ref({
             </q-td>
             <q-td>
               <q-btn
-                v-if="props.row.isActive === false"
+                v-if="props.row.isDefault === false"
                 dense
                 flat
                 round
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 9909212ec..d5b93d965 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -376,11 +376,12 @@ export const useCounterMixin = defineStore("mixin", () => {
             },
           });
         } else {
+          const message = e.response.data.result ?? e.response.data.message;
           q.dialog({
             component: CustomComponent,
             componentProps: {
               title: `พบข้อผิดพลาด`,
-              message: `${e.response.data.message}`,
+              message: `${message}`,
               icon: "warning",
               color: "red",
               onlycancel: true,