From 5550816a107d8ed485fc375c7e3710a6097e6a4b Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 8 Sep 2023 16:50:27 +0700
Subject: [PATCH] =?UTF-8?q?change=20status=20=E0=B8=A5=E0=B8=B2=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81=20+=20=E0=B9=81=E0=B8=81=E0=B9=89=20route?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_leave/store.ts           | 2 ++
 src/modules/03_leave/views/AddLeave.vue | 4 ++--
 src/modules/03_leave/views/result.vue   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/03_leave/store.ts b/src/modules/03_leave/store.ts
index 85921f7..ca729ff 100644
--- a/src/modules/03_leave/store.ts
+++ b/src/modules/03_leave/store.ts
@@ -11,6 +11,8 @@ export const useRestDataStore = defineStore("Rest", () => {
         return "อนุมัติ";
       case "REJECT":
         return "ไม่อนุมัติ";
+      case "DELETE":
+        return "ยกเลิกการลาออก";
       case "REPORT":
         return "ส่งรายชื่อไปออกคำสั่ง";
       case "DONE":
diff --git a/src/modules/03_leave/views/AddLeave.vue b/src/modules/03_leave/views/AddLeave.vue
index 7fac7fc..f82f2e6 100644
--- a/src/modules/03_leave/views/AddLeave.vue
+++ b/src/modules/03_leave/views/AddLeave.vue
@@ -170,7 +170,7 @@
 						</q-card>
 						<div class="row col-12 q-pa-md" v-if="routeName != 'AddLeave'">
 							<q-space />
-							<q-btn unelevated dense class="q-px-md items-center" color="orange" label="ยกเลิกการลาออก" @click="cancelResing" :disable="tranferOrg == '' && noteReason == ''" />
+							<q-btn v-if="dataDetail.status!=='DELETE' && dataDetail.status!=='DONE'" unelevated dense class="q-px-md items-center" color="orange" label="ยกเลิกการลาออก" @click="cancelResing" :disable="tranferOrg == '' && noteReason == ''" />
 						</div>
 					</div>
 					<q-separator v-if="routeName == 'AddLeave'" />
@@ -316,7 +316,6 @@ const cancelResing = () => {
 			if (route.params.id !== undefined) {
 				id.value = route.params.id.toString()
 				deleteResting(id.value)
-				clickBack()
 			}
 		})
 		.onCancel(() => {})
@@ -335,6 +334,7 @@ const deleteResting = async (id: string) => {
 		})
 		.finally(() => {
 			hideLoader()
+			clickBack()
 		})
 }
 
diff --git a/src/modules/03_leave/views/result.vue b/src/modules/03_leave/views/result.vue
index 3d31e6f..cbfbeb9 100644
--- a/src/modules/03_leave/views/result.vue
+++ b/src/modules/03_leave/views/result.vue
@@ -211,7 +211,7 @@ const createResult = async () => {
 	<div class="col-12 row justify-center">
 		<div class="col-xs-12 col-sm-12 col-md-11">
 			<div class="toptitle text-white col-12 row items-center">
-				<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
+				<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.push(`/leave`)" />
 			</div>
 			<div class="col-12">
 				<q-card bordered>