From f2b173c708f31be4df1ede0b638b6e305ec7560a Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 25 Apr 2024 11:04:17 +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=20=3D>=20=E0=B9=81?= =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=20=E0=B8=88=E0=B8=B1=E0=B8=94?= =?UTF-8?q?=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=95=E0=B8=B3?= =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizationalNew/components/DialogSortPosition.vue | 6 +++++- .../16_positionEmployee/components/DialogSortPosition.vue | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue index 0ac3e8b5b..1598b91df 100644 --- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue @@ -81,7 +81,11 @@ function getData() { const dataList = res.data.result.data; const dataMap = dataList.map((item: any) => ({ id: item.id, - name: `${item.orgShortname}${item.posMasterNoPrefix}${item.posMasterNo}${item.posMasterNoSuffix}`, + name: `${item.orgShortname}${ + item.posMasterNoPrefix ? item.posMasterNoPrefix : "" + }${item.posMasterNo ? item.posMasterNo : ""}${ + item.posMasterNoSuffix ? item.posMasterNoSuffix : "" + }`, 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 aecaebf4a..fa8a75626 100644 --- a/src/modules/16_positionEmployee/components/DialogSortPosition.vue +++ b/src/modules/16_positionEmployee/components/DialogSortPosition.vue @@ -81,7 +81,11 @@ function getData() { const dataList = res.data.result.data; const dataMap = dataList.map((item: any) => ({ id: item.id, - name: `${item.orgShortname}${item.posMasterNoPrefix}${item.posMasterNo}${item.posMasterNoSuffix}`, + name: `${item.orgShortname}${ + item.posMasterNoPrefix ? item.posMasterNoPrefix : "" + }${item.posMasterNo ? item.posMasterNo : ""}${ + item.posMasterNoSuffix ? item.posMasterNoSuffix : "" + }`, posMasterNoPrefix: item.posMasterNoPrefix, posMasterNo: item.posMasterNo, posMasterNoSuffix: item.posMasterNoSuffix,