diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue index 0e068787a..b06649823 100644 --- a/src/modules/05_placement/components/Other/DialogOrders.vue +++ b/src/modules/05_placement/components/Other/DialogOrders.vue @@ -53,16 +53,18 @@ const dataMapToSend = computed(() => { lastName: i.lastName, citizenId: i.citizenId, remarkVertical: i.reason, - position: i.positionOld, - posType: i.positionTypeOld, - posLevel: i.positionLevelOld, + position: i.position, + posType: i.posTypeName, + posLevel: i.posLevelName, })); }); const visibleColumns2 = ref([ "no", "fullname", + "positionNumberOld", "positionLevel", "organizationPositionOld", + "organizationPositionReturn", "createdAt", "status", ]); @@ -85,13 +87,29 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return `${row.prefix}${row.firstName} ${row.lastName}`; + return `${row.prefix === null ? "" : row.prefix}${row.firstName} ${ + row.lastName + }`; }, }, + + { + name: "positionNumberOld", + align: "left", + label: "ตำแหน่งเลขที่เดิม", + sortable: true, + field: "positionNumberOld", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.positionNumberOld; + }, + }, + { name: "positionLevel", align: "left", - label: "ประเภทตำแหน่ง", + label: "ตำแหน่งประเภทเดิม", sortable: true, field: "positionLevel", headerStyle: "font-size: 14px", @@ -120,6 +138,19 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + + { + name: "organizationPositionReturn", + align: "left", + label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ", + sortable: true, + field: "organizationPositionReturn", + format(val, row) { + return row.organizationPositionOld.replace(/\n/g, " "); + }, + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "createdAt", align: "left", @@ -315,7 +346,51 @@ watch( v-else-if="col.name === 'organizationPositionOld'" class="text-html" > - {{ props.row.organizationPositionOld ?? '-' }} + {{ props.row.organizationPositionOld ?? "-" }} + + +
+
+
+ {{ + props.row.position !== null + ? props.row.position + : "" + }}{{ + (props.row.posTypeName !== null && + props.row.posTypeName === "บริหาร") || + props.row.posTypeName === "อำนวยการ" + ? `${props.row.posTypeName}` + : "" + }}{{ + props.row.posLevelName !== null + ? `${props.row.posLevelName}` + : "" + }} +
+
+ {{ props.row.root !== null ? props.row.root : "-" }} + {{ + props.row.rootShortName !== null + ? `(${props.row.rootShortName})` + : "" + }} +
+
+ {{ + props.row.nodeName !== null + ? props.row.nodeName + : "" + }} + {{ + props.row.nodeShortName !== null + ? `(${props.row.nodeShortName}${props.row.posMasterNo})` + : "" + }} +
+
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue index a5da05bf0..11e3775cb 100644 --- a/src/modules/05_placement/views/08_otherMain.vue +++ b/src/modules/05_placement/views/08_otherMain.vue @@ -45,9 +45,10 @@ const filterKeyword2 = ref(""); //คำค้นหารายกา const visibleColumns = ref([ "no", "fullname", - "organizationPositionReturn", + "positionNumberOld", "positionLevel", "organizationPositionOld", + "organizationPositionReturn", "createdAt", "status", ]); @@ -77,21 +78,22 @@ const columns = ref([ }, { - name: "organizationPositionReturn", + name: "positionNumberOld", align: "left", - label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ", + label: "ตำแหน่งเลขที่เดิม", sortable: true, - field: "organizationPositionReturn", - format(val, row) { - return row.organizationPositionOld.replace(/\n/g, " "); - }, + field: "positionNumberOld", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return row.positionNumberOld; + }, }, + { name: "positionLevel", align: "left", - label: "ประเภทตำแหน่ง", + label: "ตำแหน่งประเภทเดิม", sortable: true, field: "positionLevel", headerStyle: "font-size: 14px", @@ -120,6 +122,19 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + + { + name: "organizationPositionReturn", + align: "left", + label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ", + sortable: true, + field: "organizationPositionReturn", + format(val, row) { + return row.organizationPositionOld.replace(/\n/g, " "); + }, + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "createdAt", align: "left", @@ -455,9 +470,31 @@ onMounted(() => { {{ props.rowIndex + 1 }}
+
+ {{ props.row.organizationPositionOld ?? "-" }} +
+
-
+
+ {{ + props.row.position !== null ? props.row.position : "" + }}{{ + (props.row.posTypeName !== null && + props.row.posTypeName === "บริหาร") || + props.row.posTypeName === "อำนวยการ" + ? `${props.row.posTypeName}` + : "" + }}{{ + props.row.posLevelName !== null + ? `${props.row.posLevelName}` + : "" + }} +
+
{{ props.row.root !== null ? props.row.root : "-" }} {{ props.row.rootShortName !== null @@ -465,7 +502,7 @@ onMounted(() => { : "" }}
-
+
{{ props.row.nodeName !== null ? props.row.nodeName : "" }} @@ -478,13 +515,6 @@ onMounted(() => {
-
- {{ props.row.organizationPositionOld ?? "-" }} -
-
{{ col.value ? col.value : "-" }}