From 841b023827de831c50b14ec212612b38e25f9a4a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 24 Feb 2025 17:37:02 +0700
Subject: [PATCH 1/4] =?UTF-8?q?fix=20bug=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_placement/store.ts                      | 2 +-
 src/modules/06_retirement/views/06_dismissOrder.vue    | 9 ++++-----
 src/modules/06_retirement/views/08_dismissOrderEmp.vue | 9 ++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index bffcf9730..aa0293fd5 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -358,7 +358,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
       value: "ออกคำสั่งเสร็จแล้ว",
     },
   ]);
-  const statusOp = ref<DataOptions[]>([]);
   const statusMainOp = ref<DataOptions[]>([
     { id: "WAITTING", name: "รอดำเนินการ" },
     { id: "PENDING", name: "เลือกตำแหน่งแล้ว" },
@@ -367,6 +366,7 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
     { id: "REPORT", name: "ส่งรายชื่อไปออกคำสั่ง" },
     { id: "DONE", name: "ออกคำสั่งเสร็จแล้ว" },
   ]);
+  const statusOp = ref<DataOptions[]>(statusMainOp.value);
 
   const statusText = (val: string) => {
     switch (val) {
diff --git a/src/modules/06_retirement/views/06_dismissOrder.vue b/src/modules/06_retirement/views/06_dismissOrder.vue
index e5aa071f8..4637e467b 100644
--- a/src/modules/06_retirement/views/06_dismissOrder.vue
+++ b/src/modules/06_retirement/views/06_dismissOrder.vue
@@ -10,6 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { useTransferDataStore } from "@/modules/05_placement/store";
 
+import type { DataOption } from "@/modules/06_retirement/interface/index/Main";
 import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
 
 import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue";
@@ -46,7 +47,6 @@ const visibleColumns = ref<string[]>([
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
 const filterKeyword2 = ref<string>("");
-const filterRef = ref<any>(null);
 
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const rows = ref<ResponseData[]>([]);
@@ -157,7 +157,7 @@ async function getData() {
   showLoader();
   await http
     .get(config.API.retirementOut + `/officer?status=${status.value}`)
-    .then((res: any) => {
+    .then((res) => {
       const data = res.data.result;
       rows.value = data;
       rowsData.value = data;
@@ -223,7 +223,7 @@ onMounted(async () => {
               outlined
               dense
               label="สถานะ"
-              :options="store.statusOp.filter((item:any)=> item.id !== 'PENDING')"
+              :options="store.statusOp.filter((item:DataOption)=> item.id !== 'PENDING')"
               emit-value
               map-options
               option-label="name"
@@ -232,7 +232,7 @@ onMounted(async () => {
               use-input
               hide-selected
               bg-color="white"
-              @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
+              @filter="(inputValue:string,doneFn:Function) => filterOption(inputValue, doneFn) "
               @update:model-value="(value:string)=>{(status = value),getData()}"
             >
               <template v-slot:no-option>
@@ -270,7 +270,6 @@ onMounted(async () => {
               standout
               dense
               v-model="filterKeyword"
-              ref="filterRef"
               outlined
               placeholder="ค้นหา"
               @keydown.enter="onSearch"
diff --git a/src/modules/06_retirement/views/08_dismissOrderEmp.vue b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
index 11f1c7e42..eb48ebf3d 100644
--- a/src/modules/06_retirement/views/08_dismissOrderEmp.vue
+++ b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
@@ -10,6 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { useTransferDataStore } from "@/modules/05_placement/store";
 
+import type { DataOption } from "@/modules/06_retirement/interface/index/Main";
 import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
 
 import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue";
@@ -46,7 +47,6 @@ const visibleColumns = ref<string[]>([
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
 const filterKeyword2 = ref<string>("");
-const filterRef = ref<any>(null);
 
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const rows = ref<ResponseData[]>([]);
@@ -157,7 +157,7 @@ async function getData() {
   showLoader();
   await http
     .get(config.API.retirementOut + `/employee?status=${status.value}`)
-    .then((res: any) => {
+    .then((res) => {
       const data = res.data.result;
       rows.value = data;
       rowsData.value = data;
@@ -225,7 +225,7 @@ onMounted(async () => {
               outlined
               dense
               label="สถานะ"
-              :options="store.statusOp.filter((item:any)=> item.id !== 'PENDING')"
+              :options="store.statusOp.filter((item:DataOption)=> item.id !== 'PENDING')"
               emit-value
               map-options
               option-label="name"
@@ -234,7 +234,7 @@ onMounted(async () => {
               use-input
               hide-selected
               bg-color="white"
-              @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
+              @filter="(inputValue:string,doneFn:Function) => filterOption(inputValue, doneFn) "
               @update:model-value="(value:string)=>{(status = value),getData()}"
             >
               <template v-slot:no-option>
@@ -272,7 +272,6 @@ onMounted(async () => {
               standout
               dense
               v-model="filterKeyword"
-              ref="filterRef"
               outlined
               placeholder="ค้นหา"
               @keydown.enter="onSearch"

From b32a96cfda7b0e53622048056ecb729e3710ec3c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 24 Feb 2025 17:39:26 +0700
Subject: [PATCH 2/4] fix

---
 src/modules/06_retirement/views/06_dismissOrder.vue    | 1 +
 src/modules/06_retirement/views/08_dismissOrderEmp.vue | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/06_retirement/views/06_dismissOrder.vue b/src/modules/06_retirement/views/06_dismissOrder.vue
index 4637e467b..1bc2a4295 100644
--- a/src/modules/06_retirement/views/06_dismissOrder.vue
+++ b/src/modules/06_retirement/views/06_dismissOrder.vue
@@ -162,6 +162,7 @@ async function getData() {
       rows.value = data;
       rowsData.value = data;
       filters.value = data;
+      onSearch();
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/06_retirement/views/08_dismissOrderEmp.vue b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
index eb48ebf3d..93f47b5ae 100644
--- a/src/modules/06_retirement/views/08_dismissOrderEmp.vue
+++ b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
@@ -162,13 +162,14 @@ async function getData() {
       rows.value = data;
       rowsData.value = data;
       filters.value = data;
-      hideLoader();
+      onSearch();
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 async function clickDelete(id: string) {

From e47184c4d4509be328641a75eb48242721c9e3fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 24 Feb 2025 17:44:10 +0700
Subject: [PATCH 3/4] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=3D=3D>=20API=20Position=20Histor?=
 =?UTF-8?q?y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/GovernmentInformation/07_PositionHistory.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
index a8311ede0..13fe3671b 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
@@ -274,7 +274,7 @@ function fetchListHistory() {
   showLoader();
   http
     .get(
-      config.API.profileListSalaryPositionHistoryNew(
+      config.API.profileListSalaryHistoryNew(
         salaryId.value,
         empType.value
       )

From b25bd1d1f00e061760736adf422b462469d410e4 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 25 Feb 2025 11:37:37 +0700
Subject: [PATCH 4/4] fixing employee label

---
 src/components/CardProfile.vue                            | 6 +++++-
 .../06_retirement/components/03_resignEmp/ResignByid.vue  | 4 ++--
 .../components/06_dismissOrder/DetailEMP.vue              | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index 7aa17c5ae..57f7029a2 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -151,7 +151,11 @@ watch(
         <div class="col-xs-6 col-sm-3 row">
           <div class="col-12">
             <div class="col-12 text-top">
-              {{ props.type == "employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง" }}
+              {{
+                props.type.toLowerCase() == "employee"
+                  ? "กลุ่มงาน"
+                  : "ประเภทตำแหน่ง"
+              }}
             </div>
             <div class="col-12 text-detail">
               {{ profile.positionLevel }}
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index 2af2f43b3..95ca702ef 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -1279,9 +1279,9 @@ onMounted(async () => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionLevelOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกระดับชั้นงาน'}`]"
                   hide-bottom-space
-                  :label="`${'ระดับตำแหน่ง'}`"
+                  :label="`${'ระดับชั้นงาน'}`"
                 />
               </div>
             </div>
diff --git a/src/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue b/src/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue
index 79942f876..0add29545 100644
--- a/src/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue
+++ b/src/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue
@@ -274,9 +274,9 @@ onMounted(async () => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionTypeOld"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
                 hide-bottom-space
-                :label="`${'ประเภทตำแหน่ง'}`"
+                :label="`${'กลุ่มงาน'}`"
               />
             </div>
           </div>
@@ -290,9 +290,9 @@ onMounted(async () => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionLevelOld"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกระดับ'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกระดับชั้นงาน'}`]"
                 hide-bottom-space
-                :label="`${'ระดับ'}`"
+                :label="`${'ระดับชั้นงาน'}`"
               />
             </div>
           </div>