fix ==> การรันตำแหน่ง โครงสร้างอัตรากำลัง

src/modules/02_organization/components/MainView.vue

@@ -118,18 +118,24 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
     .then(async (res) => {
       const dataMain: PosMaster[] = [];
       totalPage.value = Math.ceil(res.data.result.total / reqMaster.pageSize);
-      totalData.value = res.data.result.total;
       res.data.result.data.forEach((e: PosMaster) => {
         const p = e.positions;
-        if (p.length !== 0) {
+        let positionData = {};
-          const a = p.find((el: Position) => el.positionIsSelected === true);
+
-          const { id, ...rest } = a ? a : p[0];
+        if (p?.length > 0) {
-          const test = {
+          const selectedPos = p.find(
-            ...e,
+            (el: Position) => el.positionIsSelected === true
-            ...rest,
+          );
-          };
+          const targetPosition = selectedPos || p[0];
-          dataMain.push(test);
+          const { id, ...rest } = targetPosition;
+          positionData = rest;
         }
+
+        const newDataMain = {
+          ...e,
+          ...positionData,
+        };
+        dataMain.push(newDataMain);
       });
       posMaster.value = store.fetchPosMaster(dataMain);
     })

src/modules/02_organization/components/TableMain.vue

@@ -1050,7 +1050,7 @@ watch(
     v-model:reqMaster="reqMaster"
     :fetchDataTable="props.fetchDataTable"
     :getSummary="getSummary"
-    :is-position-holder="isPositionHolder"
+    v-model:is-position-holder="isPositionHolder"
     :position-holder-info="positionHolderInfo"
   />