From a503664b7b1027e2434a4b9cc85bc5a9881f0b48 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 8 Oct 2024 10:45:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=AB=E0=B8=A1=E0=B8=94=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=20""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/MainProbation.vue    | 16 +++++--------
 .../05_placement/interface/request/Main.ts    |  5 ++++
 src/modules/05_placement/store.ts             | 24 +++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 821249680..3c4683507 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -13,7 +13,7 @@ import type { QTableProps } from "quasar";
 import type {
   FormMainProbation,
   FormMainProbation2,
-  OpfillterType,
+  OpfillterTypeSt,
 } from "@/modules/05_placement/interface/request/Main";
 
 import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
@@ -33,19 +33,14 @@ const filterRef2 = ref<any>(null);
 const attrs = ref<any>(useAttrs());
 const paging2 = ref<boolean>(true);
 const fillterStatus = ref<any>([]);
-const fillter = ref<number | null>(0);
+const fillter = ref<any>('');
 const filterKeyword = ref<string>("");
 const filterKeyword2 = ref<string>("");
 const rows = ref<FormMainProbation[]>([]);
 const rows2 = ref<FormMainProbation2[]>([]);
 const dataUpdate = ref<FormMainProbation[]>([]);
-const Opfillter = ref<OpfillterType[]>([]);
-const Opfillter2 = ref<OpfillterType[]>([
-  {
-    id: 0,
-    value: "ทั้งหมด",
-  },
-]);
+const Opfillter = ref<OpfillterTypeSt[]>([]);
+const Opfillter2 = ref<OpfillterTypeSt[]>([]);
 const formProbation = reactive({ keyword: "", pageSize: 10, page: 1 });
 const maxPage = ref<number>(1);
 
@@ -240,6 +235,7 @@ async function getpersonalList() {
       fillterStatus.value = data;
       dataUpdate.value = rows.value;
       Opfillter.value = storeFn.optionStatusProbation;
+      Opfillter2.value = storeFn.optionStatusProbation;
       totalList.value = Math.ceil(resTotal / pagination.value.rowsPerPage);
       total.value = resTotal;
       hideLoader();
@@ -352,7 +348,7 @@ function filterFn(val: string, update: any) {
   if (val == "") {
     update(() => {
       Opfillter2.value = Opfillter.value;
-      fillter.value = null;
+      fillter.value = undefined;
     });
   } else {
     update(() => {
diff --git a/src/modules/05_placement/interface/request/Main.ts b/src/modules/05_placement/interface/request/Main.ts
index cc7c87b77..40bbc1b88 100644
--- a/src/modules/05_placement/interface/request/Main.ts
+++ b/src/modules/05_placement/interface/request/Main.ts
@@ -77,6 +77,10 @@ interface OpfillterType {
   id: number;
   value: string;
 }
+interface OpfillterTypeSt {
+  id: string;
+  value: string;
+}
 interface CriteriaType {
   criteriaType: string;
   criteriaValue: string;
@@ -91,4 +95,5 @@ export type {
   mapData,
   OpfillterType,
   CriteriaType,
+  OpfillterTypeSt
 };
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 9efc1e26e..b4b7cc84c 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -5,7 +5,7 @@ import { useCounterMixin } from "@/stores/mixin";
 
 import type {
   FormPlacementMainData,
-  OpfillterType,
+  OpfillterTypeSt,
 } from "@/modules/05_placement/interface/request/Main";
 import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
 
@@ -308,45 +308,45 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
 });
 
 export const useTransferDataStore = defineStore("transferDataStore", () => {
-  const optionStatusProbation = ref<OpfillterType[]>([
+  const optionStatusProbation = ref<OpfillterTypeSt[]>([
     {
-      id: 0,
+      id: '',
       value: "ทั้งหมด",
     },
     {
-      id: 1,
+      id: '1',
       value: "อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ",
     },
     {
-      id: 2,
+      id: '2',
       value: "พ้นการทดลองปฏิบัติหน้าที่ราชการ",
     },
     {
-      id: 3,
+      id: '3',
       value: "ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ",
     },
     {
-      id: 4,
+      id: '4',
       value: "ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากเปลี่ยนตำแหน่ง",
     },
     {
-      id: 5,
+      id: '5',
       value: "ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากลาออก",
     },
     {
-      id: 6,
+      id: '6',
       value: "ยุติการทดลองปฏิบัติหน้าที่ราชการเนื่องจากถึงแก่กรรม",
     },
     {
-      id: 7,
+      id: '7',
       value: "ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ",
     },
     {
-      id: 8,
+      id: '8',
       value: "ส่งรายชื่อไปออกคำสั่ง",
     },
     {
-      id: 9,
+      id: '9',
       value: "ออกคำสั่งเสร็จแล้ว",
     },
   ]);