From a319e4efa98249848842415a4f8bc2d52954d314 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 25 Apr 2024 14:44:44 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?= =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?= =?UTF-8?q?=20=3D>=20=20=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=A5=E0=B8=B3?= =?UTF-8?q?=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?= =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87=20=E0=B9=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=89=E0=B9=88=E0=B8=AD=E0=B8=84=E0=B8=99?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizationalNew/components/DialogSortPosition.vue | 4 +++- .../16_positionEmployee/components/DialogSortPosition.vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue index 1598b91df..d737b9930 100644 --- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue @@ -79,13 +79,15 @@ function getData() { }) .then((res) => { const dataList = res.data.result.data; + console.log(dataList); + const dataMap = dataList.map((item: any) => ({ id: item.id, name: `${item.orgShortname}${ item.posMasterNoPrefix ? item.posMasterNoPrefix : "" }${item.posMasterNo ? item.posMasterNo : ""}${ item.posMasterNoSuffix ? item.posMasterNoSuffix : "" - }`, + } ${item.fullNameNextHolder ? item.fullNameNextHolder : ""}`, posMasterNoPrefix: item.posMasterNoPrefix, posMasterNo: item.posMasterNo, posMasterNoSuffix: item.posMasterNoSuffix, diff --git a/src/modules/16_positionEmployee/components/DialogSortPosition.vue b/src/modules/16_positionEmployee/components/DialogSortPosition.vue index fa8a75626..6f796c65a 100644 --- a/src/modules/16_positionEmployee/components/DialogSortPosition.vue +++ b/src/modules/16_positionEmployee/components/DialogSortPosition.vue @@ -85,7 +85,7 @@ function getData() { item.posMasterNoPrefix ? item.posMasterNoPrefix : "" }${item.posMasterNo ? item.posMasterNo : ""}${ item.posMasterNoSuffix ? item.posMasterNoSuffix : "" - }`, + } ${item.fullNameNextHolder ? item.fullNameNextHolder : ""}`, posMasterNoPrefix: item.posMasterNoPrefix, posMasterNo: item.posMasterNo, posMasterNoSuffix: item.posMasterNoSuffix,