From 84a724f6eec6d1b190d81c7d517c375a86d79990 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 12 Nov 2025 16:12:47 +0700 Subject: [PATCH] fix:filter posMasterNo --- .../components/PersonalList/Table.vue | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 39d9e2eb6..0a62061c8 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -141,7 +141,7 @@ const visibleColumnslist = ref([ ]); /**หัวตาราง */ -const columns = ref([ +const columnsBase = ref([ { name: "no", align: "center", @@ -178,7 +178,7 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo}) `; + return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName} ${row.posMasterNo}) `; }, sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), @@ -247,6 +247,17 @@ const columns = ref([ }, ]); +const columns = computed(() => + roleAdmin.value + ? columnsBase.value + : columnsBase.value?.filter( + (col) => + col.name !== "no" && + col.name !== "draft" && + col.name !== "refCommandNo" + ) +); + /** * แปลงสถานะพนักงาน * @param val type @@ -819,18 +830,18 @@ async function getWorkFlow() { roleAdmin.value = data.isOfficer; if (roleAdmin.value === false) { displayAdd.value = false; - visibleColumns.value = [ - "position", - "fullName", - "examNumber", - "idCard", - "positionNumber", - "organizationName", - "reportingDate", - "bmaOfficer", - "statusName", - "positionCandidate", - ]; + // visibleColumns.value = [ + // "position", + // "fullName", + // "examNumber", + // "idCard", + // "positionNumber", + // "organizationName", + // "reportingDate", + // "bmaOfficer", + // "statusName", + // "positionCandidate", + // ]; } }) .catch((e) => {