From 48e2209c30b09fc04eedf12b15fe1246707508df Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 15 May 2024 10:57:02 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizationalNew/components/DialogSuccession.vue | 9 +++++---- .../16_positionEmployee/components/DialogSuccession.vue | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogSuccession.vue b/src/modules/02_organizationalNew/components/DialogSuccession.vue index 51f37a424..d6fca2c21 100644 --- a/src/modules/02_organizationalNew/components/DialogSuccession.vue +++ b/src/modules/02_organizationalNew/components/DialogSuccession.vue @@ -128,11 +128,12 @@ async function fetchTable() { const list = data.map((e: PosMaster) => ({ ...e, posMasterNo: - e.orgShortname + - e.posMasterNoPrefix + - e.posMasterNo + - e.posMasterNoSuffix, + (e.orgShortname !== null ? e.orgShortname : "") + + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + + (e.posMasterNo !== null ? e.posMasterNo : "") + + (e.posMasterNoSuffix !== null ? e.posMasterNoPrefix : ""), })); + rows.value = list; }) .catch((err) => { diff --git a/src/modules/16_positionEmployee/components/DialogSuccession.vue b/src/modules/16_positionEmployee/components/DialogSuccession.vue index 0693b9b52..3334c340b 100644 --- a/src/modules/16_positionEmployee/components/DialogSuccession.vue +++ b/src/modules/16_positionEmployee/components/DialogSuccession.vue @@ -127,10 +127,10 @@ async function fetchTable() { const list = data.map((e: PosMaster) => ({ ...e, posMasterNo: - e.orgShortname + - e.posMasterNoPrefix + - e.posMasterNo + - e.posMasterNoSuffix, + (e.orgShortname !== null ? e.orgShortname : "") + + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + + (e.posMasterNo !== null ? e.posMasterNo : "") + + (e.posMasterNoSuffix !== null ? e.posMasterNoPrefix : ""), })); rows.value = list; })