From 0ff6ad85f05338e23dfe694d6070e8cdc3c0acda Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 6 May 2025 16:33:45 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C=E0=B8=84=E0=B9=88=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Salary/01_PositionSalary.vue       | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 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 115915860..81b5de3fa 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -349,11 +349,26 @@ const baseVisibleColumns = ref<string[]>([
 const columns = computed<QTableColumn[]>(() => {
   if (empType.value !== "") {
     if (baseColumns.value) {
-      return baseColumns.value.filter(
-        (column) =>
-          column.name !== "positionSalaryAmount" &&
-          column.name !== "mouthSalaryAmount"
+      const filterBaseColumn =
+        empType.value != "-temp"
+          ? baseColumns.value.filter(
+              (column) =>
+                column.name !== "positionSalaryAmount" &&
+                column.name !== "positionExecutive" && // ลูกจ้างไม่มีตำแหน่งทางการบริหาร
+                column.name !== "mouthSalaryAmount"
+            )
+          : baseColumns.value.filter(
+              (column) =>
+                column.name !== "positionSalaryAmount" &&
+                column.name !== "mouthSalaryAmount" &&
+                column.name !== "positionExecutive" && // ลูกจ้างชั่วคราวไม่มีตำแหน่งทางการบริหาร
+                column.name !== "positionLevel" && // ลูกจ้างชั่วคราวไม่มีระดับชั้นงาน
+                column.name !== "posNo" // ลูกจ้างชั่วคราวไม่มีตำแหน่งเลขที่
+            );
+      visibleColumnsHistory.value = filterBaseColumn.map(
+        (e: QTableColumn) => e.name
       );
+      return filterBaseColumn;
     }
   }
   return baseColumns.value.filter(