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

---
 .../10_registry/02_Government/07_Position.vue | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue
index 258c7d4..539b95a 100644
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@@ -292,18 +292,37 @@ const baseVisibleColumns = ref<string[]>([
   "lastUpdatedAt",
 ]);
 
-const columns = ref<QTableColumn[]>(
-  baseColumns.value.filter(
+const columns = computed<QTableColumn[]>(() => {
+  if (!checkType.value) {
+    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"
   )
 );
-const columnsHistory = ref<QTableColumn[]>(baseColumns.value);
+const columnsHistory = computed<QTableColumn[]>(() => {
+  if (!checkType.value) {
+    if (baseColumns.value) {
+      return baseColumns.value.filter(
+        (column) => column.name !== "positionExecutive"
+      );
+    }
+  }
+  return baseColumns.value;
+});
 const visibleColumnsHistory = ref<string[]>(baseVisibleColumns.value);
 
 /** เปิด dialog ประวัติ*/