From e03a6771adcdb44a81a8525a820792a1b145b585 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 11 Nov 2024 10:05:27 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A5=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_retire/views/addRetire.vue |  4 ++--
 src/modules/03_retire/views/result.vue    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index a1e3404..6803ca2 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -86,7 +86,7 @@ async function onSubmit() {
           if (dataStore.officerType == "OFFICER") {
             router.push(`/retire/result/${id}`);
           } else {
-            router.push(`/retire/result`);
+            router.push(`/retire/${id}`);
           }
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
@@ -171,7 +171,7 @@ onMounted(async () => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/retire')"
         />
         <div v-if="routeName == 'AddRetire'">เพิ่มเรื่องลาออก</div>
         <div v-else>รายละเอียดเรื่องลาออก</div>
diff --git a/src/modules/03_retire/views/result.vue b/src/modules/03_retire/views/result.vue
index b09e91f..bc27137 100644
--- a/src/modules/03_retire/views/result.vue
+++ b/src/modules/03_retire/views/result.vue
@@ -294,7 +294,7 @@ onMounted(async () => {
                         outlined
                         class="bg-white"
                         :rules="[
-                          (val) =>
+                          (val:string) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
                         ]"
                       />
@@ -335,7 +335,7 @@ onMounted(async () => {
                         outlined
                         class="bg-white"
                         :rules="[
-                          (val) =>
+                          (val:string) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
                         ]"
                       />
@@ -366,7 +366,7 @@ onMounted(async () => {
                         outlined
                         class="bg-white"
                         :rules="[
-                          (val) =>
+                          (val:string) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
                         ]"
                       />
@@ -427,7 +427,7 @@ onMounted(async () => {
                         outlined
                         class="bg-white"
                         :rules="[
-                          (val) =>
+                          (val:string) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
                         ]"
                       />
@@ -457,7 +457,7 @@ onMounted(async () => {
                         outlined
                         class="bg-white"
                         :rules="[
-                          (val) =>
+                          (val:string) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
                         ]"
                       />
@@ -488,7 +488,7 @@ onMounted(async () => {
                         outlined
                         class="bg-white"
                         :rules="[
-                          (val) =>
+                          (val:string) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
                         ]"
                       />