diff --git a/src/modules/02_organization/components/DialogFormAgency.vue b/src/modules/02_organization/components/DialogFormAgency.vue
index 318bac59a..d94a89858 100644
--- a/src/modules/02_organization/components/DialogFormAgency.vue
+++ b/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"
diff --git a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
index f4e4f8452..77a9f0138 100644
--- a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
+++ b/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>
 
diff --git a/src/modules/04_registryPerson/views/requestEditView.vue b/src/modules/04_registryPerson/views/requestEditView.vue
index 5a8c3f861..c15020ff5 100644
--- a/src/modules/04_registryPerson/views/requestEditView.vue
+++ b/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>
diff --git a/src/modules/06_retirement/components/resignEMP/Table.vue b/src/modules/06_retirement/components/resignEMP/Table.vue
index 60d35f2e0..9dcedea08 100644
--- a/src/modules/06_retirement/components/resignEMP/Table.vue
+++ b/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>
diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index ee7403e14..a709c33ee 100644
--- a/src/modules/06_retirement/router.ts
+++ b/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",
diff --git a/tsconfig.config.json b/tsconfig.config.json
index 47bd2ee27..48ba8afb8 100644
--- a/tsconfig.config.json
+++ b/tsconfig.config.json
@@ -10,6 +10,7 @@
     "composite": true,
     "types": ["node"],
     "ignoreDeprecations": "5.0",
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": true,
+    "module": "esnext"
   }
 }
diff --git a/vite.config.ts b/vite.config.ts
index 9393aa965..4c9d87af5 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,30 +1,31 @@
-import { fileURLToPath, URL } from "node:url"
+import { fileURLToPath, URL } from "node:url";
 
-import { defineConfig } from "vite"
-import vue from "@vitejs/plugin-vue"
-import vueJsx from "@vitejs/plugin-vue-jsx"
-import { quasar, transformAssetUrls } from "@quasar/vite-plugin"
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import { quasar, transformAssetUrls } from "@quasar/vite-plugin";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-    plugins: [
-        vue({
-            template: { transformAssetUrls },
-        }),
-        quasar({
-            sassVariables: "src/style/quasar-variables.sass",
-        }),
-        vueJsx(),
-    ],
-    resolve: {
-        alias: {
-            "@": fileURLToPath(new URL("./src", import.meta.url)),
-        },
+  plugins: [
+    vue({
+      template: { transformAssetUrls },
+    }),
+    quasar({
+      sassVariables: "src/style/quasar-variables.sass",
+    }),
+    vueJsx(),
+  ],
+  resolve: {
+    alias: {
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
     },
-    build: {
-        target: "esnext",
-    },
-    server: {
-        port: 3006,
-    },
-})
+  },
+  build: {
+    target: "esnext",
+  },
+  server: {
+    port: 3006,
+  },
+  base: "./",
+});