Merge branch 'nice_dev' into develop

src/modules/02_organizationalNew/components/TreeTable.vue

@@ -553,9 +553,12 @@ async function onClickDownloadReport(val: string, name: string) {
                 1
               }}
             </div>
+            <div v-else-if="col.name === 'posMasterNo'">
+              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
+            </div>
 
             <div v-else>
-              {{ col.value }}
+              {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
           <q-td>

src/modules/02_organizationalNew/components/TreeView.vue

@@ -65,6 +65,7 @@ async function fetchDataTree(id: string) {
       nodeTree.value = data;
       selected.value = "";
       nodeId.value = "";
+      store.treeId = "";
     })
     .catch((err) => {
       messageError($q, err);

src/modules/02_organizationalNew/interface/response/organizational.ts

@@ -111,6 +111,10 @@ interface PosMaster {
   fullNameCurrentHolder: string | null;
   fullNameNextHolder: string | null;
   positions: Position[]; // ตำแหน่ง
+  isSit: boolean;
+  profilePosition: string;
+  profilePostype: string;
+  profilePoslevel: string;
 }
 interface Position2 {
   id: string; // id ตำแหน่ง
@@ -196,5 +200,4 @@ export type {
   HistoryPos,
   SelectPerson,
   TypePos,
- 
 };

src/modules/02_organizationalNew/store/organizational.ts

@@ -79,11 +79,13 @@ export const useOrganizational = defineStore("organizationalStore", () => {
         e.posMasterNoPrefix +
         e.posMasterNo +
         e.posMasterNoSuffix,
-      positionName: e.positionName ? e.positionName : "-",
-      posTypeName: e.posTypeName ? e.posTypeName : "-",
-      posLevelName: e.posLevelName ? e.posLevelName : "-",
-      posExecutiveName: e.posExecutiveName ? e.posExecutiveName : "-",
+      positionName: e.isSit ? e.profilePosition : e.positionName,
+      posTypeName: e.isSit ? e.profilePostype : e.posTypeName,
+      posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,
+      posExecutiveName: e.posExecutiveName,
+      isSit: e.isSit,
     }));
+
     return newPosMaster;
   }