From 603ba96ff1e4385febffbd1ed021cf7852fc0881 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 19 Mar 2025 15:21:31 +0700
Subject: [PATCH] fix position

---
 .../GovernmentInformation/07_Position.vue     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index d6befdc8e..5c29f55ca 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -298,12 +298,23 @@ const modalCommand = ref<boolean>(false);
 const command = ref<string>("");
 const commandId = ref<string>("");
 
-const columns = ref<QTableColumn[]>(
-  baseColumns.value.filter(
+const columns = computed<QTableColumn[]>(() => {
+  if (empType.value === "-employee") {
+    if (baseColumns.value) {
+      return baseColumns.value.filter(
+        (column) =>
+          column.name !== "positionExecutive" &&
+          column.name !== "lastUpdateFullName" &&
+          column.name !== "lastUpdatedAt"
+      );
+    }
+  }
+  return baseColumns.value.filter(
     (e: QTableColumn) =>
       e.name !== "lastUpdateFullName" && e.name !== "lastUpdatedAt"
-  )
-);
+  );
+});
+
 const visibleColumns = ref<String[]>(
   baseVisibleColumns.value.filter(
     (e: string) => e !== "lastUpdateFullName" && e !== "lastUpdatedAt"
@@ -339,7 +350,16 @@ const formData = reactive<FormPostition>({
   remark: "", //หมายเหตุ
 });
 
-const columnsHistory = ref<QTableColumn[]>(baseColumns.value);
+const columnsHistory = computed<QTableColumn[]>(() => {
+  if (empType.value === "-employee") {
+    if (baseColumns.value) {
+      return baseColumns.value.filter(
+        (column) => column.name !== "positionExecutive"
+      );
+    }
+  }
+  return baseColumns.value;
+});
 const visibleColumnsHistory = ref<string[]>(baseVisibleColumns.value);
 
 const modalDialogSalary = ref<boolean>(false); //แสดง popup ตำแหน่งเงินเดือน