From d359c4cb6e4313d0f0b48230e8bcfe35d421b76c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 31 Mar 2025 12:22:21 +0700
Subject: [PATCH 1/3] =?UTF-8?q?fix=20bug=20=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5=E0=B8=94=E0=B8=B9=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B9=83?=
 =?UTF-8?q?=E0=B8=99=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/02_organization/components/TableMain.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 6a42dbafe..166f9348d 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -834,6 +834,7 @@ watch(
                   : ""
               }}
               <q-btn
+                v-if="props.row.positionIsSelected != 'ว่าง'"
                 size="12px"
                 dense
                 flat

From a8ae73e9402dc3da4d7058f7aed6feba8694532c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 31 Mar 2025 12:38:23 +0700
Subject: [PATCH 2/3] =?UTF-8?q?fix=20bug=20=E0=B8=AA=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=AD=E0=B8=B8=E0=B8=97?=
 =?UTF-8?q?=E0=B8=98=E0=B8=A3=E0=B8=93=E0=B9=8C=E0=B8=A3=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=97=E0=B8=B8=E0=B8=81=E0=B8=82=E0=B9=8C=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B5=20space=20=E0=B9=80=E0=B8=81=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/AddPersonal.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 4f24644ca..8a43a19d3 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -9,7 +9,7 @@ import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 const mainStore = useDisciplineMainStore();
 
-const modal = defineModel<boolean>('modal',{required:true})
+const modal = defineModel<boolean>("modal", { required: true });
 const total = ref<number>(0);
 const totalList = ref<number>(1);
 
@@ -97,7 +97,7 @@ const emit = defineEmits(["returnData"]);
 
 /** ปิด dialog */
 async function close() {
-  modal.value = false
+  modal.value = false;
   rows.value = [];
   employeeClass.value = "officer";
   search.value = "";
@@ -115,7 +115,7 @@ function savePost() {
 /** save data หลังจาก ยืนยัน */
 function saveData() {
   props.save(selected.value, employeeClass.value);
-  close()
+  close();
 }
 
 const searchRef = ref<any>(null);
@@ -154,9 +154,7 @@ async function getSearch() {
         prefix: e.prefix,
         firstName: e.firstName,
         lastName: e.lastName,
-        name: `${e.prefix ? e.prefix : ""}${e.firstName ? e.firstName : ""}  ${
-          e.lastName ? e.lastName : ""
-        }`,
+        name: e.name,
         posNo: e.posNo ?? "-",
         position: e.position ?? "-",
         positionLevel: e.positionLevelName ?? "-",

From 5ea175d6754e4a4ada217ef5c2f0a6f7835d1b12 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 31 Mar 2025 12:47:14 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/04_salaryLists/TableTypePending.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index 8af27fda9..f95ef55cb 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -146,7 +146,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posSalary",
     align: "center",
-    label: "ประวัติตำแหน่ง/เงินเดือน",
+    label: "ประวัติเงินเดือน/ค่าจ้าง",
     sortable: false,
     field: "posSalary",
     headerStyle: "font-size: 14px",