diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue index da359de36..8aed8cfec 100644 --- a/src/modules/04_registryPerson/views/edit/components/Table.vue +++ b/src/modules/04_registryPerson/views/edit/components/Table.vue @@ -82,15 +82,13 @@ const baseColumns = ref([ field: "posNumCodeSit", headerStyle: "font-size: 14px", style: "font-size: 14px", - }, - { - name: "posNumCodeSitAbb", - align: "left", - label: "ตัวย่อหน่วยงานที่ออกคำสั่ง", - sortable: false, - field: "posNumCodeSitAbb", - headerStyle: "font-size: 14px", - style: "font-size: 14px", + format(val, row) { + return row.posNumCodeSitAbb && row.posNumCodeSit + ? `${row.posNumCodeSit} (${row.posNumCodeSitAbb})` + : row.posNumCodeSit + ? row.posNumCodeSit + : "-"; + }, }, { name: "posNo", @@ -250,7 +248,6 @@ const visibleColumns = ref([ "no", "commandDateAffect", "posNumCodeSit", - "posNumCodeSitAbb", "posNo", "positionName", "positionType",