From 141c3a92f8be6f9f59979b2ca382d8329cf54992 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 19 Jan 2024 13:40:51 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B8=A5=E0=B8=B2=E0=B8=8B=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_leave/views/EditPage.vue |  2 +-
 src/stores/mixin.ts                     | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue
index 62768d3..a15feed 100644
--- a/src/modules/05_leave/views/EditPage.vue
+++ b/src/modules/05_leave/views/EditPage.vue
@@ -268,6 +268,7 @@ function onConfirm(id: string) {
 			await http
 				.put(config.API.leaveUserSendId(personalId.value), { reason: "" })
 				.then(() => {
+					router.push("/leave");
 					success($q, "ยื่นใบลาสำเร็จ");
 				})
 				.catch((e: any) => {
@@ -275,7 +276,6 @@ function onConfirm(id: string) {
 				})
 				.finally(() => {
 					hideLoader();
-					router.push("/leave");
 					// fetchDataDetail(personalId.value);
 				});
 		},
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 47b31cd..6c8c9b3 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -411,7 +411,7 @@ export const useCounterMixin = defineStore("mixin", () => {
         component: CustomComponent,
         componentProps: {
           title: `ข้อความแจ้งเตือน`,
-          message: `ขออภัยไม่สามารถลาได้เนื่องจากจำนวนวันลาของคุณเกินสิทธิ์ที่กำหนด`,
+          message: `ไม่สามารถขอลาในช่วงเวลาเดียวกันได้ เนื่องจากมีการขอลาในช่วงเวลาดังกล่าวแล้ว`,
           icon: "warning",
           color: "red",
           onlycancel: true,
@@ -432,7 +432,18 @@ export const useCounterMixin = defineStore("mixin", () => {
                 onlycancel: true,
               },
             });
-          } else {
+          } else if (e.response.data.result) {
+            q.dialog({
+              component: CustomComponent,
+              componentProps: {
+                title: `ข้อความแจ้งเตือน`,
+                message: `${e.response.data.result}`,
+                icon: "warning",
+                color: "red",
+                onlycancel: true,
+              },
+            });
+          } else if (e.response.data.message) {
             q.dialog({
               component: CustomComponent,
               componentProps: {