แสดงคนครอง

2024-02-07 17:07:52 +07:00 · 2024-02-07 17:07:52 +07:00 · 72eb0c0643
commit 72eb0c0643
parent 0b0ef1d1ff
3 changed files with 10 additions and 2 deletions
--- a/src/modules/02_organizationalNew/store/organizational.ts
+++ b/src/modules/02_organizationalNew/store/organizational.ts
@ -48,7 +48,13 @@ export const useOrganizational = defineStore("organizationalStore", () => {
  function fetchPosMaster(data: PosMaster[]) {
    const newPosMaster = data.map((e: PosMaster) => ({
      ...e,
-      positionIsSelected: e.positionIsSelected ? "มี" : "ว่าง",
+      positionIsSelected:
+        typeOrganizational.value === "draft" && e.fullNameNextHolder !== null
+          ? e.fullNameNextHolder
+          : typeOrganizational.value !== "draft" &&
+            e.fullNameCurrentHolder !== null
+          ? e.fullNameCurrentHolder
+          : "ว่าง",
      posMasterNo:
        e.orgShortname +
        e.posMasterNoPrefix +