From c3282f4738e6ec9733859a7c3b7ac05b9bb4d7ca Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 2 May 2025 13:52:17 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=80=E0=B8=81=E0=B9=87=E0=B8=9A=20tab?=
 =?UTF-8?q?=20=E0=B9=83=E0=B8=99=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Achievement/Main.vue      | 17 ++++++++---------
 src/modules/04_registryPerson/store.ts          |  2 ++
 .../15_development/components/MainTab.vue       |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/Main.vue b/src/modules/04_registryPerson/components/detail/Achievement/Main.vue
index 94e482785..689d0adee 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/Main.vue
@@ -11,8 +11,6 @@ import DeclarationHonor from "@/modules/04_registryPerson/components/detail/Achi
 import ResultsPerformance from "@/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue";
 
 const storeRegistry = useRegistryNewDataStore();
-
-const tab = ref<string>("1");
 </script>
 <template>
   <div class="row items-center q-my-md">
@@ -25,8 +23,9 @@ const tab = ref<string>("1");
   </div>
 
   <q-separator />
+
   <q-tabs
-    v-model="tab"
+    v-model="storeRegistry.tab"
     active-color="blue-8"
     align="left"
     bordered
@@ -43,24 +42,24 @@ const tab = ref<string>("1");
   </q-tabs>
   <q-separator />
 
-  <q-tab-panels v-model="tab" animated>
+  <q-tab-panels v-model="storeRegistry.tab" animated>
     <q-tab-panel name="1">
-      <ProfessionalLicense :is-leave="storeRegistry.isLeave"/>
+      <ProfessionalLicense :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
     <q-tab-panel name="2">
-      <Train :is-leave="storeRegistry.isLeave"/>
+      <Train :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
     <q-tab-panel name="3">
-      <Insignia :is-leave="storeRegistry.isLeave"/>
+      <Insignia :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
     <q-tab-panel name="4">
-      <DeclarationHonor :is-leave="storeRegistry.isLeave"/>
+      <DeclarationHonor :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
     <q-tab-panel name="4">
       <PerformSpecialWork />
     </q-tab-panel>
     <q-tab-panel name="5">
-      <ResultsPerformance :is-leave="storeRegistry.isLeave"/>
+      <ResultsPerformance :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
   </q-tab-panels>
 </template>
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 41419b903..023879952 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -20,6 +20,7 @@ const { messageError } = useCounterMixin();
 
 export const useRegistryNewDataStore = defineStore("registryNew", () => {
   const route = useRoute();
+  const tab = ref<string>("1");
   const routerName = ref<any>();
   const searchTypeOption = computed<DataOption[]>(() => {
     return [
@@ -260,5 +261,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     createPathUploadFlie,
     getPathUploadFlie,
     uploadFile,
+    tab
   };
 });
diff --git a/src/modules/15_development/components/MainTab.vue b/src/modules/15_development/components/MainTab.vue
index e909eee20..cba4f4e04 100644
--- a/src/modules/15_development/components/MainTab.vue
+++ b/src/modules/15_development/components/MainTab.vue
@@ -155,7 +155,7 @@ onMounted(() => {
       class="q-mr-sm"
       icon="mdi-arrow-left"
       color="primary"
-      @click="router.push('/development')"
+      @click="router.go(-1)"
     />
     {{
       checkRoutePermission

From 161847d687c1e2715131e8ede23089b9dee30899 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 2 May 2025 13:56:31 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=80=E0=B8=A7=E0=B9=89=E0=B8=99?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=99=E0=B8=99=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/scholarship/DetailView.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 20dcf8e0e..c462cc770 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -58,7 +58,7 @@ const budgetSourceOp = ref<DataOption[]>([
   { id: "HOSPITAL", name: "เงินนอกงบประมาณ" },
   { id: "FUND", name: "เงินกองทุน" },
   { id: "SUBSIDY", name: "เงินอุดหนุน" },
-  { id: "OTHER", name: "เงินอื่นๆ" },
+  { id: "OTHER", name: "เงินอื่น ๆ" },
 ]);
 
 const useOfficialTimeOp = ref<DataOption[]>([