From bb7b0c37d1e0bdf20cc0164c875f11090436765b Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 24 Jul 2023 17:47:24 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=20Probation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts | 14 +++++++++++++-
 src/views/MainLayout.vue           | 12 ++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 9b9501dbe..605053b4c 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -201,8 +201,20 @@ const menuList = readonly<any[]>([
       {
         key: 6.3,
         label: "การทดลองงาน" /* การทดลองงาน */,
-        path: "probation",
+        path: "",
         role: "probation",
+        children: [
+          {
+            label: "รายการคำขอโอน",
+            path: "probationTranfer",
+            role: "probation",
+          },
+          {
+            label: "รายการรับโอน",
+            path: "probationReceive",
+            role: "probation",
+          },
+        ],
       },
     ],
   },
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 76ee21a07..d226736cd 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -731,13 +731,21 @@ if (keycloak.tokenParsed != null) {
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
-                <div v-if="menuItem.key == 5 || menuItem.key == 8">
+                <div
+                  v-if="
+                    menuItem.key == 5 || menuItem.key == 6 || menuItem.key == 8
+                  "
+                >
                   <div v-for="(subMenu, i) in menuItem.children" :key="i">
                     <q-expansion-item
                       switch-toggle-side
                       dense-toggle
                       :label="subMenu.label"
-                      v-if="subMenu.key !== 5.1"
+                      v-if="
+                        subMenu.key !== 5.1 &&
+                        subMenu.key !== 6.1 &&
+                        subMenu.key !== 6.2
+                      "
                       class="expan2"
                       dense
                     >

From b40bd12492b853474e0b615f5657897173971c46 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 25 Jul 2023 09:23:39 +0700
Subject: [PATCH 2/5] =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=A3=E0=B8=81=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A8=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/06_retirement/api.retirement.ts  |  2 +-
 src/modules/06_retirement/views/Main.vue | 38 +++++++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts
index 22c78de12..8d49eee59 100644
--- a/src/api/06_retirement/api.retirement.ts
+++ b/src/api/06_retirement/api.retirement.ts
@@ -2,5 +2,5 @@ import env from "../index";
 const retirement = `${env.API_RETIREMENT_URI}/retirement`
 
 export default {
-    retirement:(type:string) => `${retirement}/${type}/2023`
+    retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
 };
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index f2411c8da..f01362c32 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -13,8 +13,8 @@
         indicator-color="primary"
         align="left"
       >
-        <q-tab name="samun" label="ขรก.กทม.สามัญ" @click="get('officer')"/>
-        <q-tab name="employee" label="ลูกจ้างประจำ" @click="get('employee')"/>
+        <q-tab name="samun" label="ขรก.กทม.สามัญ" @click="getYear('officer')"/>
+        <q-tab name="employee" label="ลูกจ้างประจำ" @click="getYear('employee')"/>
       </q-tabs>
     </div>
     <q-separator />
@@ -27,7 +27,7 @@
             dense
             emit-value
             map-options
-            :options="fiscalyearOP"
+            :options="yearOptions"
             option-value="id"
             option-label="name"
             lazy-rules
@@ -175,7 +175,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, useAttrs } from "vue";
+import { onMounted, ref, useAttrs ,reactive} from "vue";
 import type { QTableProps } from "quasar";
 import type {
   FormMainProbation,
@@ -187,6 +187,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin"
 import type { resMain } from '@/modules/06_retirement/interface/response/Main'
+const yearOptions = reactive<any[]>([]);
 
 const mixin = useCounterMixin()
 const { messageError ,date2Thai,showLoader,hideLoader} = mixin
@@ -200,6 +201,7 @@ const pagination = ref({
   rowsPerPage: 10,
 });
 
+const type = ref<string>('employee')
 const visibleColumns = ref<string[]>(["no", "Date", "retireNumber"]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 
 // หัวตาราง
@@ -234,16 +236,35 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 
 // ข้อมูลตาราง (จำลอง)
+
+
 const rows = ref<resMain[]>([]);
 const tab = ref<any>("samun");
 const visibleColumns2 = ref<string[]>(["no", "name", "retireNumber"]);
-const get = async(type:string) =>{
+const getYear = async(type:string) =>{
+  
+  await http
+  .get(config.API.yearOptions())
+  .then((res)=>{
+    yearOptions.length = 0;
+    const response = res.data.result;
+      yearOptions.push(...response);
+
+    console.log(yearOptions)
+    const maxNumber = yearOptions.reduce((max: any, e: any) => {
+        return e.id > max ? e.id : max;
+      }, "");
+      console.log(maxNumber)
+       get(type,maxNumber)
+  })
+}
+const get = async(type:string,year:number) =>{
 
   await http
-  .get(config.API.retirement(type))
+  .get(config.API.retirement(type,year))
   .then((res)=>{
+    rows.value =[]
     let data = res.data.result
-    console.log(data)
      rows.value = data.map((items:resMain) =>({
       id:items.id,
       Date:date2Thai(items.createdAt),
@@ -261,7 +282,8 @@ const get = async(type:string) =>{
 
 }
 onMounted(()=>{
-  get
+  // get
+  getYear()
 })
 // หัวตาราง2
 const columns2 = ref<QTableProps["columns"]>([

From 37722a0916487bddc507d37181662c90ab87fdd0 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:27:52 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts | 26 +++++++++++++-------------
 src/views/MainLayout.vue           | 12 ++----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 605053b4c..af5588930 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -201,20 +201,20 @@ const menuList = readonly<any[]>([
       {
         key: 6.3,
         label: "การทดลองงาน" /* การทดลองงาน */,
-        path: "",
+        path: "probation",
         role: "probation",
-        children: [
-          {
-            label: "รายการคำขอโอน",
-            path: "probationTranfer",
-            role: "probation",
-          },
-          {
-            label: "รายการรับโอน",
-            path: "probationReceive",
-            role: "probation",
-          },
-        ],
+      },
+      {
+        key: 6.4,
+        label: "รายการคำขอโอน" /* */,
+        path: "tranfer",
+        role: "placement",
+      },
+      {
+        key: 6.5,
+        label: "รายการรับโอน" /* */,
+        path: "receive",
+        role: "placement",
       },
     ],
   },
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index d226736cd..76ee21a07 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -731,21 +731,13 @@ if (keycloak.tokenParsed != null) {
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
-                <div
-                  v-if="
-                    menuItem.key == 5 || menuItem.key == 6 || menuItem.key == 8
-                  "
-                >
+                <div v-if="menuItem.key == 5 || menuItem.key == 8">
                   <div v-for="(subMenu, i) in menuItem.children" :key="i">
                     <q-expansion-item
                       switch-toggle-side
                       dense-toggle
                       :label="subMenu.label"
-                      v-if="
-                        subMenu.key !== 5.1 &&
-                        subMenu.key !== 6.1 &&
-                        subMenu.key !== 6.2
-                      "
+                      v-if="subMenu.key !== 5.1"
                       class="expan2"
                       dense
                     >

From cd683d2296f38ff0bb8b11fb02589d9a32f99891 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 25 Jul 2023 09:32:45 +0700
Subject: [PATCH 4/5] no message

---
 src/api/06_retirement/api.retirement.ts  | 6 +-----
 src/modules/06_retirement/views/Main.vue | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts
index be567006f..1a4623078 100644
--- a/src/api/06_retirement/api.retirement.ts
+++ b/src/api/06_retirement/api.retirement.ts
@@ -3,17 +3,13 @@ const retirement = `${env.API_URI}/retirement`
 
 
 export default {
-<<<<<<< HEAD
-    retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
-=======
     profile: (type: string, year: number) => `${retirement}/profile/${type}/${year}`,
     profileRetire: (retireId: string) => `${retirement}/profile/${retireId}`,
     getprofileRetire: (retireId: string) => `${retirement}/${retireId}`,
     createnote: () => `${retirement}/reason/`,
     reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
-    retirement:(type:string) => `${retirement}/${type}/2023`
+    retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
     
 
 
->>>>>>> develop
 };
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index f01362c32..c23197455 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -37,7 +37,7 @@
             :outlined="true"
             :hide-dropdown-icon="false"
             style="min-width: 150px"
-            @update:model-value="searchFilterTable"
+
           />
           <div>
             <q-btn

From c28de1d33ce55ba38bc6389c67b110f2d5feb92f Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 25 Jul 2023 10:54:15 +0700
Subject: [PATCH 5/5] no message

---
 src/modules/06_retirement/router.ts      |   2 +-
 src/modules/06_retirement/views/Main.vue | 106 +++++++++++------------
 2 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index cf1588bfd..05ac96be4 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -32,7 +32,7 @@ export default [
     },
   },
   {
-    path: "/retirement/list/:id",
+    path: "/retirement/list/:id/:year",
     name: "retirement/list/id",
     component: Listretirement,
     meta: {
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index c23197455..7f2d40388 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -13,8 +13,12 @@
         indicator-color="primary"
         align="left"
       >
-        <q-tab name="samun" label="ขรก.กทม.สามัญ" @click="getYear('officer')"/>
-        <q-tab name="employee" label="ลูกจ้างประจำ" @click="getYear('employee')"/>
+        <q-tab name="officer" label="ขรก.กทม.สามัญ" @click="type = 'officer'" />
+        <q-tab
+          name="employee"
+          label="ลูกจ้างประจำ"
+          @click="type = 'employee'"
+        />
       </q-tabs>
     </div>
     <q-separator />
@@ -37,7 +41,6 @@
             :outlined="true"
             :hide-dropdown-icon="false"
             style="min-width: 150px"
-
           />
           <div>
             <q-btn
@@ -175,7 +178,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, useAttrs ,reactive} from "vue";
+import { onMounted, ref, useAttrs, reactive,watch } from "vue";
 import type { QTableProps } from "quasar";
 import type {
   FormMainProbation,
@@ -185,12 +188,12 @@ import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import { useCounterMixin } from "@/stores/mixin"
-import type { resMain } from '@/modules/06_retirement/interface/response/Main'
+import { useCounterMixin } from "@/stores/mixin";
+import type { resMain } from "@/modules/06_retirement/interface/response/Main";
 const yearOptions = reactive<any[]>([]);
 
-const mixin = useCounterMixin()
-const { messageError ,date2Thai,showLoader,hideLoader} = mixin
+const mixin = useCounterMixin();
+const { messageError, date2Thai, showLoader, hideLoader } = mixin;
 const router = useRouter();
 const $q = useQuasar(); //ใช้ noti quasar
 const modal = ref<boolean>(false);
@@ -201,7 +204,7 @@ const pagination = ref({
   rowsPerPage: 10,
 });
 
-const type = ref<string>('employee')
+const type = ref<string>("officer");
 const visibleColumns = ref<string[]>(["no", "Date", "retireNumber"]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 
 // หัวตาราง
@@ -236,55 +239,42 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 
 // ข้อมูลตาราง (จำลอง)
-
-
+const currentYear = new Date().getFullYear();
 const rows = ref<resMain[]>([]);
-const tab = ref<any>("samun");
+const tab = ref<any>("officer");
 const visibleColumns2 = ref<string[]>(["no", "name", "retireNumber"]);
-const getYear = async(type:string) =>{
-  
-  await http
-  .get(config.API.yearOptions())
-  .then((res)=>{
-    yearOptions.length = 0;
-    const response = res.data.result;
-      yearOptions.push(...response);
-
-    console.log(yearOptions)
-    const maxNumber = yearOptions.reduce((max: any, e: any) => {
-        return e.id > max ? e.id : max;
-      }, "");
-      console.log(maxNumber)
-       get(type,maxNumber)
-  })
-}
-const get = async(type:string,year:number) =>{
+  const getYear = () => {
+  yearOptions.length = 0;
+  yearOptions.push(currentYear+543);
+  console.log(yearOptions);
+  get(type.value, currentYear);
+  fiscalyear.value = currentYear+543;
 
+};
+const get = async (type: string, year: number) => {
   await http
-  .get(config.API.retirement(type,year))
-  .then((res)=>{
-    rows.value =[]
-    let data = res.data.result
-     rows.value = data.map((items:resMain) =>({
-      id:items.id,
-      Date:date2Thai(items.createdAt),
-      year:items.year,
-      retireNumber:items.round,
-      total:items.total
-    }))
-    
-  }).catch((e) => {
-      messageError($q, e);
+    .get(config.API.retirement(type, year))
+    .then((res) => {
+      rows.value = [];
+      let data = res.data.result;
+      rows.value = data.map((items: resMain) => ({
+        id: items.id,
+        Date: date2Thai(items.createdAt),
+        year: items.year,
+        retireNumber: items.round,
+        total: items.total,
+      }));
+    })
+    .catch((e) => {
+
     })
     .finally(() => {
-      hideLoader()
+      hideLoader();
     });
-
-}
-onMounted(()=>{
-  // get
-  getYear()
-})
+};
+onMounted(() => {
+  getYear();
+});
 // หัวตาราง2
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -377,12 +367,13 @@ const clickAdd = () => {
 const clickClose = async () => {
   modal.value = false;
 };
-const fiscalyear = ref(["2566"]);
+const fiscalyear = ref<number>();
 const fiscalyearOP = ref<any>([
   { id: 1, name: "ทั้งหมด" },
   { id: 2, name: "2565" },
   { id: 3, name: "2565" },
 ]);
+
 // ค้นหาในตาราง
 const filterKeyword = ref<string>("");
 const filterRef = ref<any>(null);
@@ -405,9 +396,16 @@ const paginationLabel = (start: string, end: string, total: string) => {
   if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
-const nextPage = (val: any) => {
-  router.push(`/retirement/list/${val.no}`);
+const nextPage = () => {
+  router.push(`/retirement/list/${type.value}/${currentYear}`);
 };
+
+watch(type,()=>{
+  console.log(type.value)
+  get(type.value,currentYear)
+  console.log("🚀 ~ file: Main.vue:417 ~ watch ~ fiscalyear:",typeof fiscalyear.value)
+  
+})
 </script>
 
 <style lang="scss" scope>