From 8a7434ea45a07b0b47723a348c1dd9d063e89c36 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 25 Apr 2024 10:16:35 +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=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3?= =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B9=88=E0=B8=99=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_organizationalNew/store/organizational.ts | 6 +++--- src/modules/16_positionEmployee/store/organizational.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/02_organizationalNew/store/organizational.ts b/src/modules/02_organizationalNew/store/organizational.ts index 096f392ca..bef3684f9 100644 --- a/src/modules/02_organizationalNew/store/organizational.ts +++ b/src/modules/02_organizationalNew/store/organizational.ts @@ -76,9 +76,9 @@ export const useOrganizational = defineStore("organizationalStore", () => { : "ว่าง", posMasterNo: e.orgShortname + - e.posMasterNoPrefix + - e.posMasterNo + - e.posMasterNoSuffix, + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + + (e.posMasterNo?e.posMasterNo:"") + + (e.posMasterNoSuffix?e.posMasterNoSuffix:""), positionName: e.isSit ? e.profilePosition : e.positionName, posTypeName: e.isSit ? e.profilePostype : e.posTypeName, posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName, diff --git a/src/modules/16_positionEmployee/store/organizational.ts b/src/modules/16_positionEmployee/store/organizational.ts index 702078fc0..3db85426f 100644 --- a/src/modules/16_positionEmployee/store/organizational.ts +++ b/src/modules/16_positionEmployee/store/organizational.ts @@ -72,9 +72,9 @@ export const usePositionEmp = defineStore("positionEmpStore", () => { : "ว่าง", posMasterNo: e.orgShortname + - e.posMasterNoPrefix + - e.posMasterNo + - e.posMasterNoSuffix, + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + + (e.posMasterNo ? e.posMasterNo : "") + + (e.posMasterNoSuffix ? e.posMasterNoSuffix : ""), positionName: e.isSit ? e.profilePosition : e.positionName, posTypeName: e.isSit ? e.profilePostype : e.posTypeName, posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,