diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue index 0f9c090ed..263863f49 100644 --- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue +++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue @@ -115,6 +115,18 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "positionIsSelected", + align: "left", + label: "คนครอง", + sortable: true, + field: "positionIsSelected", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return val ? row.fullNameCurrentHolder : "-"; + }, + }, ]); const columnsPostition = ref([ { @@ -197,6 +209,7 @@ const visibleColumns = ref([ "positionName", "posTypeName", "posLevelName", + "positionIsSelected", ]); /** Position*/ @@ -241,6 +254,7 @@ function updateSelected(data: TreeMain) { nodeId.value = data.orgTreeId ? data.orgTreeId : ""; nodeLevel.value = data.orgLevel; + fetchDataTable(data.orgTreeId, data.orgLevel); } @@ -283,6 +297,7 @@ async function fetchDataTable(id: string, level: number = 0) { dataMain.push(data); } }); + positionNo.value = dataMain; positionNoMain.value = dataMain; }) @@ -440,6 +455,8 @@ watch( await clearData(); if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) { await fetchPosFind(props?.dataRow?.node, props?.dataRow?.nodeId); + nodeLevel.value = props?.dataRow?.node; + nodeId.value = props.dataRow?.nodeId; } else { expanded.value = []; }