From b1c06233f6140777af8271620fa59d4408fce394 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 10 Jan 2025 10:28:41 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B9=89?=
 =?UTF-8?q?=E0=B8=99=E0=B8=AB=E0=B8=B2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/data.ts  |  6 ++----
 src/stores/mixin.ts | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/stores/data.ts b/src/stores/data.ts
index 7eab5ce..17b3c0f 100644
--- a/src/stores/data.ts
+++ b/src/stores/data.ts
@@ -12,7 +12,7 @@ export const useDataStore = defineStore("dataMain", () => {
   const storeRegistry = useRegistryInFormationStore();
   const $q = useQuasar();
   const mixin = useCounterMixin();
-  const { messageError, showLoader, hideLoader } = mixin;
+  const { messageError, showLoader, hideLoader, findPosMasterNo } = mixin;
   // ref() คือการประกาศ state เหมือน vuex
   const formData = reactive<ProfileData>({
     rank: "",
@@ -102,9 +102,7 @@ export const useDataStore = defineStore("dataMain", () => {
     formData.posTypeName = data.posTypeName;
     formData.posExecutiveName = data.posExecutiveName;
     formData.posLevelName = data.posLevelName;
-    formData.posNo = data.rootShortName
-      ? `${data.rootShortName}${data.posMaster}`
-      : "";
+    formData.posNo = findPosMasterNo(data);
     storeRegistry.profileId = data.profileId;
   }
 
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 0e8bbce..dcc87b0 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -1082,6 +1082,25 @@ export const useCounterMixin = defineStore("mixin", () => {
       return "";
     }
   }
+  function findPosMasterNo(obj: any) {
+    if (obj) {
+      let shortName =
+        (obj.child4ShortName != null
+          ? obj.child4ShortName
+          : obj.child3ShortName != null
+          ? obj.child3ShortName
+          : obj.child2ShortName != null
+          ? obj.child2ShortName
+          : obj.child1ShortName != null
+          ? obj.child1ShortName
+          : obj.rootShortName != null
+          ? obj.rootShortName
+          : "") + (obj.posMasterNo != null ? obj.posMasterNo : "");
+      return shortName == "" ? "-" : shortName;
+    } else {
+      return "";
+    }
+  }
 
   function findOrgNameOld(obj: any) {
     if (obj) {
@@ -1178,7 +1197,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     findOrgName,
     findPosMasterNoOld,
     findOrgNameOld,
-
+    findPosMasterNo,
     onSearchDataTable
   };
 });