From 9f9c1d61871c797b47c00a6f27daaa4db1224447 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 20 Feb 2026 12:10:30 +0700 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20column=20command=20=E0=B8=9C?= =?UTF-8?q?=E0=B8=B9=E0=B9=89=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= =?UTF-8?q?,=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=AA=E0=B8=AD=E0=B8=9A?= =?UTF-8?q?=E0=B8=9C=E0=B9=88=E0=B8=B2=E0=B8=99=20owner=20=E0=B9=80?= =?UTF-8?q?=E0=B8=AB=E0=B9=87=E0=B8=99=E0=B9=80=E0=B8=AB=E0=B8=A1=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=99=20=E0=B8=AA=E0=B8=81=E0=B8=88.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_placement/components/PersonalList/Table.vue | 4 +++- src/modules/18_command/components/Step/2_ListPersons.vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 9a4e8836b..22a211ade 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -862,7 +862,9 @@ async function getWorkFlow() { const data = await res.data.result; DataStore.isOfficer = data.isOfficer; DataStore.isStaff = data.isStaff; - roleAdmin.value = data.isOfficer; + roleAdmin.value = + data.isOfficer || + (checkPermission(route)?.attrOwnership == "OWNER" ? true : false); if (roleAdmin.value === false) { displayAdd.value = false; // visibleColumns.value = [ diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue index a5a9881c4..b5a2b4d13 100644 --- a/src/modules/18_command/components/Step/2_ListPersons.vue +++ b/src/modules/18_command/components/Step/2_ListPersons.vue @@ -149,7 +149,7 @@ const columns = computed(() => { props.commandCode === "C-PM-03" || props.commandCode === "C-PM-04" ) { - return baseColumns.value; + return baseColumns.value?.filter((e) => e.name !== "posNo"); } else if (props.commandCode == "C-PM-40") { return baseColumns.value?.filter( (e) => e.name !== "position" && e.name !== "positionType" From 7c7e27011919a3594426428143352caa55d16274 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 20 Feb 2026 17:21:29 +0700 Subject: [PATCH 2/3] fix bug list person placement --- .../components/PersonalList/Table.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 22a211ade..e3e8060b7 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -249,7 +249,7 @@ const columnsBase = ref([ ]); const columns = computed(() => - roleAdmin.value + roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER" ? columnsBase.value : columnsBase.value?.filter( (col) => @@ -406,7 +406,8 @@ async function getTable() { rowsAll.value.push(rowData); }); - const rowData = await (roleAdmin.value + const rowData = await (roleAdmin.value || + checkPermission(route)?.attrOwnership == "OWNER" ? rowsAll.value : rowsAll.value.filter((x: any) => x.isDraft === true)); @@ -553,7 +554,10 @@ function getClass(val: boolean) { * @param draft status */ function selectData(pid: string, draft: string) { - if (roleAdmin.value && draft === "ส่งตัวแล้ว") { + if ( + (roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER") && + draft === "ส่งตัวแล้ว" + ) { personalId.value = pid; modal.value = true; editRow.value = false; @@ -863,9 +867,11 @@ async function getWorkFlow() { DataStore.isOfficer = data.isOfficer; DataStore.isStaff = data.isStaff; roleAdmin.value = - data.isOfficer || - (checkPermission(route)?.attrOwnership == "OWNER" ? true : false); - if (roleAdmin.value === false) { + data.isOfficer || checkPermission(route)?.attrOwnership == "OWNER"; + if ( + roleAdmin.value === false && + checkPermission(route)?.attrOwnership !== "OWNER" + ) { displayAdd.value = false; // visibleColumns.value = [ // "position", From 98a29d184fa477e545bb09b15b524e987e36a20c Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 24 Feb 2026 09:34:49 +0700 Subject: [PATCH 3/3] fix(salary): checkPermission PARENT --- src/modules/13_salary/views/04_salaryLists.vue | 9 +++++++-- src/modules/13_salary/views/05_salaryListsEmployee.vue | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue index 74f569ff7..6e9a4c4fc 100644 --- a/src/modules/13_salary/views/04_salaryLists.vue +++ b/src/modules/13_salary/views/04_salaryLists.vue @@ -570,8 +570,12 @@ onMounted(async () => { @update:model-value="onChangeSnap" :disable="!isDisable" /> + {