diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue index 6f8bc3084..bcdbb6924 100644 --- a/src/modules/04_registryNew/components/TableView.vue +++ b/src/modules/04_registryNew/components/TableView.vue @@ -75,7 +75,7 @@ const columns = ref([ { name: "posPath", align: "left", - label: "สายงาน", + label: "ประเภทตำแหน่ง", sortable: true, field: "posType", headerStyle: "font-size: 14px", @@ -91,6 +91,11 @@ const columns = ref([ field: "posLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return row.posTypeShortName + ? row.posTypeShortName +" "+ row.posLevel + : row.posLevel; + }, sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, @@ -284,7 +289,16 @@ watch( @@ -398,7 +412,11 @@ watch( {{ - props.row.posLevel ? props.row.posLevel : "-" + props.row.posLevel + ? props.row.posTypeShortName + ? `${props.row.posTypeShortName} ${props.row.posLevel}` + : props.row.posLevel + : "-" }}