From 888385426cda774bba8bec599b4272d1b89fae89 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 25 Apr 2025 14:37:01 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=8A=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/data.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/stores/data.ts b/src/stores/data.ts
index dad7009..2b4d032 100644
--- a/src/stores/data.ts
+++ b/src/stores/data.ts
@@ -13,7 +13,8 @@ export const useDataStore = defineStore("dataMain", () => {
   const storeRegistry = useRegistryInFormationStore();
   const $q = useQuasar();
   const mixin = useCounterMixin();
-  const { messageError, showLoader, hideLoader, findPosMasterNo,findOrgName } = mixin;
+  const { messageError, showLoader, hideLoader, findPosMasterNo, findOrgName } =
+    mixin;
   // ref() คือการประกาศ state เหมือน vuex
   const formData = reactive<ProfileData>({
     profileId: "",
@@ -26,7 +27,7 @@ export const useDataStore = defineStore("dataMain", () => {
     posTypeName: "",
     posLevelName: "",
     salary: null,
-    birthDate: '',
+    birthDate: "",
     posNo: "",
     org: "",
     dateStart: "",
@@ -111,7 +112,12 @@ export const useDataStore = defineStore("dataMain", () => {
     formData.birthDate = data.birthDate;
     formData.posTypeName = data.posTypeName;
     formData.posExecutiveName = data.posExecutiveName;
-    formData.posLevelName = data.posLevelName;
+    formData.posLevelName =
+      data.profileType === "EMPLOYEE"
+        ? data.posTypeShortName
+          ? `${data.posTypeShortName} ${data.posLevelName}`
+          : `${data.posLevelName}`
+        : data.posLevelName;
     formData.dateStart = data.dateStart;
     formData.dateRetireLaw = data.dateRetireLaw;
     formData.posNo = findPosMasterNo(data);