diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue index d8f09f9b1..6f7e31dec 100644 --- a/src/modules/05_placement/components/Other/Detail.vue +++ b/src/modules/05_placement/components/Other/Detail.vue @@ -80,7 +80,7 @@ const fecthOther = async () => { Otherdata.value = res.data.result; console.log(data); - title.value.fullname = `${data.firstName ?? "-"} ${data.lastName ?? "-"}`; + title.value.fullname = `${data.firstname ?? "-"} ${data.lastname ?? "-"}`; title.value.organizationPositionOld = data.organizationPositionOld ?? "-"; title.value.positionLevelOld = data.positionLevelOld ?? "-"; title.value.positionTypeOld = data.positionTypeOld ?? "-"; @@ -99,7 +99,7 @@ const fecthOther = async () => { responseData.value.salary = data.salary !== null ? data.salary : 0; responseData.value.status = data.status ?? ""; responseData.value.avataPath = data.avataPath ?? ""; - responseData.value.fullname = `${data.firstName ?? "-"} ${ + responseData.value.fullname = `${data.firstname ?? "-"} ${ data.lastName ?? "-" }`; diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue index 12aa27631..8e6e05df2 100644 --- a/src/modules/05_placement/components/Other/Main.vue +++ b/src/modules/05_placement/components/Other/Main.vue @@ -54,7 +54,7 @@ const visibleColumns = ref([ "position", "positionLevel", "organizationPositionOld", - "organization", + "statustext", ]); @@ -64,7 +64,7 @@ const visibleColumns2 = ref([ "position", "positionLevel", "organizationPositionOld", - "organization", + "statustext", ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง const filterKeyword = ref(""); @@ -94,10 +94,10 @@ const fecthlistOthet = async () => { rows.value = response.map((r: any) => ({ createdAt: new Date(), date: new Date(), - firstName: r.firstName ?? "", + firstName: r.firstname ?? "", personalId: r.id ?? "", isActive: r.isActive ? r.isActive : false, - lastName: r.lastName ?? "", + lastName: r.lastname ?? "", organization: r.organization ?? "", organizationPositionOld: r.organizationPositionOld ?? "", posNo: r.posNo ?? "", @@ -111,7 +111,7 @@ const fecthlistOthet = async () => { salary: r.salary ? r.salary : 0, status: r.status ?? "", statustext: status(r.status ?? ""), - fullname: `${r.prefix ?? ""} ${r.firstName ?? ""} ${r.lastName ?? ""}`, + fullname: `${r.prefix ?? ""} ${r.firstname ?? ""} ${r.lastname ?? ""}`, })); console.log(rows.value); rows2.value = rows.value.filter((e: any) => e.orgName !== null); @@ -214,15 +214,6 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "organization", - align: "left", - label: "หน่วยงานที่ขอโอนไป", - sortable: true, - field: "organization", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "statustext", align: "left", @@ -279,15 +270,6 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "organization", - align: "left", - label: "หน่วยงานที่ขอโอนไป", - sortable: true, - field: "organization", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "statustext", align: "left", diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 4df96abe7..8c59a0be0 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -91,7 +91,7 @@ const columns = ref([ sortable: true, field: "fullName", headerStyle: "font-size: 14px", - style: "font-size: 14px", + style: "font-size: 14px,", }, { name: "examNumber", @@ -604,7 +604,10 @@ const paginationLabel = (start: number, end: number, total: number) => { v-else-if="col.name === 'fullName'" class="table_ellipsis" > -
+
{