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([ "lastUpdatedAt", ]); -const columns = ref( - baseColumns.value.filter( +const columns = computed(() => { + 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( baseVisibleColumns.value.filter( (e: string) => e !== "lastUpdateFullName" && e !== "lastUpdatedAt" ) ); -const columnsHistory = ref(baseColumns.value); +const columnsHistory = computed(() => { + if (!checkType.value) { + if (baseColumns.value) { + return baseColumns.value.filter( + (column) => column.name !== "positionExecutive" + ); + } + } + return baseColumns.value; +}); const visibleColumnsHistory = ref(baseVisibleColumns.value); /** เปิด dialog ประวัติ*/