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,