From e14ba58df0a8707caf326272f18fc22e7d3e2e52 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 12 May 2026 15:24:53 +0700 Subject: [PATCH] refactor(receive): display prefix --- src/components/CardProfile.vue | 6 +++--- .../05_placement/components/Receive/receiveDetail.vue | 6 +++--- src/modules/05_placement/views/03_receiveMain.vue | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index d6b9fe4cf..72fe7aad0 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -43,9 +43,9 @@ async function fetchDataProfile(data: DataProfile) { profile.avatar = data?.avatar ? data.avatar : ""; } profile.id = data.profileId; - profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${ - data.lastName ?? "" - } `; + profile.fullName = `${data.rank ? data.rank : data.prefix ?? ""}${ + data.firstName ?? "" + } ${data.lastName ?? ""} `; if (data["posTypeNameOld"] !== undefined) { profile.position = diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue index cae4da5bc..950cfa42c 100644 --- a/src/modules/05_placement/components/Receive/receiveDetail.vue +++ b/src/modules/05_placement/components/Receive/receiveDetail.vue @@ -227,9 +227,9 @@ async function getData() { } rows.value = list; profileId.value = data.profileId; - title.value.fullname = `${data.prefix ?? ""}${data.firstName ?? ""} ${ - data.lastName ?? "" - }`; + title.value.fullname = `${data.rank ? data.rank : data.prefix ?? ""}${ + data.firstName ?? "" + } ${data.lastName ?? ""}`; title.value.organizationPositionOld = data.organizationPositionOld ?? "-"; title.value.positionLevelOld = data.positionLevelOld ?? "-"; title.value.positionTypeOld = data.positionTypeOld ?? "-"; diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index f34bf8a48..58b7a544b 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -110,7 +110,9 @@ const columns = ref([ sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), format(val, row) { - return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`; + return ` ${row.rank ? row.rank : row.prefix ?? ""}${ + row.firstName ?? "" + } ${row.lastName ?? ""}`; }, }, {