diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue index 017c504e7..7842de7e9 100644 --- a/src/modules/02_organization/components/DialogHistoryPos.vue +++ b/src/modules/02_organization/components/DialogHistoryPos.vue @@ -102,7 +102,7 @@ const baseColumns = ref([ { name: "position", align: "left", - label: "ตำแแหน่ง", + label: "ตำแหน่งในสายงาน", sortable: true, field: "position", headerStyle: "font-size: 14px", @@ -119,11 +119,11 @@ const baseColumns = ref([ format(val, row) { let name = ""; if (row.posType && row.position) { - name = `${row.posType} (${row.position})`; + name = `${row.posType} (${row.posLevel})`; } else if (row.posType) { name = `${row.posType}`; - } else if (row.position) { - name = `(${row.position})`; + } else if (row.posLevel) { + name = `(${row.posLevel})`; } else name = "-"; return name; }, @@ -213,9 +213,9 @@ function formatHistoryOwnerData(data: HistoryPos[]) { return data.map((item) => ({ ...item, fullname: - item.prefix && item.firstName && item.lastName - ? `${item.prefix} ${item.firstName} ${item.lastName}`.trim() - : "-", + item.firstName + ? `${item.prefix}${item.firstName} ${item.lastName}`.trim() + : "ว่าง", })); }