Merge branch 'develop' into devTee

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

@@ -591,7 +591,7 @@ function onChangeIsDeputy() {
               </div>
               <div
                 v-if="
-                  (actionType === 'ADD' && props.dataNode?.orgLevel === 0) ||
+                  (actionType === 'ADD' && level === 0) ||
                   (actionType === 'EDIT' && props.dataNode?.orgLevel === 0)
                 "
                 class="col-12"

src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue

@@ -15,6 +15,7 @@ import type {
 } from "@/modules/04_registryPerson/interface/index/Main";
 import type { DataListsIDP } from "@/modules/04_registryPerson/interface/response/Main";
 
+const props = defineProps<{ isIdp: boolean | null }>();
 const $q = useQuasar();
 const router = useRouter();
 const route = useRoute();
@@ -283,9 +284,8 @@ watch(
   }
 );
 
-/** HooK lifecycle ทำงานเมื่อมีการเรียกใช้งาน Componenets*/
 onMounted(() => {
-  fetchData();
+  props.isIdp && fetchData();
 });
 </script>
 

src/modules/04_registryPerson/views/requestEditView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onBeforeMount, onMounted, ref } from "vue";
 
 import { useRoute, useRouter } from "vue-router";
 
@@ -12,12 +12,16 @@ const router = useRouter();
 const route = useRoute();
 const store = useRegistryNewDataStore();
 
-const isIDP = ref<boolean>();
+const isIDP = ref<boolean | null>(null);
+
+onBeforeMount(async () => {
+  isIDP.value = await (route.name?.toString() == "registryNewRequestEditEMP"
+    ? false
+    : true);
+});
 
 onMounted(() => {
-  const check =
-    route.name?.toString() == "registryNewRequestEditEMP" ? false : true;
-  store.tabs = !check ? "Main" : store.tabs;
+  store.tabs = !isIDP.value ? "Main" : store.tabs;
 });
 </script>
 
@@ -63,7 +67,9 @@ onMounted(() => {
           <TabInformation />
         </q-tab-panel>
 
-        <q-tab-panel style="padding: 0px" name="IDP"> <TabIDP /> </q-tab-panel>
+        <q-tab-panel style="padding: 0px" name="IDP">
+          <TabIDP :is-idp="isIDP" />
+        </q-tab-panel>
       </q-tab-panels>
     </q-card-section>
   </q-card>

src/modules/06_retirement/components/resignEMP/Table.vue

@@ -301,7 +301,6 @@ onMounted(async () => {
             map-options
             :options="columns"
             option-value="name"
-            
             style="min-width: 140px"
           />
         </div>
@@ -350,7 +349,9 @@ onMounted(async () => {
                   round
                   color="edit"
                   icon="edit"
-                  @click.pervent="onRedirectToDetail('resign-employee', props.row.id)"
+                  @click.pervent="
+                    onRedirectToDetail('resign-employee', props.row.id)
+                  "
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>

src/modules/06_retirement/router.ts

@@ -166,8 +166,6 @@ export default [
     },
   },
 
-
-
   {
     path: "/retirement/resign-employee/:id",
     name: "resignbyidEMP",
@@ -189,7 +187,6 @@ export default [
     },
   },
 
-
   {
     path: "/retirement/resign-reject/:id",
     name: "resignReject",