From 0de7b3f5239829f25417535b962d3ac381f9328a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 19 Sep 2023 10:15:14 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A8=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B2=E0=B8=A2=E0=B8=B8=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_retirement/storeRetirement.ts |  4 +--
 src/modules/06_retirement/views/Main.vue     | 27 ++++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/modules/06_retirement/storeRetirement.ts b/src/modules/06_retirement/storeRetirement.ts
index b91a41152..3ed2430f6 100644
--- a/src/modules/06_retirement/storeRetirement.ts
+++ b/src/modules/06_retirement/storeRetirement.ts
@@ -3,8 +3,8 @@ import { ref } from 'vue'
 export const useDataStoreRetirement = defineStore("retirementDatastore", () => {
   const tab = ref<any>("officer");
   const type = ref<string>("officer");
-  const clickTab = (role:string) => {
-      type.value = role
+  const clickTab = (role: string) => {
+    type.value = role
   }
   return {
     tab,
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index eebf73036..711c27ea7 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -13,9 +13,16 @@
         indicator-color="primary"
         align="left"
       >
-        <q-tab name="officer" label="ขรก.กทม.สามัญ" @click="clickTab('officer')" />
-        <q-tab name="employee" label="ลูกจ้างประจำ" @click="clickTab('employee')" />
-        
+        <q-tab
+          name="officer"
+          label="ขรก.กทม.สามัญ"
+          @click="clickTab('officer')"
+        />
+        <q-tab
+          name="employee"
+          label="ลูกจ้างประจำ"
+          @click="clickTab('employee')"
+        />
       </q-tabs>
     </div>
     <q-separator />
@@ -284,12 +291,12 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
-import { useDataStoreRetirement } from '@/modules/06_retirement/storeRetirement'
+import { useDataStoreRetirement } from "@/modules/06_retirement/storeRetirement";
 import type { resMain } from "@/modules/06_retirement/interface/response/Main";
 import { storeToRefs } from "pinia";
-const useStoreRetire = useDataStoreRetirement()
-const { clickTab} = useStoreRetire
-const { tab , type} = storeToRefs(useDataStoreRetirement())
+const useStoreRetire = useDataStoreRetirement();
+const { clickTab } = useStoreRetire;
+const { tab, type } = storeToRefs(useDataStoreRetirement());
 const mixin = useCounterMixin();
 const { messageError, date2Thai, showLoader, hideLoader, dialogConfirm } =
   mixin;
@@ -307,7 +314,6 @@ const pagination = ref({
 const actionOption = ref<resMain[]>([]);
 const action = ref<string>("");
 
-
 const visibleColumns = ref<string[]>([
   "no",
   "Date",
@@ -484,7 +490,7 @@ const clickAdd = () => {
     dialogConfirm(
       $q,
       async () => {
-        let data = { type: type, year: currentYear };
+        let data = { type: useStoreRetire.type, year: currentYear };
         await cerateRetirement(data);
       },
       "ยืนยันการเพิ่มข้อมูลประกาศเกษียณ",
@@ -513,7 +519,7 @@ const clickSelect = async (action: string) => {
     $q,
     async () => {
       let data = {
-        type: type,
+        type: useStoreRetire.type,
         year: currentYear,
         retireHistoryId: action,
         option: radio.value,
@@ -565,7 +571,6 @@ const paginationLabel = (start: string, end: string, total: string) => {
   else return start + "-" + end + " ใน " + total;
 };
 const nextPage = (prop: any) => {
-
   router.push(`/retirement/${prop.id}`);
 };