hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m17s
Details

Browse source 
* develop:
  fix bug list person placement
This commit is contained in:
Warunee Tamkoo 2026-02-20 17:21:41 +07:00
commit b268772e5d
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -249,7 +249,7 @@ const columnsBase = ref<QTableProps["columns"]>([
]); ]);
const columns = computed(() => const columns = computed(() =>
roleAdmin.value roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER"
? columnsBase.value ? columnsBase.value
: columnsBase.value?.filter( : columnsBase.value?.filter(
(col) => (col) =>
@ -406,7 +406,8 @@ async function getTable() {
rowsAll.value.push(rowData); rowsAll.value.push(rowData);
}); });
const rowData = await (roleAdmin.value const rowData = await (roleAdmin.value ||
checkPermission(route)?.attrOwnership == "OWNER"
? rowsAll.value ? rowsAll.value
: rowsAll.value.filter((x: any) => x.isDraft === true)); : rowsAll.value.filter((x: any) => x.isDraft === true));
@ -553,7 +554,10 @@ function getClass(val: boolean) {
* @param draft status * @param draft status
*/ */
function selectData(pid: string, draft: string) { function selectData(pid: string, draft: string) {
if (roleAdmin.value && draft === "ส่งตัวแล้ว") { if (
(roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER") &&
draft === "ส่งตัวแล้ว"
) {
personalId.value = pid; personalId.value = pid;
modal.value = true; modal.value = true;
editRow.value = false; editRow.value = false;
@ -863,9 +867,11 @@ async function getWorkFlow() {
DataStore.isOfficer = data.isOfficer; DataStore.isOfficer = data.isOfficer;
DataStore.isStaff = data.isStaff; DataStore.isStaff = data.isStaff;
roleAdmin.value = roleAdmin.value =
data.isOfficer || data.isOfficer || checkPermission(route)?.attrOwnership == "OWNER";
(checkPermission(route)?.attrOwnership == "OWNER" ? true : false); if (
if (roleAdmin.value === false) { roleAdmin.value === false &&
checkPermission(route)?.attrOwnership !== "OWNER"
) {
displayAdd.value = false; displayAdd.value = false;
// visibleColumns.value = [ // visibleColumns.value = [
// "position", // "position",