From 818f9d77238e44b03127ecc418b795cc004f918c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Apr 2025 17:36:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20empType=20=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Salary/01_PositionSalary.vue        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index 5cce9711f..115915860 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -110,7 +110,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "posNo",
     align: "left",
-    label: empType.value === "-employee" ? "ตำแหน่งเลขที่" : "เลขที่ตำแหน่ง",
+    label: empType.value === "" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่",
     sortable: true,
     field: "posNo",
     headerStyle: "font-size: 14px",
@@ -130,7 +130,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "positionName",
     align: "left",
-    label: empType.value === "-employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน",
+    label: empType.value === "" ? "ตำแหน่งในสายงาน" : "ตำแหน่ง",
     sortable: true,
     field: "positionName",
     headerStyle: "font-size: 14px",
@@ -143,7 +143,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "positionType",
     align: "left",
-    label: empType.value === "-employee" ? "กลุ่มงาน" : "ตำแหน่งประเภท",
+    label: empType.value === "" ? "ตำแหน่งประเภท" : "กลุ่มงาน",
     sortable: true,
     field: "positionType",
     headerStyle: "font-size: 14px",
@@ -156,7 +156,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "positionLevel",
     align: "left",
-    label: empType.value === "-employee" ? "ระดับชั้นงาน" : "ระดับ",
+    label: empType.value === "" ? "ระดับ" : "ระดับชั้นงาน",
     sortable: true,
     field: "positionLevel",
     format(val, row) {
@@ -237,7 +237,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "amount",
     align: "left",
-    label: empType.value === "-employee" ? "ค่าจ้าง" : "เงินเดือน",
+    label: empType.value === "" ? "เงินเดือน" : "ค่าจ้าง",
     sortable: true,
     field: "amount",
     headerStyle: "font-size: 14px",
@@ -347,7 +347,7 @@ const baseVisibleColumns = ref<string[]>([
 ]);
 
 const columns = computed<QTableColumn[]>(() => {
-  if (empType.value === "-employee") {
+  if (empType.value !== "") {
     if (baseColumns.value) {
       return baseColumns.value.filter(
         (column) =>
@@ -371,7 +371,7 @@ const pagination = ref({
 });
 
 const columnsHistory = computed<QTableColumn[]>(() => {
-  if (empType.value === "-employee") {
+  if (empType.value !== "") {
     if (baseColumns.value) {
       return baseColumns.value.filter(
         (column) =>
@@ -961,8 +961,8 @@ onMounted(async () => {
         <DialogHeader
           :tittle="
             isStatusEdit
-              ? `แก้ไข${empType === '-employee' ? 'ค่าจ้าง' : 'เงินเดือน'}`
-              : `เพิ่ม${empType === '-employee' ? 'ค่าจ้าง' : 'เงินเดือน'}`
+              ? `แก้ไข${empType === '' ? 'เงินเดือน' : 'ค่าจ้าง'}`
+              : `เพิ่ม${empType === '' ? 'เงินเดือน' : 'ค่าจ้าง'}`
           "
           :close="onClickCloseDialog"
         />