From a3bfe8dd5175ff762d46c46a877bfda58da60d57 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 17 Apr 2025 10:16:50 +0700 Subject: [PATCH] =?UTF-8?q?"=20"=20=20=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../16_positionEmployee/components/DialogSortPosition.vue | 2 +- src/modules/16_positionEmployee/store/organizational.ts | 2 +- src/modules/19_condition/view/Main.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/16_positionEmployee/components/DialogSortPosition.vue b/src/modules/16_positionEmployee/components/DialogSortPosition.vue index 372dde4cb..37a324500 100644 --- a/src/modules/16_positionEmployee/components/DialogSortPosition.vue +++ b/src/modules/16_positionEmployee/components/DialogSortPosition.vue @@ -104,7 +104,7 @@ function getData() { const dataMap = dataList.map((item: any) => ({ id: item.id, - name: `${item.orgShortname}${ + name: `${item.orgShortname} ${ item.posMasterNoPrefix ? item.posMasterNoPrefix : "" }${item.posMasterNo ? item.posMasterNo : ""}${ item.posMasterNoSuffix ? item.posMasterNoSuffix : "" diff --git a/src/modules/16_positionEmployee/store/organizational.ts b/src/modules/16_positionEmployee/store/organizational.ts index 3db85426f..a42db6646 100644 --- a/src/modules/16_positionEmployee/store/organizational.ts +++ b/src/modules/16_positionEmployee/store/organizational.ts @@ -73,7 +73,7 @@ export const usePositionEmp = defineStore("positionEmpStore", () => { posMasterNo: e.orgShortname + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + - (e.posMasterNo ? e.posMasterNo : "") + + (e.posMasterNo ? ` ${e.posMasterNo}` : "") + (e.posMasterNoSuffix ? e.posMasterNoSuffix : ""), positionName: e.isSit ? e.profilePosition : e.positionName, posTypeName: e.isSit ? e.profilePostype : e.posTypeName, diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue index 097a510f5..8b775355e 100644 --- a/src/modules/19_condition/view/Main.vue +++ b/src/modules/19_condition/view/Main.vue @@ -65,8 +65,8 @@ const columns = ref([ field: "posMasterNo", format(val, row) { return row.isSit - ? `${row.orgShortname}${row.posMasterNo}(นั่งทับตำแหน่ง)` - : `${row.orgShortname}${row.posMasterNo}`; + ? `${row.orgShortname} ${row.posMasterNo}(นั่งทับตำแหน่ง)` + : `${row.orgShortname} ${row.posMasterNo}`; }, headerStyle: "font-size: 14px", style: "font-size: 14px",