diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 1ca25f062..959ec554e 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -93,21 +93,21 @@ const columns = ref([ { name: "draftOrganizationOrganization", align: "left", - label: "หน่วยงานที่รับการบรรจุ", + label: "ตำแหน่ง/หน่วยงานที่รับการบรรจุ", sortable: false, field: "draftOrganizationOrganization", headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "draftPositionEmployee", - align: "left", - label: "หน่วยงานที่บรรจุ", - sortable: false, - field: "draftPositionEmployee", - headerStyle: "font-size: 14px; min-width: 200px", - style: "font-size: 14px; ", - }, + // { + // name: "draftPositionEmployee", + // align: "left", + // label: "ตำแหน่งที่บรรจุ", + // sortable: false, + // field: "draftPositionEmployee", + // headerStyle: "font-size: 14px; min-width: 200px", + // style: "font-size: 14px; ", + // }, { name: "govAge", @@ -193,7 +193,7 @@ const visibleColumns = ref([ "citizenId", "fullname", "draftOrganizationOrganization", - "draftPositionEmployee", + // "draftPositionEmployee", "govAge", "dateEmployment", "age", @@ -465,8 +465,23 @@ onMounted(async () => { " >
+
+ {{ + props.row.position !== null ? props.row.position : "-" + }} + {{ + props.row.posTypeShortName !== null + ? `(${props.row.posTypeShortName}` + : "" + }} + {{ + props.row.posLevel !== null + ? `${props.row.posLevel})` + : "" + }} +
- {{ props.row.root !== null ? props.row.root : "-" }} + {{ props.row.root !== null ? props.row.root : "" }} {{ props.row.rootShortName !== null ? `(${props.row.rootShortName})`