diff --git a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue index 1f487a436..6e2e7739b 100644 --- a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue +++ b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue @@ -80,7 +80,6 @@ const visibleColumns = ref([ "name", "position", "positionType", - "positionLevel", "actFullName", ]); const visibleColumnsMember = ref([ @@ -103,15 +102,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "positionNo", - align: "left", - label: "เลขที่ตำแหน่ง", - sortable: true, - field: "positionNo", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "positionNo", + // align: "left", + // label: "เลขที่ตำแหน่ง", + // sortable: true, + // field: "positionNo", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, { name: "role", align: "left", @@ -124,7 +123,7 @@ const columns = ref([ { name: "name", align: "left", - label: "ชื่อ", + label: "ชื่อ-นามสกุล", sortable: true, field: "name", headerStyle: "font-size: 14px", @@ -147,26 +146,23 @@ const columns = ref([ field: "positionType", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.positionType ? row.positionType : ""} ${ + row.positionLevel ? "(" + row.positionLevel + ")" : "" + }`; + }, }, - { - name: "positionLevel", - align: "left", - label: "ระดับตำแหน่ง", - sortable: true, - field: "positionLevel", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "actFullName", - align: "left", - label: "รักษาการแทน", - sortable: true, - field: "actFullName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "actFullName", + // align: "left", + // label: "รักษาการแทน", + // sortable: true, + // field: "actFullName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); + const columnsMember = ref([ { name: "no", @@ -189,7 +185,7 @@ const columnsMember = ref([ { name: "name", align: "left", - label: "ชื่อ", + label: "ชื่อ-นามสกุล", sortable: true, field: "name", headerStyle: "font-size: 14px", @@ -205,15 +201,6 @@ const columnsMember = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevel", - align: "left", - label: "ระดับตำแหน่ง", - sortable: true, - field: "posLevel", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "posType", align: "left", @@ -222,6 +209,11 @@ const columnsMember = ref([ field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.posType ? row.posType : ""} ${ + row.posLevel ? "(" + row.posLevel + ")" : "" + }`; + }, }, { name: "actFullName", @@ -342,7 +334,15 @@ function onSubmit() { const body = { topic: topic.value, persons: rows.value.map( - ({ prefix, firstName, lastName, citizenId,actFullName,positionNo, ...newData }) => newData + ({ + prefix, + firstName, + lastName, + citizenId, + actFullName, + positionNo, + ...newData + }) => newData ), }; dialogConfirm($q, () => {