diff --git a/src/interface/main.ts b/src/interface/main.ts
index 21a88d9d6..f34950b8f 100644
--- a/src/interface/main.ts
+++ b/src/interface/main.ts
@@ -11,4 +11,16 @@ interface FormProfile {
   organization: string;
 }
 
-export type { DataOption, FormProfile };
+interface RoleData {
+  attrOwnership: string;
+  attrIsCreate: boolean;
+  attrIsList: boolean;
+  attrIsGet: boolean;
+  attrIsUpdate: boolean;
+  attrIsDelete: boolean;
+  attrPrivilege: string;
+  authSysId: string;
+  parentNode: string;
+}
+
+export type { DataOption, FormProfile, RoleData };
diff --git a/src/interface/response/main.ts b/src/interface/response/main.ts
index 7db230f15..e49121332 100644
--- a/src/interface/response/main.ts
+++ b/src/interface/response/main.ts
@@ -12,6 +12,7 @@ interface ListMenu {
 interface ChildConfig {
   sysName?: string;
   path: string;
+  meta?: MenuMetadata;
 }
 
 interface ChildLevelTree {
@@ -25,6 +26,11 @@ interface DataPermissions {
   roles: DataRoles[];
 }
 
+interface MenuMetadata {
+  Auth: boolean;
+  Key: string;
+  Role: string;
+}
 interface DataRoles {
   attrIsCreate: boolean;
   attrIsDelete: boolean;
diff --git a/src/main.ts b/src/main.ts
index df8024dbe..0595dce2e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -104,4 +104,9 @@ if (auth.token && auth.refresh_token) {
   // });
 }
 
+app.config.globalProperties.$checkPermission = function () {
+  console.log("This is a checkPermission");
+  return true;
+};
+
 app.mount("#app");
diff --git a/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
similarity index 98%
rename from src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue
rename to src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
index 502a175ec..7bf7d8703 100644
--- a/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
@@ -6,8 +6,8 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 /** importType*/
-import type { FormDataRole } from "@/modules/01_metadataNew/interface/request/Main";
-import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
+import type { FormDataRole } from "@/modules/01_masterdata/interface/request/Main";
+import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
diff --git a/src/modules/01_metadataNew/components/Indicators/DialogHistory.vue b/src/modules/01_masterdata/components/Indicators/DialogHistory.vue
similarity index 100%
rename from src/modules/01_metadataNew/components/Indicators/DialogHistory.vue
rename to src/modules/01_masterdata/components/Indicators/DialogHistory.vue
diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/DetailView.vue
similarity index 78%
rename from src/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue
rename to src/modules/01_masterdata/components/Indicators/indicatorByPlan/DetailView.vue
index d474dab10..25d99ade7 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/DetailView.vue
@@ -3,7 +3,7 @@ import { ref } from "vue";
 
 import { useRouter, useRoute } from "vue-router";
 
-import IndicatorByPlan from "@/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue";
+import IndicatorByPlan from "@/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue";
 
 const router = useRouter();
 const route = useRoute();
@@ -19,7 +19,7 @@ const title = ref<string>(route.params.id ? "แก้ไข" : "เพิ่ม
       class="q-mr-sm"
       icon="mdi-arrow-left"
       color="primary"
-      @click="router.push(`/KPI-indicator-plan`)"
+      @click="router.push(`/masterdata/indicator-plan`)"
     />
     {{ `${title}ตัวชี้วัดตามแผนฯ` }}
   </div>
diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
similarity index 99%
rename from src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
rename to src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index cb0183ed8..3ac2966ff 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -6,7 +6,7 @@ import config from "@/app.config";
 import http from "@/plugins/http";
 
 /** importType*/
-import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
+import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
 
 /** importStore*/
 import { usePositionEmp } from "@/modules/16_positionEmployee/store/organizational";
@@ -249,7 +249,7 @@ function onSubmit() {
           success($q, "บันทึกข้อมูลสำเร็จ");
           editStatus.value
             ? fetchDataById(id.value)
-            : router.push(`/KPI-indicator-plan/${res.data.result}`);
+            : router.push(`/masterdata/indicator-plan/${res.data.result}`);
         } catch (e) {
           messageError($q, e);
         } finally {
@@ -272,7 +272,6 @@ onMounted(() => {
 </script>
 
 <template>
-  
   <q-card>
     <q-form @submit.prevent greedy @validation-success="onSubmit()">
       <q-card-section>
diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
similarity index 98%
rename from src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
rename to src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index e5745f813..7309cb168 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -7,8 +7,8 @@ import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
 
-import type { FormDataRole } from "@/modules/01_metadataNew/interface/request/Main";
-import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
+import type { FormDataRole } from "@/modules/01_masterdata/interface/request/Main";
+import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -153,7 +153,7 @@ function onSubmit() {
       http[id.value ? "put" : "post"](url, body)
         .then(() => {
           success($q, "บันทึกสำเร็จ");
-          id.value ? getDetail() : router.push(`/KPI-indicator-role`);
+          id.value ? getDetail() : router.push(`/masterdata/indicator-role`);
         })
         .catch((err) => {
           messageError($q, err);
diff --git a/src/modules/01_metadataNew/components/competency/01ListCompetency.vue b/src/modules/01_masterdata/components/competency/01ListCompetency.vue
similarity index 89%
rename from src/modules/01_metadataNew/components/competency/01ListCompetency.vue
rename to src/modules/01_masterdata/components/competency/01ListCompetency.vue
index 0072f4f67..c2eed2e6a 100644
--- a/src/modules/01_metadataNew/components/competency/01ListCompetency.vue
+++ b/src/modules/01_masterdata/components/competency/01ListCompetency.vue
@@ -3,22 +3,24 @@ import { ref, onMounted, reactive, watch } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
 import type {
   DataOption,
   NewPagination,
-} from "@/modules/01_metadataNew/interface/index/Main";
-import type { FormQueryCapacity } from "@/modules/01_metadataNew/interface/request/Main";
-import type { ResDataCapacity } from "@/modules/01_metadataNew/interface/response/Main";
+} from "@/modules/01_masterdata/interface/index/Main";
+import type { FormQueryCapacity } from "@/modules/01_masterdata/interface/request/Main";
+import type { ResDataCapacity } from "@/modules/01_masterdata/interface/response/Main";
 
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
+import { checkPermission } from "@/utils/permissions";
 
 const total = ref<number>();
 const store = useKPIDataStore();
 const router = useRouter();
+const route = useRoute();
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
@@ -91,7 +93,7 @@ async function fetchList() {
 }
 
 async function onViewDetail(id: string) {
-  router.push(`/KPI-competency/${id}`);
+  router.push(`/masterdata/competency/${id}`);
 }
 
 function deleteData(id: string) {
@@ -113,7 +115,7 @@ function deleteData(id: string) {
 
 /** เปลี่ยนเป็นหน้าเพิ่มข้อมูล */
 function onAdd() {
-  router.push(`/KPI-competency/add`);
+  router.push(`/masterdata/competency/add`);
 }
 
 function fetchNewList() {
@@ -157,7 +159,14 @@ onMounted(() => {
       map-options
       @update:model-value="fetchNewList"
     />
-    <q-btn flat round color="primary" icon="add" @click="onAdd()">
+    <q-btn
+      v-if="checkPermission($route)?.attrIsCreate"
+      flat
+      round
+      color="primary"
+      icon="add"
+      @click="onAdd()"
+    >
       <q-tooltip> เพิ่มข้อมูล </q-tooltip>
     </q-btn>
     <q-space />
@@ -222,6 +231,7 @@ onMounted(() => {
       <q-tr :props="props" class="cursor-pointer">
         <q-td auto-width>
           <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
             color="edit"
             flat
             dense
@@ -235,6 +245,7 @@ onMounted(() => {
             <q-tooltip>แก้ไข</q-tooltip>
           </q-btn>
           <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
             color="red"
             flat
             dense
@@ -251,7 +262,6 @@ onMounted(() => {
         <q-td v-for="col in props.cols" :key="col.id">
           {{ col.value }}
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue b/src/modules/01_masterdata/components/competency/02ListLinkPosition.vue
similarity index 100%
rename from src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
rename to src/modules/01_masterdata/components/competency/02ListLinkPosition.vue
diff --git a/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue b/src/modules/01_masterdata/components/competency/03ListLinkGroup.vue
similarity index 99%
rename from src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
rename to src/modules/01_masterdata/components/competency/03ListLinkGroup.vue
index b496d64d1..26cd8a994 100644
--- a/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
+++ b/src/modules/01_masterdata/components/competency/03ListLinkGroup.vue
@@ -10,7 +10,7 @@ import Header from "@/components/DialogHeader.vue";
 import type {
   DataOption,
   NewPagination,
-} from "@/modules/01_metadataNew/interface/index/Main";
+} from "@/modules/01_masterdata/interface/index/Main";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -457,7 +457,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/components/competency/04ListCriteria.vue b/src/modules/01_masterdata/components/competency/04ListCriteria.vue
similarity index 100%
rename from src/modules/01_metadataNew/components/competency/04ListCriteria.vue
rename to src/modules/01_masterdata/components/competency/04ListCriteria.vue
diff --git a/src/modules/01_metadataNew/components/competency/05ListDetail.vue b/src/modules/01_masterdata/components/competency/05ListDetail.vue
similarity index 100%
rename from src/modules/01_metadataNew/components/competency/05ListDetail.vue
rename to src/modules/01_masterdata/components/competency/05ListDetail.vue
diff --git a/src/modules/01_metadataNew/components/competency/AddPage.vue b/src/modules/01_masterdata/components/competency/AddPage.vue
similarity index 88%
rename from src/modules/01_metadataNew/components/competency/AddPage.vue
rename to src/modules/01_masterdata/components/competency/AddPage.vue
index 047877f7d..ac5d44b7a 100644
--- a/src/modules/01_metadataNew/components/competency/AddPage.vue
+++ b/src/modules/01_masterdata/components/competency/AddPage.vue
@@ -2,12 +2,12 @@
 import { ref, reactive } from "vue";
 import { useRouter } from "vue-router";
 
-import Main from "@/modules/01_metadataNew/components/competency/Forms/Main.vue";
+import Main from "@/modules/01_masterdata/components/competency/Forms/Main.vue";
 
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 
-import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
-import type { FormCompetency } from "@/modules/01_metadataNew/interface/request/Main";
+import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
+import type { FormCompetency } from "@/modules/01_masterdata/interface/request/Main";
 
 const router = useRouter();
 const store = useKPIDataStore();
diff --git a/src/modules/01_metadataNew/components/competency/Forms/01_FormMain.vue b/src/modules/01_masterdata/components/competency/Forms/01_FormMain.vue
similarity index 93%
rename from src/modules/01_metadataNew/components/competency/Forms/01_FormMain.vue
rename to src/modules/01_masterdata/components/competency/Forms/01_FormMain.vue
index a16cb2c74..c35f22a46 100644
--- a/src/modules/01_metadataNew/components/competency/Forms/01_FormMain.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/01_FormMain.vue
@@ -2,7 +2,7 @@
 import { reactive } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
@@ -49,18 +49,6 @@ function onSubmit() {
       levels: formData.levels,
       evaluation: formData.evaluation,
     };
-    // showLoader()
-    //   http
-    //   .put(config.API.???,body)
-    //   .then((res)=>{
-    //     success($q,'บันทึกสำเร็จ')
-    //     router.push(`/KPI-competency`)
-    //   }).catch((e)=>{
-    //     messageError($q,e)
-    //   }).finally(()=>{
-    //     hideLoader()
-    //   })
-    console.log(body);
   });
 }
 </script>
diff --git a/src/modules/01_metadataNew/components/competency/Forms/02_FormGroup.vue b/src/modules/01_masterdata/components/competency/Forms/02_FormGroup.vue
similarity index 93%
rename from src/modules/01_metadataNew/components/competency/Forms/02_FormGroup.vue
rename to src/modules/01_masterdata/components/competency/Forms/02_FormGroup.vue
index 44575ab01..f6e78c7c8 100644
--- a/src/modules/01_metadataNew/components/competency/Forms/02_FormGroup.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/02_FormGroup.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
@@ -65,18 +65,6 @@ function onSubmit() {
       levels5: formScore.score5,
       evaluation: formData.evaluation,
     };
-    // showLoader()
-    //   http
-    //   .put(config.API.???,body)
-    //   .then((res)=>{
-    //     success($q,'บันทึกสำเร็จ')
-    //     router.push(`/KPI-competency`)
-    //   }).catch((e)=>{
-    //     messageError($q,e)
-    //   }).finally(()=>{
-    //     hideLoader()
-    //   })
-    console.log(body);
   });
 }
 </script>
diff --git a/src/modules/01_metadataNew/components/competency/Forms/03_FormExecutive.vue b/src/modules/01_masterdata/components/competency/Forms/03_FormExecutive.vue
similarity index 95%
rename from src/modules/01_metadataNew/components/competency/Forms/03_FormExecutive.vue
rename to src/modules/01_masterdata/components/competency/Forms/03_FormExecutive.vue
index 71aa77abf..ccf01fd1d 100644
--- a/src/modules/01_metadataNew/components/competency/Forms/03_FormExecutive.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/03_FormExecutive.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
@@ -89,18 +89,6 @@ function onSubmit() {
       postype: formData.form,
       evaluation: formData.evaluation,
     };
-    // showLoader()
-    //   http
-    //   .put(config.API.???,body)
-    //   .then((res)=>{
-    //     success($q,'บันทึกสำเร็จ')
-    //     router.push(`/KPI-competency`)
-    //   }).catch((e)=>{
-    //     messageError($q,e)
-    //   }).finally(()=>{
-    //     hideLoader()
-    //   })
-    console.log(body);
   });
 }
 
diff --git a/src/modules/01_metadataNew/components/competency/Forms/04_FormExecutivePosition.vue b/src/modules/01_masterdata/components/competency/Forms/04_FormExecutivePosition.vue
similarity index 96%
rename from src/modules/01_metadataNew/components/competency/Forms/04_FormExecutivePosition.vue
rename to src/modules/01_masterdata/components/competency/Forms/04_FormExecutivePosition.vue
index 4f7a7aed5..6ccd5afd1 100644
--- a/src/modules/01_metadataNew/components/competency/Forms/04_FormExecutivePosition.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/04_FormExecutivePosition.vue
@@ -3,7 +3,7 @@ import { ref, reactive } from "vue";
 import type { QTableProps } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
@@ -46,18 +46,6 @@ function onSubmit() {
       levels3: formData.level3,
       evaluation: formData.evaluation,
     };
-    // showLoader()
-    //   http
-    //   .put(config.API.???,body)
-    //   .then((res)=>{
-    //     success($q,'บันทึกสำเร็จ')
-    //     router.push(`/KPI-competency`)
-    //   }).catch((e)=>{
-    //     messageError($q,e)
-    //   }).finally(()=>{
-    //     hideLoader()
-    //   })
-    console.log(body);
   });
 }
 </script>
diff --git a/src/modules/01_metadataNew/components/competency/Forms/05_FormExecutiveLevel.vue b/src/modules/01_masterdata/components/competency/Forms/05_FormExecutiveLevel.vue
similarity index 95%
rename from src/modules/01_metadataNew/components/competency/Forms/05_FormExecutiveLevel.vue
rename to src/modules/01_masterdata/components/competency/Forms/05_FormExecutiveLevel.vue
index 7b7383c75..dc11f143e 100644
--- a/src/modules/01_metadataNew/components/competency/Forms/05_FormExecutiveLevel.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/05_FormExecutiveLevel.vue
@@ -2,7 +2,7 @@
 import { ref, reactive } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
@@ -42,18 +42,6 @@ function onSubmit() {
       levels2: formData.level2,
       evaluation: formData.evaluation,
     };
-    // showLoader()
-    //   http
-    //   .put(config.API.???,body)
-    //   .then((res)=>{
-    //     success($q,'บันทึกสำเร็จ')
-    //     router.push(`/KPI-competency`)
-    //   }).catch((e)=>{
-    //     messageError($q,e)
-    //   }).finally(()=>{
-    //     hideLoader()
-    //   })
-    console.log(body);
   });
 }
 </script>
diff --git a/src/modules/01_metadataNew/components/competency/Forms/Main.vue b/src/modules/01_masterdata/components/competency/Forms/Main.vue
similarity index 98%
rename from src/modules/01_metadataNew/components/competency/Forms/Main.vue
rename to src/modules/01_masterdata/components/competency/Forms/Main.vue
index b919bc383..7b5a4756b 100644
--- a/src/modules/01_metadataNew/components/competency/Forms/Main.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/Main.vue
@@ -7,7 +7,7 @@ import config from "@/app.config";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
+import { useKPIDataStore } from "@/modules/01_masterdata/stores/KPIStore";
 
 /**use*/
 const $q = useQuasar();
@@ -81,7 +81,7 @@ function onSubmit() {
       const method = competencyId.value ? "put" : "post";
       await http[method](url, formBody);
       if (!competencyId.value) {
-        router.push(`/KPI-competency`);
+        router.push(`/masterdata/competency`);
       } else {
         fetchDetail();
       }
diff --git a/src/modules/01_metadataNew/interface/index/Calendar.ts b/src/modules/01_masterdata/interface/index/Calendar.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/index/Calendar.ts
rename to src/modules/01_masterdata/interface/index/Calendar.ts
diff --git a/src/modules/01_metadataNew/interface/index/Main.ts b/src/modules/01_masterdata/interface/index/Main.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/index/Main.ts
rename to src/modules/01_masterdata/interface/index/Main.ts
diff --git a/src/modules/01_metadataNew/interface/index/positionEmployee.ts b/src/modules/01_masterdata/interface/index/positionEmployee.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/index/positionEmployee.ts
rename to src/modules/01_masterdata/interface/index/positionEmployee.ts
diff --git a/src/modules/01_metadataNew/interface/request/Main.ts b/src/modules/01_masterdata/interface/request/Main.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/request/Main.ts
rename to src/modules/01_masterdata/interface/request/Main.ts
diff --git a/src/modules/01_metadataNew/interface/request/insignia/Badge.ts b/src/modules/01_masterdata/interface/request/insignia/Badge.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/request/insignia/Badge.ts
rename to src/modules/01_masterdata/interface/request/insignia/Badge.ts
diff --git a/src/modules/01_metadataNew/interface/request/insignia/Insignia.ts b/src/modules/01_masterdata/interface/request/insignia/Insignia.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/request/insignia/Insignia.ts
rename to src/modules/01_masterdata/interface/request/insignia/Insignia.ts
diff --git a/src/modules/01_metadataNew/interface/request/insignia/InsigniaType.ts b/src/modules/01_masterdata/interface/request/insignia/InsigniaType.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/request/insignia/InsigniaType.ts
rename to src/modules/01_masterdata/interface/request/insignia/InsigniaType.ts
diff --git a/src/modules/01_metadataNew/interface/request/position/index.ts b/src/modules/01_masterdata/interface/request/position/index.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/request/position/index.ts
rename to src/modules/01_masterdata/interface/request/position/index.ts
diff --git a/src/modules/01_metadataNew/interface/request/positionEmployee.ts b/src/modules/01_masterdata/interface/request/positionEmployee.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/request/positionEmployee.ts
rename to src/modules/01_masterdata/interface/request/positionEmployee.ts
diff --git a/src/modules/01_metadataNew/interface/response/Main.ts b/src/modules/01_masterdata/interface/response/Main.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/Main.ts
rename to src/modules/01_masterdata/interface/response/Main.ts
diff --git a/src/modules/01_metadataNew/interface/response/Strategic.ts b/src/modules/01_masterdata/interface/response/Strategic.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/Strategic.ts
rename to src/modules/01_masterdata/interface/response/Strategic.ts
diff --git a/src/modules/01_metadataNew/interface/response/insignia/Insignia.ts b/src/modules/01_masterdata/interface/response/insignia/Insignia.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/insignia/Insignia.ts
rename to src/modules/01_masterdata/interface/response/insignia/Insignia.ts
diff --git a/src/modules/01_metadataNew/interface/response/insignia/InsigniaType.ts b/src/modules/01_masterdata/interface/response/insignia/InsigniaType.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/insignia/InsigniaType.ts
rename to src/modules/01_masterdata/interface/response/insignia/InsigniaType.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/Agency.ts b/src/modules/01_masterdata/interface/response/organization/Agency.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/Agency.ts
rename to src/modules/01_masterdata/interface/response/organization/Agency.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/Fax.ts b/src/modules/01_masterdata/interface/response/organization/Fax.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/Fax.ts
rename to src/modules/01_masterdata/interface/response/organization/Fax.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/GovernmentAgency.ts b/src/modules/01_masterdata/interface/response/organization/GovernmentAgency.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/GovernmentAgency.ts
rename to src/modules/01_masterdata/interface/response/organization/GovernmentAgency.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/Level.ts b/src/modules/01_masterdata/interface/response/organization/Level.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/Level.ts
rename to src/modules/01_masterdata/interface/response/organization/Level.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/Organization.ts b/src/modules/01_masterdata/interface/response/organization/Organization.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/Organization.ts
rename to src/modules/01_masterdata/interface/response/organization/Organization.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/ShortName.ts b/src/modules/01_masterdata/interface/response/organization/ShortName.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/ShortName.ts
rename to src/modules/01_masterdata/interface/response/organization/ShortName.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/Status.ts b/src/modules/01_masterdata/interface/response/organization/Status.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/Status.ts
rename to src/modules/01_masterdata/interface/response/organization/Status.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/TelExternal.ts b/src/modules/01_masterdata/interface/response/organization/TelExternal.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/TelExternal.ts
rename to src/modules/01_masterdata/interface/response/organization/TelExternal.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/TelInternal.ts b/src/modules/01_masterdata/interface/response/organization/TelInternal.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/TelInternal.ts
rename to src/modules/01_masterdata/interface/response/organization/TelInternal.ts
diff --git a/src/modules/01_metadataNew/interface/response/organization/Type.ts b/src/modules/01_masterdata/interface/response/organization/Type.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/organization/Type.ts
rename to src/modules/01_masterdata/interface/response/organization/Type.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Blood.ts b/src/modules/01_masterdata/interface/response/person/Blood.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Blood.ts
rename to src/modules/01_masterdata/interface/response/person/Blood.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/District.ts b/src/modules/01_masterdata/interface/response/person/District.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/District.ts
rename to src/modules/01_masterdata/interface/response/person/District.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Education.ts b/src/modules/01_masterdata/interface/response/person/Education.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Education.ts
rename to src/modules/01_masterdata/interface/response/person/Education.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Gender.ts b/src/modules/01_masterdata/interface/response/person/Gender.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Gender.ts
rename to src/modules/01_masterdata/interface/response/person/Gender.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Prefix.ts b/src/modules/01_masterdata/interface/response/person/Prefix.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Prefix.ts
rename to src/modules/01_masterdata/interface/response/person/Prefix.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Province.ts b/src/modules/01_masterdata/interface/response/person/Province.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Province.ts
rename to src/modules/01_masterdata/interface/response/person/Province.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Relationship.ts b/src/modules/01_masterdata/interface/response/person/Relationship.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Relationship.ts
rename to src/modules/01_masterdata/interface/response/person/Relationship.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/Religion.ts b/src/modules/01_masterdata/interface/response/person/Religion.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/Religion.ts
rename to src/modules/01_masterdata/interface/response/person/Religion.ts
diff --git a/src/modules/01_metadataNew/interface/response/person/SubDistrict.ts b/src/modules/01_masterdata/interface/response/person/SubDistrict.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/person/SubDistrict.ts
rename to src/modules/01_masterdata/interface/response/person/SubDistrict.ts
diff --git a/src/modules/01_metadataNew/interface/response/personal/personal.ts b/src/modules/01_masterdata/interface/response/personal/personal.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/personal/personal.ts
rename to src/modules/01_masterdata/interface/response/personal/personal.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/Executive.ts b/src/modules/01_masterdata/interface/response/position/Executive.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/Executive.ts
rename to src/modules/01_masterdata/interface/response/position/Executive.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/ExecutiveSide.ts b/src/modules/01_masterdata/interface/response/position/ExecutiveSide.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/ExecutiveSide.ts
rename to src/modules/01_masterdata/interface/response/position/ExecutiveSide.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/Level.ts b/src/modules/01_masterdata/interface/response/position/Level.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/Level.ts
rename to src/modules/01_masterdata/interface/response/position/Level.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/Line.ts b/src/modules/01_masterdata/interface/response/position/Line.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/Line.ts
rename to src/modules/01_masterdata/interface/response/position/Line.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/ListType.ts b/src/modules/01_masterdata/interface/response/position/ListType.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/ListType.ts
rename to src/modules/01_masterdata/interface/response/position/ListType.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/Path.ts b/src/modules/01_masterdata/interface/response/position/Path.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/Path.ts
rename to src/modules/01_masterdata/interface/response/position/Path.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/PathSide.ts b/src/modules/01_masterdata/interface/response/position/PathSide.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/PathSide.ts
rename to src/modules/01_masterdata/interface/response/position/PathSide.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/Status.ts b/src/modules/01_masterdata/interface/response/position/Status.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/Status.ts
rename to src/modules/01_masterdata/interface/response/position/Status.ts
diff --git a/src/modules/01_metadataNew/interface/response/position/Type.ts b/src/modules/01_masterdata/interface/response/position/Type.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/position/Type.ts
rename to src/modules/01_masterdata/interface/response/position/Type.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/Group.ts b/src/modules/01_masterdata/interface/response/positionEmployee/Group.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/Group.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/Group.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/Level.ts b/src/modules/01_masterdata/interface/response/positionEmployee/Level.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/Level.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/Level.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/Line.ts b/src/modules/01_masterdata/interface/response/positionEmployee/Line.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/Line.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/Line.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/Main.ts b/src/modules/01_masterdata/interface/response/positionEmployee/Main.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/Main.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/Main.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/Position.ts b/src/modules/01_masterdata/interface/response/positionEmployee/Position.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/Position.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/Position.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/PositionSide.ts b/src/modules/01_masterdata/interface/response/positionEmployee/PositionSide.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/PositionSide.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/PositionSide.ts
diff --git a/src/modules/01_metadataNew/interface/response/positionEmployee/Status.ts b/src/modules/01_masterdata/interface/response/positionEmployee/Status.ts
similarity index 100%
rename from src/modules/01_metadataNew/interface/response/positionEmployee/Status.ts
rename to src/modules/01_masterdata/interface/response/positionEmployee/Status.ts
diff --git a/src/modules/01_masterdata/router.ts b/src/modules/01_masterdata/router.ts
new file mode 100644
index 000000000..6117a2665
--- /dev/null
+++ b/src/modules/01_masterdata/router.ts
@@ -0,0 +1,149 @@
+const IndicatorByPlan = () =>
+  import("@/modules/01_masterdata/views/indicatorByPlan.vue");
+const IndicatorByPlanDetail = () =>
+  import(
+    "@/modules/01_masterdata/components/Indicators/indicatorByPlan/DetailView.vue"
+  );
+const IndicatorByRole = () =>
+  import("@/modules/01_masterdata/views/indicatorByRole.vue");
+const IndicatorByRoleDetail = () =>
+  import(
+    "@/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue"
+  );
+const competencyPage = () =>
+  import("@/modules/01_masterdata/views/competency.vue");
+const competencyAddPage = () =>
+  import("@/modules/01_masterdata/components/competency/AddPage.vue");
+const StrategicView = () =>
+  import("@/modules/01_masterdata/views/Strategic.vue");
+const AssignmentView = () =>
+  import("@/modules/01_masterdata/views/Assignment.vue");
+const AssignmentDetailView = () =>
+  import(
+    "@/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue"
+  );
+
+export default [
+  {
+    path: "/masterdata/indicator-plan",
+    name: "KPIIndicatorByPlan",
+    component: IndicatorByPlan,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+
+  {
+    path: "/masterdata/indicator-plan/add",
+    name: "KPIIndicatorByPlan/Add",
+    component: IndicatorByPlanDetail,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/indicator-plan/:id",
+    name: "KPIIndicatorByPlanByid",
+    component: IndicatorByPlanDetail,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/indicator-role",
+    name: "KPIIndicatorByRole",
+    component: IndicatorByRole,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/indicator-role/add",
+    name: "KPIIndicatorByRoleAdd",
+    component: IndicatorByRoleDetail,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/indicator-role/:id",
+    name: "KPIIndicatorByRoleByid",
+    component: IndicatorByRoleDetail,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/competency",
+    name: "KPICompetency",
+    component: competencyPage,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_COMPETENCY",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/competency/add",
+    name: "KPICompetencyAdd",
+    component: competencyAddPage,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_COMPETENCY",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/competency/:id",
+    name: "KPICompetencyByid",
+    component: competencyAddPage,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_COMPETENCY",
+      Role: "STAFF",
+    },
+  },
+
+  {
+    path: "/masterdata/strategic",
+    name: "strategic",
+    component: StrategicView,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_STRATIGIC",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/indicator-assignment",
+    name: "KPIAssignment",
+    component: AssignmentView,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/masterdata/indicator-assignment/:id",
+    name: "KPIAssignmentById",
+    component: AssignmentDetailView,
+    meta: {
+      Auth: true,
+      Key: "SYS_EVA_INDICATOR",
+      Role: "STAFF",
+    },
+  },
+];
diff --git a/src/modules/01_metadataNew/store.ts b/src/modules/01_masterdata/store.ts
similarity index 100%
rename from src/modules/01_metadataNew/store.ts
rename to src/modules/01_masterdata/store.ts
diff --git a/src/modules/01_metadataNew/stores/InsigniaStore.ts b/src/modules/01_masterdata/stores/InsigniaStore.ts
similarity index 100%
rename from src/modules/01_metadataNew/stores/InsigniaStore.ts
rename to src/modules/01_masterdata/stores/InsigniaStore.ts
diff --git a/src/modules/01_metadataNew/stores/KPIStore.ts b/src/modules/01_masterdata/stores/KPIStore.ts
similarity index 100%
rename from src/modules/01_metadataNew/stores/KPIStore.ts
rename to src/modules/01_masterdata/stores/KPIStore.ts
diff --git a/src/modules/01_metadataNew/stores/calendarStore.ts b/src/modules/01_masterdata/stores/calendarStore.ts
similarity index 100%
rename from src/modules/01_metadataNew/stores/calendarStore.ts
rename to src/modules/01_masterdata/stores/calendarStore.ts
diff --git a/src/modules/01_metadataNew/stores/main.ts b/src/modules/01_masterdata/stores/main.ts
similarity index 100%
rename from src/modules/01_metadataNew/stores/main.ts
rename to src/modules/01_masterdata/stores/main.ts
diff --git a/src/modules/01_metadataNew/stores/personalStore.ts b/src/modules/01_masterdata/stores/personalStore.ts
similarity index 100%
rename from src/modules/01_metadataNew/stores/personalStore.ts
rename to src/modules/01_masterdata/stores/personalStore.ts
diff --git a/src/modules/01_metadataNew/stores/positionEmployeeStore.ts b/src/modules/01_masterdata/stores/positionEmployeeStore.ts
similarity index 73%
rename from src/modules/01_metadataNew/stores/positionEmployeeStore.ts
rename to src/modules/01_masterdata/stores/positionEmployeeStore.ts
index 3c95e77bb..9a4a89948 100644
--- a/src/modules/01_metadataNew/stores/positionEmployeeStore.ts
+++ b/src/modules/01_masterdata/stores/positionEmployeeStore.ts
@@ -5,10 +5,10 @@ import type {
   DataResponse,
   DataRow,
 } from "../interface/response/position/ListType";
-import type { ResGroup } from "@/modules/01_metadataNew/interface/response/positionEmployee/Main";
+import type { ResGroup } from "@/modules/01_masterdata/interface/response/positionEmployee/Main";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useMainOptionDataStore } from "@/modules/01_metadataNew/stores/main";
+import { useMainOptionDataStore } from "@/modules/01_masterdata/stores/main";
 const storeOption = useMainOptionDataStore();
 
 const { date2Thai } = useCounterMixin();
diff --git a/src/modules/01_metadataNew/stores/positionListStore.ts b/src/modules/01_masterdata/stores/positionListStore.ts
similarity index 93%
rename from src/modules/01_metadataNew/stores/positionListStore.ts
rename to src/modules/01_masterdata/stores/positionListStore.ts
index 8c039313c..84c241ac6 100644
--- a/src/modules/01_metadataNew/stores/positionListStore.ts
+++ b/src/modules/01_masterdata/stores/positionListStore.ts
@@ -4,7 +4,7 @@ import type {
   DataResponse,
   DataRow,
 } from "../interface/response/position/ListType";
-import { useMainOptionDataStore } from "@/modules/01_metadataNew/stores/main";
+import { useMainOptionDataStore } from "@/modules/01_masterdata/stores/main";
 import { useCounterMixin } from "@/stores/mixin";
 const storeOption = useMainOptionDataStore();
 
diff --git a/src/modules/01_metadataNew/stores/positionTypeStore.ts b/src/modules/01_masterdata/stores/positionTypeStore.ts
similarity index 100%
rename from src/modules/01_metadataNew/stores/positionTypeStore.ts
rename to src/modules/01_masterdata/stores/positionTypeStore.ts
diff --git a/src/modules/01_metadataNew/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue
similarity index 96%
rename from src/modules/01_metadataNew/views/Assignment.vue
rename to src/modules/01_masterdata/views/Assignment.vue
index b95cd6fec..c7849ed64 100644
--- a/src/modules/01_metadataNew/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@@ -10,9 +10,9 @@ import type {
   DataOption,
   NewPagination,
   DataAssignment,
-} from "@/modules/01_metadataNew/interface/index/Main";
-import type { FormFilterAssignment } from "@/modules/01_metadataNew/interface/request/Main";
-import type { ResAssignment } from "@/modules/01_metadataNew/interface/response/Main";
+} from "@/modules/01_masterdata/interface/index/Main";
+import type { FormFilterAssignment } from "@/modules/01_masterdata/interface/request/Main";
+import type { ResAssignment } from "@/modules/01_masterdata/interface/response/Main";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -82,7 +82,7 @@ function fetchList() {
 }
 
 function onClickView(id: string = "") {
-  router.push(`/assignment/${id}`);
+  router.push(`/masterdata/indicator-assignment/${id}`);
 }
 
 function onClickDelete(id: string) {
@@ -291,7 +291,6 @@ onMounted(() => {
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/views/Strategic.vue b/src/modules/01_masterdata/views/Strategic.vue
similarity index 98%
rename from src/modules/01_metadataNew/views/Strategic.vue
rename to src/modules/01_masterdata/views/Strategic.vue
index a93591f84..bd855a4bf 100644
--- a/src/modules/01_metadataNew/views/Strategic.vue
+++ b/src/modules/01_masterdata/views/Strategic.vue
@@ -4,8 +4,8 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { ItemsMenu } from "@/modules/01_metadataNew/interface/index/Main";
-import type { DataStrategic } from "@/modules/01_metadataNew/interface/response/Strategic";
+import type { ItemsMenu } from "@/modules/01_masterdata/interface/index/Main";
+import type { DataStrategic } from "@/modules/01_masterdata/interface/response/Strategic";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
diff --git a/src/modules/01_metadataNew/views/calendar.vue b/src/modules/01_masterdata/views/calendar.vue
similarity index 94%
rename from src/modules/01_metadataNew/views/calendar.vue
rename to src/modules/01_masterdata/views/calendar.vue
index 743ac8025..0048c4a01 100644
--- a/src/modules/01_metadataNew/views/calendar.vue
+++ b/src/modules/01_masterdata/views/calendar.vue
@@ -4,9 +4,9 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { DataSumCalendarObject } from "@/modules/01_metadataNew/interface/index/Calendar";
+import type { DataSumCalendarObject } from "@/modules/01_masterdata/interface/index/Calendar";
 
-import calendarComponent from "@/modules/01_metadataNew/components/calendar/calendarMain.vue";
+import calendarComponent from "@/modules/01_masterdata/components/calendar/calendarMain.vue";
 
 import { useCounterMixin } from "@/stores/mixin";
 
diff --git a/src/modules/01_metadataNew/views/competency.vue b/src/modules/01_masterdata/views/competency.vue
similarity index 82%
rename from src/modules/01_metadataNew/views/competency.vue
rename to src/modules/01_masterdata/views/competency.vue
index 39a4d7430..511137d3a 100644
--- a/src/modules/01_metadataNew/views/competency.vue
+++ b/src/modules/01_masterdata/views/competency.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
 
-import ListCompetency from "@/modules/01_metadataNew/components/competency/01ListCompetency.vue";
-import ListLinkPosition from "@/modules/01_metadataNew/components/competency/02ListLinkPosition.vue";
-import ListLinkGroup from "@/modules/01_metadataNew/components/competency/03ListLinkGroup.vue";
-import ListCriteria from "@/modules/01_metadataNew/components/competency/04ListCriteria.vue";
-import ListDetail from "@/modules/01_metadataNew/components/competency/05ListDetail.vue";
+import ListCompetency from "@/modules/01_masterdata/components/competency/01ListCompetency.vue";
+import ListLinkPosition from "@/modules/01_masterdata/components/competency/02ListLinkPosition.vue";
+import ListLinkGroup from "@/modules/01_masterdata/components/competency/03ListLinkGroup.vue";
+import ListCriteria from "@/modules/01_masterdata/components/competency/04ListCriteria.vue";
+import ListDetail from "@/modules/01_masterdata/components/competency/05ListDetail.vue";
 
 const currentTab = ref<string>("list_competency");
 const tabs = ref<Array<any>>([]);
@@ -24,7 +24,6 @@ onMounted(() => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">สมรรถนะ</div>
-
   <q-card flat bordered>
     <div class="text-subtitle1 text-grey-9">
       <q-tabs
diff --git a/src/modules/01_metadataNew/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
similarity index 98%
rename from src/modules/01_metadataNew/views/indicatorByPlan.vue
rename to src/modules/01_masterdata/views/indicatorByPlan.vue
index dd4ddf176..78714507b 100644
--- a/src/modules/01_metadataNew/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -6,8 +6,8 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
-import DialogHistory from "@/modules/01_metadataNew/components/Indicators/DialogHistory.vue";
+import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
+import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -96,8 +96,8 @@ function fetchList() {
 
 function onClickAddOrView(status: boolean = false, id: string = "") {
   status
-    ? router.push(`/KPI-indicator-plan/${id}`)
-    : router.push("/KPI-indicator-plan/add");
+    ? router.push(`/masterdata/indicator-plan/${id}`)
+    : router.push("/masterdata/indicator-plan/add");
 }
 
 function fetchActive() {
@@ -481,7 +481,6 @@ onMounted(() => {
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>
-
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/01_metadataNew/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
similarity index 97%
rename from src/modules/01_metadataNew/views/indicatorByRole.vue
rename to src/modules/01_masterdata/views/indicatorByRole.vue
index 31c75e431..171a968b9 100644
--- a/src/modules/01_metadataNew/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -5,13 +5,13 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { FormListMainByRole } from "@/modules/01_metadataNew/interface/request/Main";
+import type { FormListMainByRole } from "@/modules/01_masterdata/interface/request/Main";
 import type {
   DataOption,
   NewPagination,
-} from "@/modules/01_metadataNew/interface/index/Main";
+} from "@/modules/01_masterdata/interface/index/Main";
 
-import DialogHistory from "@/modules/01_metadataNew/components/Indicators/DialogHistory.vue";
+import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -103,8 +103,8 @@ function fetchList() {
 
 function onClickAddOrView(status: boolean = false, id: string = "") {
   status
-    ? router.push(`/KPI-indicator-role/${id}`)
-    : router.push("/KPI-indicator-role/add");
+    ? router.push(`/masterdata/indicator-role/${id}`)
+    : router.push("/masterdata/indicator-role/add");
 }
 
 function onClickDelete(id: number) {
@@ -494,7 +494,6 @@ onMounted(async () => {
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/01_metadataNew/views/insignia.vue b/src/modules/01_masterdata/views/insignia.vue
similarity index 77%
rename from src/modules/01_metadataNew/views/insignia.vue
rename to src/modules/01_masterdata/views/insignia.vue
index 6ff4b29ff..10c055f54 100644
--- a/src/modules/01_metadataNew/views/insignia.vue
+++ b/src/modules/01_masterdata/views/insignia.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import InsigniaType from "@/modules/01_metadataNew/components/insignia/InsigniaType.vue";
+import InsigniaType from "@/modules/01_masterdata/components/insignia/InsigniaType.vue";
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
diff --git a/src/modules/01_metadataNew/views/personal.vue b/src/modules/01_masterdata/views/personal.vue
similarity index 75%
rename from src/modules/01_metadataNew/views/personal.vue
rename to src/modules/01_masterdata/views/personal.vue
index ad1f580f8..2a22914b6 100644
--- a/src/modules/01_metadataNew/views/personal.vue
+++ b/src/modules/01_masterdata/views/personal.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import { usePersonalDataStore } from '@/modules/01_metadataNew/stores/personalStore'
-import ListPrefix from "@/modules/01_metadataNew/components/personal/01ListPrefix.vue";
-import ListRank from "@/modules/01_metadataNew/components/personal/02ListRank.vue";
-import ListBloodGroup from "@/modules/01_metadataNew/components/personal/03ListBloodGroup.vue";
-import ListGender from "@/modules/01_metadataNew/components/personal/04ListGender.vue";
-import ListReligion from "@/modules/01_metadataNew/components/personal/05ListReligion.vue";
-import ListRelationship from "@/modules/01_metadataNew/components/personal/06ListRelationship.vue";
-import ListEducation from "@/modules/01_metadataNew/components/personal/07ListEducationLevel.vue";
-import ListProvince from "@/modules/01_metadataNew/components/personal/08ListProvince.vue";
+import { usePersonalDataStore } from "@/modules/01_masterdata/stores/personalStore";
+import ListPrefix from "@/modules/01_masterdata/components/personal/01ListPrefix.vue";
+import ListRank from "@/modules/01_masterdata/components/personal/02ListRank.vue";
+import ListBloodGroup from "@/modules/01_masterdata/components/personal/03ListBloodGroup.vue";
+import ListGender from "@/modules/01_masterdata/components/personal/04ListGender.vue";
+import ListReligion from "@/modules/01_masterdata/components/personal/05ListReligion.vue";
+import ListRelationship from "@/modules/01_masterdata/components/personal/06ListRelationship.vue";
+import ListEducation from "@/modules/01_masterdata/components/personal/07ListEducationLevel.vue";
+import ListProvince from "@/modules/01_masterdata/components/personal/08ListProvince.vue";
 
-const store = usePersonalDataStore()
+const store = usePersonalDataStore();
 const tabs = ref<Array<any>>([]);
 
 onMounted(() => {
diff --git a/src/modules/01_metadataNew/views/position.vue b/src/modules/01_masterdata/views/position.vue
similarity index 86%
rename from src/modules/01_metadataNew/views/position.vue
rename to src/modules/01_masterdata/views/position.vue
index afce4bba2..a955fb631 100644
--- a/src/modules/01_metadataNew/views/position.vue
+++ b/src/modules/01_masterdata/views/position.vue
@@ -1,9 +1,9 @@
 div
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import ListPosition from "@/modules/01_metadataNew/components/position/01ListPosition.vue";
-import ListType from "@/modules/01_metadataNew/components/position/02ListType.vue";
-import ListExecutive from "@/modules/01_metadataNew/components/position/04ListExecutive.vue";
+import ListPosition from "@/modules/01_masterdata/components/position/01ListPosition.vue";
+import ListType from "@/modules/01_masterdata/components/position/02ListType.vue";
+import ListExecutive from "@/modules/01_masterdata/components/position/04ListExecutive.vue";
 import { usePositionDataStore } from "../stores/positionListStore";
 // const store.pathLocation = ref<string>("list_position");
 const tabs = ref<Array<any>>([]);
diff --git a/src/modules/01_metadataNew/views/positionEmployee.vue b/src/modules/01_masterdata/views/positionEmployee.vue
similarity index 89%
rename from src/modules/01_metadataNew/views/positionEmployee.vue
rename to src/modules/01_masterdata/views/positionEmployee.vue
index aff4e4000..894455dee 100644
--- a/src/modules/01_metadataNew/views/positionEmployee.vue
+++ b/src/modules/01_masterdata/views/positionEmployee.vue
@@ -1,8 +1,8 @@
 div
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import ListPosition from "@/modules/01_metadataNew/components/position-employee/01ListPosition.vue";
-import ListType from "@/modules/01_metadataNew/components/position-employee/02ListType.vue";
+import ListPosition from "@/modules/01_masterdata/components/position-employee/01ListPosition.vue";
+import ListType from "@/modules/01_masterdata/components/position-employee/02ListType.vue";
 import { usePositionEmployeeDataStore } from "../stores/positionEmployeeStore";
 // const store.pathLocation = ref<string>("list_position");
 const tabs = ref<Array<any>>([]);
diff --git a/src/modules/01_metadataNew/components/calendar/Calendar.vue b/src/modules/01_metadataNew/components/calendar/Calendar.vue
deleted file mode 100644
index 5aa1c59bb..000000000
--- a/src/modules/01_metadataNew/components/calendar/Calendar.vue
+++ /dev/null
@@ -1,856 +0,0 @@
-<!-- tab ปฏิทิน หน้าปฏิทินวันหยุด -->
-<template>
-  <div class="q-mt-md">
-    <div class="row q-gutter-sm q-pb-sm main-content">
-      <div class="demo-app-main">
-        <!-- แสดงปฏิทิน -->
-        <FullCalendar
-          ref="fullCalendar"
-          class="demo-app-calendar"
-          :options="calendarOptions"
-        >
-          <template v-slot:eventContent="arg">
-            <b>{{ arg.timeText }}</b>
-            <i>{{ arg.event.title }}</i>
-            <q-tooltip style="font-size: 15px">{{ arg.event.title }}</q-tooltip>
-          </template>
-        </FullCalendar>
-      </div>
-    </div>
-    <div class="row q-col-gutter-md">
-      <div class="items-center row">
-        <q-icon color="blue" name="mdi-circle" class="q-mr-sm" />
-        วันทำงาน 5 วัน
-      </div>
-      <div class="items-center row">
-        <q-icon color="orange" name="mdi-circle" class="q-mr-sm" />
-        วันทำงาน 6 วัน
-      </div>
-    </div>
-  </div>
-
-  <!-- modal เพิ่มวันหยุด -->
-  <q-dialog v-model="modalAdd" persistent>
-    <q-card style="min-width: 550px">
-      <q-form ref="formDate" @submit.prevent.stop="onSubmit">
-        <q-card-section class="row items-center q-pa-sm">
-          <div class="text-bold" v-if="showEdit">แก้ไขวันหยุด</div>
-          <div class="text-bold" v-else>เพิ่มวันหยุด</div>
-          <q-space />
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            v-close-popup
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-card-section>
-        <q-separator />
-        <q-card-section class="q-p-md row q-gutter-y-md">
-          <div class="row col-12">
-            <div class="col-12" v-if="!showEdit">
-              {{ dateThaiRange(dateRange) }}
-            </div>
-            <datepicker
-              v-else
-              :readonly="!edit"
-              v-model="dateRange"
-              :locale="'th'"
-              autoApply
-              range
-              :enableTimePicker="false"
-              week-start="0"
-            >
-              <template #year="{ year }">
-                {{ year + 543 }}
-              </template>
-              <template #year-overlay-value="{ value }">
-                {{ parseInt(value + 543) }}
-              </template>
-              <template #trigger>
-                <q-input
-                  :class="getClass(edit)"
-                  hide-bottom-space
-                  :outlined="edit"
-                  dense
-                  label="วันที่"
-                 
-                  :borderless="!edit"
-                  :model-value="dateThaiRange(dateRange)"
-                >
-                  <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
-                    </q-icon>
-                  </template>
-                </q-input>
-              </template>
-            </datepicker>
-          </div>
-
-          <q-input
-            :class="getClass(edit)"
-            hide-bottom-space
-            :outlined="edit"
-            label="คำอธิบาย"
-            dense
-            lazy-rules
-            :readonly="!edit"
-            :borderless="!edit"
-            v-model="name"
-            autogrow
-            :rules="[(val) => (val && val.length > 0) || '']"
-          />
-          <q-option-group
-            v-if="showEdit == false"
-            v-model="category"
-            :options="categoryOptions"
-            color="primary"
-            inline
-          />
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right" class="text-primary">
-          <q-btn
-            v-if="showEdit && edit"
-            flat
-            color="red"
-            @click="cancelClick()"
-            label="ยกเลิกแก้ไข"
-          >
-            <!-- icon="mdi-undo"
-            <q-tooltip>ยกเลิก</q-tooltip> -->
-          </q-btn>
-          <q-btn
-            v-if="showEdit && edit"
-            unelevated
-            color="red"
-            @click="deleteClick()"
-            label="ลบวันหยุด"
-          >
-            <!-- icon="mdi-delete"
-            <q-tooltip>ลบ</q-tooltip> -->
-          </q-btn>
-          <q-btn
-            v-if="edit"
-            unelevated
-            color="public"
-            label="บันทึก"
-            type="submit"
-          >
-            <!-- icon="mdi-content-save-outline"
-            <q-tooltip>บันทึก</q-tooltip> -->
-          </q-btn>
-          <q-btn
-            v-if="!edit"
-            outline
-            color="primary"
-            @click="editClick"
-            label="แก้ไขข้อมูล"
-          >
-            <!-- icon="mdi-pencil-outline"
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
-          </q-btn>
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <!-- modal ลบวันหยุด -->
-  <q-dialog v-model="modalDelete" persistent>
-    <q-card style="min-width: 550px">
-      <q-card-section class="row items-center q-pb-xs">
-        <div class="text-bold">ต้องการลบข้อมูลนี้หรือไม่?</div>
-        <q-space />
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          v-close-popup
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-card-section>
-      <q-separator />
-      <q-card-section class="row items-center">
-        <div class="q-pr-md">
-          <q-avatar
-            icon="mdi-trash-can-outline"
-            font-size="25px"
-            size="lg"
-            color="red-1"
-            text-color="red"
-          />
-        </div>
-        <div class="col text-dark">
-          <span>ข้อมูลที่กำลังถูกลบนี้จะมีผลใช้งานทันที</span>
-        </div>
-      </q-card-section>
-      <q-separator />
-      <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="ยกเลิก" flat color="grey-8" @click="cancelClick" />
-        <q-btn label="ตกลง" color="primary" @click="deleteData" />
-      </q-card-actions>
-    </q-card>
-  </q-dialog>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref, watch } from "vue";
-import { useQuasar } from "quasar";
-import FullCalendar from "@fullcalendar/vue3";
-import dayGridPlugin from "@fullcalendar/daygrid";
-import timeGridPlugin from "@fullcalendar/timegrid";
-import interactionPlugin from "@fullcalendar/interaction";
-import allLocales from "@fullcalendar/core/locales-all";
-import listPlugin from "@fullcalendar/list";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import type {
-  RequestItemsObject,
-  DataDateRowObject,
-  DataDateAddObject,
-} from "@/modules/01_metadataNew/interface/index/Calendar";
-
-import { useCounterMixin } from "@/stores/mixin";
-
-const props = defineProps({
-  dateYear: {
-    //filter ปี วันหยุด
-    type: Number,
-    default: () => new Date().getFullYear(),
-  },
-  dateMonth: {
-    //filter เดือน วันหยุด
-    type: Number,
-    default: () => new Date().getMonth(),
-  },
-  refreshData: {
-    //หน้า main มีการอัพเดทค่าให้ refresh data
-    type: Boolean,
-    required: true,
-  },
-  fetchDataSummaryCalendar: {
-    //ฟังก์ชันอัพเดทสรุปวันหยุด
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-
-const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader } =
-  mixin;
-const $q = useQuasar(); //ใช้ noti quasar
-const modalAdd = ref<boolean>(false); //modal เพิ่มวันหยุด
-const modalDelete = ref<boolean>(false); //modal ลบวันหยุด
-const edit = ref<boolean>(false); //modal เลือกวันหยุดกับวันลบวันหยุด
-const showEdit = ref<boolean>(false); //กด event แก้ไขหรือเพิ่ม
-const name = ref<string>(""); //ชื่อวันหยุด
-const type = ref<string>(""); //ประเภทวันหยุด
-const isSpecial = ref<boolean>(true); //เช็ควันหยุด
-const id = ref<string>(""); //id ที่แก้ไขวันหยุด
-const fullCalendar = ref<any>(); //ref calendar
-const dateRange = ref<[Date, Date]>([new Date(), new Date()]); //วันที่ ที่เพิ่มเป็นวันหยุด
-const formDate = ref<any>(); //ref เพิ่ม แก้ไข วันหยุดสำหรับ validate
-
-const category = ref<string>("all");
-const categoryOptions = ref<any>([
-  {
-    label: "ทั้งหมด",
-    value: "all",
-  },
-  {
-    label: "ทำงาน 5 วัน",
-    value: "normal",
-  },
-  {
-    label: "ทำงาน 6 วัน",
-    value: "6days",
-  },
-]);
-const dataHistory = ref<RequestItemsObject[]>([]);
-const dataNormalRaw = ref<RequestItemsObject[]>([]);
-const dataSixDaysRaw = ref<RequestItemsObject[]>([]);
-
-/**
- * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้
- */
-onMounted(async () => {
-  hideLoader();
-  const calen = fullCalendar.value.getApi();
-  const date = new Date(props.dateYear, props.dateMonth);
-  calen.gotoDate(date);
-  await fetchData();
-});
-
-/**
- * ค่า props(วันเดือนปีที่เลือก) ตอนอัพเดท ค่าฏิทินให้อัพเดทใหม่
- */
-watch(props, async (count, prevCount) => {
-  const calen = fullCalendar.value.getApi();
-  const date = new Date(props.dateYear, props.dateMonth);
-  calen.gotoDate(date);
-  await fetchData();
-});
-
-/**
- * เลือกค่าปฏิทินในช่องว่าง
- * @param selectInfo ค่าที่เลือกในฏิทิน
- */
-const handleDateSelect = async (selectInfo: any) => {
-  edit.value = true;
-  category.value = "all";
-  selectInfo.start;
-  const checkNormalDate = dataNormalRaw.value.filter(
-    (r: RequestItemsObject) =>
-      dateToISO(new Date(r.holidayDate)) == dateToISO(selectInfo.start)
-  );
-  const checkSixDaysDate = dataSixDaysRaw.value.filter(
-    (r: RequestItemsObject) =>
-      dateToISO(new Date(r.holidayDate)) == dateToISO(selectInfo.start)
-  );
-  if (checkNormalDate.length == 0 || checkSixDaysDate.length == 0) {
-    name.value = "";
-    isSpecial.value = true;
-    dateRange.value = [
-      selectInfo.startStr,
-      new Date(
-        new Date(selectInfo.endStr).setDate(
-          new Date(selectInfo.endStr).getDate() - 1
-        )
-      ),
-    ];
-    showEdit.value = false;
-    modalAdd.value = true;
-  }
-};
-
-/**
- * เลือกค่า event ในปฏิทิน
- * @param selectInfo ค่าที่เลือกในฏิทิน
- */
-const handleEventClick = async (selectInfo: any) => {
-  modalAdd.value = true;
-  edit.value = false;
-  showEdit.value = true;
-  name.value = selectInfo.event.title;
-  type.value = selectInfo.event.id;
-  isSpecial.value = true;
-  id.value = selectInfo.event.groupId;
-  dataHistory.value = selectInfo.event.extendedProps.dataRangeRow;
-  dateRange.value = [
-    selectInfo.event.startStr,
-    selectInfo.event.endStr == ""
-      ? selectInfo.event.startStr
-      : dateToISO(
-          new Date(
-            new Date(selectInfo.event.endStr).setDate(
-              new Date(selectInfo.event.endStr).getDate() - 1
-            )
-          )
-        ),
-  ];
-};
-
-/**
- * กดปุ่มแก้ไขให้แสดง modal แก้ไข
- */
-const editClick = async () => {
-  showEdit.value = true;
-  edit.value = true;
-};
-
-/**
- * กดปุ่มลบให้แสดง modal ลบ
- */
-const deleteClick = async () => {
-  modalDelete.value = true;
-};
-
-/**
- * ปุ่มยกเลิกให้ย้อนกลับไป modal เลือกแก้ไขหรือลบ
- */
-const cancelClick = async () => {
-  modalDelete.value = false;
-  modalAdd.value = true;
-  edit.value = false;
-};
-
-/**
- * option calendar
- */
-const calendarOptions = ref<any>({
-  plugins: [
-    dayGridPlugin,
-    timeGridPlugin,
-    interactionPlugin, // needed for dateClick
-    listPlugin,
-  ],
-  headerToolbar: null,
-  selectable: true,
-  select: handleDateSelect,
-  eventClick: handleEventClick,
-  locale: "th",
-  locales: allLocales,
-  height: "100%",
-  eventColor: "#e4f3ff",
-  eventTextColor: "#50a5fc",
-  eventBorderColor: "#50a5fc",
-  events: <any>[],
-  firstDay: 0,
-});
-
-/**
- * ปุ่มบันทึกข้อมูลวันหยุด
- */
-const onSubmit = async () => {
-  if (showEdit.value === true) {
-    await editData();
-  } else {
-    await addDate();
-  }
-};
-
-/**
- * fetch วันหยุดในปฏิทิน
- */
-const fetchData = async () => {
-  calendarOptions.value.events = [];
-  showLoader();
-  await http
-    .get(
-      config.API.listHolidayHistoryYearMonth(
-        props.dateYear,
-        props.dateMonth + 1
-      )
-    )
-    .then((res) => {
-      const dataNormal = res.data.result.normal;
-      const dataSixDays = res.data.result.sixDays;
-      const dateStart = ref<Date | null>();
-      const firstEvent = ref<boolean>(true);
-      const dateRow = ref<DataDateRowObject[]>([]);
-      dataNormalRaw.value = res.data.result.normal;
-      dataSixDaysRaw.value = res.data.result.sixDays;
-      dataNormal.map((e: RequestItemsObject, index: number) => {
-        dateRow.value.push({
-          holidayDate: new Date(e.holidayDate),
-          name: e.name,
-          isSpecial: true,
-          id: e.id,
-        });
-        if (
-          index == dataNormal.length - 1 ||
-          dataNormal[index + 1].name != e.name ||
-          (dataNormal[index + 1].name == e.name &&
-            dateToISO(new Date(dataNormal[index + 1].holidayDate)) !=
-              dateToISO(
-                new Date(
-                  new Date(e.holidayDate).setDate(
-                    new Date(e.holidayDate).getDate() + 1
-                  )
-                )
-              ))
-        ) {
-          firstEvent.value = true;
-          calendarOptions.value.events.push({
-            id: "normal",
-            groupId: e.id,
-            title:
-              dateToISO(new Date(e.holidayDate)) ==
-              dateToISO(new Date(e.originalDate))
-                ? e.name
-                : `ชดเชย ${e.name}`,
-            start: dateStart.value ? dateStart.value : new Date(e.holidayDate),
-            end: new Date(
-              new Date(e.holidayDate).setDate(
-                new Date(e.holidayDate).getDate() + 1
-              )
-            ),
-            isSpecial: true,
-            allDay: true,
-            dataRangeRow: dateRow.value,
-            backgroundColor: "#CCE5FF",
-            textColor: "#0080FF",
-          });
-          dateStart.value = null;
-          dateRow.value = [];
-        } else if (firstEvent.value == true) {
-          firstEvent.value = false;
-          dateStart.value = new Date(e.holidayDate);
-        }
-      });
-      dataSixDays.map((e: RequestItemsObject, index: number) => {
-        dateRow.value.push({
-          holidayDate: new Date(e.holidayDate),
-          name: e.name,
-          isSpecial: true,
-          id: e.id,
-        });
-        if (
-          index == dataSixDays.length - 1 ||
-          dataSixDays[index + 1].name != e.name ||
-          (dataSixDays[index + 1].name == e.name &&
-            dateToISO(new Date(dataSixDays[index + 1].holidayDate)) !=
-              dateToISO(
-                new Date(
-                  new Date(e.holidayDate).setDate(
-                    new Date(e.holidayDate).getDate() + 1
-                  )
-                )
-              ))
-        ) {
-          firstEvent.value = true;
-          calendarOptions.value.events.push({
-            id: "sixdays",
-            groupId: e.id,
-            title:
-              dateToISO(new Date(e.holidayDate)) ==
-              dateToISO(new Date(e.originalDate))
-                ? e.name
-                : `ชดเชย ${e.name}`,
-            start: dateStart.value ? dateStart.value : new Date(e.holidayDate),
-            end: new Date(
-              new Date(e.holidayDate).setDate(
-                new Date(e.holidayDate).getDate() + 1
-              )
-            ),
-            isSpecial: true,
-            allDay: true,
-            dataRangeRow: dateRow.value,
-            backgroundColor: "#FFE5CC",
-            textColor: "#FF8000",
-          });
-          dateStart.value = null;
-          dateRow.value = [];
-        } else if (firstEvent.value == true) {
-          firstEvent.value = false;
-          dateStart.value = new Date(e.holidayDate);
-        }
-      });
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      await props.fetchDataSummaryCalendar();
-    });
-};
-
-/**
- * บันทึกแก้ไขวันหยุด
- */
-const editData = async () => {
-  await formDate.value.validate().then(async (result: boolean) => {
-    if (result) {
-      const dataEdit = ref<DataDateAddObject[]>([]);
-      let i = 0;
-      const dateStart = ref<Date>(dateRange.value[0]);
-      do {
-        i = i + 1;
-        dataEdit.value.push({
-          year: new Date(dateStart.value).getFullYear(),
-          holidayDate: dateToISO(new Date(dateStart.value)),
-          name: name.value,
-          isSpecial: true,
-        });
-        dateStart.value = new Date(
-          new Date(dateStart.value).setDate(
-            new Date(dateStart.value).getDate() + 1
-          )
-        );
-      } while (new Date(dateStart.value) <= new Date(dateRange.value[1]));
-
-      const _dataHistory = ref<RequestItemsObject[]>([]);
-      dataHistory.value.map((e: RequestItemsObject, index: number) => {
-        _dataHistory.value.push({
-          ...e,
-          holidayDate: dateToISO(new Date(e.holidayDate)),
-        });
-      });
-
-      showLoader();
-      await http
-        .post(config.API.listHolidayHistoryEdit(type.value), {
-          history: _dataHistory.value,
-          updated: dataEdit.value,
-        })
-        .then((res) => {
-          modalAdd.value = false;
-          success($q, "แก้ไขข้อมูลสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(async () => {
-          await fetchData();
-        });
-    }
-  });
-};
-
-/**
- * บันทึกเพิ่มวันหยุด
- */
-const addDate = async () => {
-  await formDate.value.validate().then(async (result: boolean) => {
-    if (result) {
-      const dataAdd = ref<DataDateAddObject[]>([]);
-      let i = 0;
-      const dateStart = ref<Date>(dateRange.value[0]);
-      do {
-        i = i + 1;
-        dataAdd.value.push({
-          year: new Date(dateStart.value).getFullYear(),
-          holidayDate: dateToISO(new Date(dateStart.value)),
-          name: name.value,
-          isSpecial: true,
-        });
-        dateStart.value = new Date(
-          new Date(dateStart.value).setDate(
-            new Date(dateStart.value).getDate() + 1
-          )
-        );
-      } while (new Date(dateStart.value) <= new Date(dateRange.value[1]));
-      showLoader();
-      await http
-        .post(config.API.listHolidayHistoryAdd(category.value), dataAdd.value)
-        .then((res) => {
-          modalAdd.value = false;
-          success($q, "เพิ่มข้อมูลสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(async () => {
-          await fetchData();
-        });
-    }
-  });
-};
-
-/**
- * ลบข้อมูลวันหยุด
- */
-const deleteData = async () => {
-  modalDelete.value = false;
-  const dataDelete = ref<DataDateAddObject[]>([]);
-  let i = 0;
-  const dateStart = ref<Date>(dateRange.value[0]);
-  do {
-    i = i + 1;
-    dataDelete.value.push({
-      year: new Date(dateStart.value).getFullYear(),
-      holidayDate: dateToISO(new Date(dateStart.value)),
-      name: name.value,
-      isSpecial: true,
-    });
-    dateStart.value = new Date(
-      new Date(dateStart.value).setDate(new Date(dateStart.value).getDate() + 1)
-    );
-  } while (new Date(dateStart.value) <= new Date(dateRange.value[1]));
-  showLoader();
-  await http
-    .post(config.API.listHolidayHistoryDelete(type.value), dataDelete.value)
-    .then((res) => {
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      modalAdd.value = false;
-      await fetchData();
-    });
-};
-
-/**
- * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง
- * @param val ช่วงวันที่
- */
-const dateThaiRange = (val: [Date, Date]) => {
-  if (val === null) {
-  } else if (date2Thai(val[0]) === date2Thai(val[1])) {
-    return `${date2Thai(val[0])}`;
-  } else {
-    return `${date2Thai(val[0])} - ${date2Thai(val[1])} `;
-  }
-};
-
-const getClass = (val: boolean) => {
-  return {
-    "full-width inputgreen cursor-pointer": val,
-    "full-width cursor-pointer": !val,
-  };
-};
-</script>
-
-<style scope lang="scss">
-.main-content {
-  height: 70vh;
-}
-
-.color-main {
-  color: #18a259;
-}
-
-.padding-content {
-  padding: 10px;
-}
-
-.demo-app-main {
-  flex-grow: 1;
-  /* padding: 3em; */
-}
-
-.fc {
-  /* the calendar root */
-  max-width: 1100px;
-  margin: 0 auto;
-  background-color: white;
-  border-radius: 10px;
-}
-
-.fc-day-today {
-  background-color: rgb(255, 255, 255) !important;
-}
-
-// .fc-day-sun {
-//   background-color: rgba(207, 205, 205, 0.177) !important;
-//   width: 80px;
-// }
-
-// .fc-day-sat {
-//   background-color: rgba(207, 205, 205, 0.177) !important;
-//   width: 80px;
-// }
-
-.fc-day-today .fc-daygrid-day-number {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  /* border: 2px solid #17a259; */
-  border-radius: 50%;
-  height: 25px;
-  width: 25px;
-  font-weight: bold;
-  color: white !important;
-  background: #17a259;
-}
-
-.fc-day-today .fc-daygrid-day-frame {
-  padding: 5%;
-}
-
-.fc .fc-button-group > .fc-button {
-  color: black;
-  background-color: #fafafa;
-  border: none;
-}
-
-.fc .fc-button-group > .fc-button:active {
-  color: white;
-  background-color: #22a15e;
-  border: none;
-}
-
-.fc .fc-button-group > .fc-button.fc-button-active {
-  color: white;
-  background-color: #22a15e;
-  border: none;
-}
-
-.fc-header-toolbar {
-  background-color: white;
-  padding: 0px 10px 0px 10px;
-  border-radius: 10px 10px 0px 0px;
-}
-
-.fc .fc-scrollgrid-liquid > thead {
-  background-color: #f8f8f8;
-}
-
-.dp-custom-cell {
-  border-radius: 50%;
-}
-
-.dp__today {
-  border: 1px solid var(--q-primary);
-}
-
-.dp__range_end,
-.dp__range_start,
-.dp__active_date {
-  background: var(--q-primary);
-  color: var(--dp-primary-text-color);
-}
-
-.datepicker .q-field__label {
-  padding-left: 5px;
-}
-
-.datepicker .q-field__messages {
-  padding-left: 20px;
-}
-
-.datepicker .q-field__native {
-  padding-left: 5px;
-  color: var(--q-primary) !important;
-}
-
-.datepicker .q-field__prepend {
-  padding-left: 6px;
-}
-
-.datepicker .q-field__append {
-  padding-right: 6px;
-}
-
-.datepicker .q-field__after {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  font-weight: 500;
-}
-
-.fc .fc-popover {
-  z-index: 6000;
-}
-
-.fc-direction-ltr .fc-daygrid-event.fc-event-end,
-.fc-direction-rtl .fc-daygrid-event.fc-event-start {
-  cursor: pointer;
-}
-
-.subName {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  font-weight: 500;
-}
-
-.subInput {
-  display: flex;
-  align-items: center;
-}
-
-.fc-event {
-  overflow: hidden;
-  border-color: transparent !important;
-  font-weight: 500;
-}
-
-.fc-event-main {
-  text-align: center;
-}
-
-.fc-direction-ltr .fc-daygrid-event.fc-event-end,
-.fc-direction-rtl .fc-daygrid-event.fc-event-start {
-  padding-left: 0px;
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/calendar/CalendarList.vue b/src/modules/01_metadataNew/components/calendar/CalendarList.vue
deleted file mode 100644
index f47ec5f76..000000000
--- a/src/modules/01_metadataNew/components/calendar/CalendarList.vue
+++ /dev/null
@@ -1,651 +0,0 @@
-<!-- tab รายการ หน้าปฏิทินวันหยุด -->
-<template>
-  <q-card class="q-mt-md" flat bordered>
-    <!-- list รายการันหยุด -->
-    <q-tabs
-      dense
-      v-model="currentTab"
-      indicator-color="primary"
-      active-color="primary bg-teal-1"
-      class="text-body2 text-grey-7"
-    >
-      <q-tab
-        v-for="tab in tabs"
-        :key="tab.value"
-        v-on:click="changeTab(tab.value)"
-        :label="tab.label"
-        :name="tab.value"
-        class="q-py-xs col-6 row"
-      />
-    </q-tabs>
-    <q-separator />
-
-    <q-tab-panels v-model="currentTab" animated>
-      <q-tab-panel name="normal">
-        <q-table
-          ref="table"
-          flat
-          bordered
-          class="custom-header-table"
-          virtual-scroll
-          :rows="calendarData"
-          :columns="columns"
-          dense
-          :rows-per-page-options="[0]"
-          hide-header
-        >
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div v-if="col.name == 'week'" class="">
-                  {{ dayThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else-if="col.name == 'holidayDate'" class="">
-                  {{ dateThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else class="my-table-details">
-                  {{ col.value }}
-                </div>
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  round
-                  color="grey"
-                  @click.stop
-                  size="10px"
-                  icon="more_vert"
-                >
-                  <q-menu>
-                    <q-list>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click="editCalendar(props.row)"
-                      >
-                        <q-item-section>
-                          <q-item-label>แก้ไขวันหยุด</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click="deleteClick(props.row)"
-                      >
-                        <q-item-section>
-                          <q-item-label>ลบวันหยุด</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                    </q-list>
-                  </q-menu>
-                </q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </q-tab-panel>
-
-      <q-tab-panel name="6day">
-        <q-table
-          ref="table"
-          flat
-          bordered
-          class="custom-header-table"
-          virtual-scroll
-          :rows="calendarData"
-          :columns="columns"
-          dense
-          :rows-per-page-options="[0]"
-          hide-header
-        >
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div v-if="col.name == 'week'" class="">
-                  {{ dayThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else-if="col.name == 'holidayDate'" class="">
-                  {{ dateThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else class="my-table-details">
-                  {{ col.value }}
-                </div>
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  round
-                  color="grey"
-                  @click.stop
-                  size="10px"
-                  icon="more_vert"
-                >
-                  <q-menu>
-                    <q-list>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click="editCalendar(props.row)"
-                      >
-                        <q-item-section>
-                          <q-item-label>แก้ไขวันหยุด</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click="deleteClick(props.row)"
-                      >
-                        <q-item-section>
-                          <q-item-label>ลบวันหยุด</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                    </q-list>
-                  </q-menu>
-                </q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </q-tab-panel>
-    </q-tab-panels>
-  </q-card>
-
-  <!-- modal เพิ่มวันหยุด -->
-  <q-dialog v-model="modalAdd" persistent>
-    <q-card style="min-width: 550px">
-      <q-form ref="formDate" @submit.prevent.stop="editData">
-        <q-card-section class="row items-center q-pb-xs">
-          <div class="text-bold">แก้ไขวันหยุด</div>
-          <q-space />
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            v-close-popup
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-card-section>
-        <q-separator />
-        <q-card-section class="q-p-sm">
-          <div class="row col-12 q-col-gutter-sm">
-            <div class="col-2 subName">
-              <label>เลือกวันที่</label>
-            </div>
-            <div class="col-10">
-              <datepicker
-                v-model="dateAdd"
-                :locale="'th'"
-                autoApply
-                range
-                :enableTimePicker="false"
-                week-start="0"
-              >
-                <template #year="{ year }">
-                  {{ year + 543 }}
-                </template>
-                <template #year-overlay-value="{ value }">
-                  {{ parseInt(value + 543) }}
-                </template>
-                <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker"
-                    :model-value="dateThaiRange(dateAdd)"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
-                      </q-icon>
-                    </template>
-                  </q-input>
-                </template>
-              </datepicker>
-            </div>
-          </div>
-          <div class="row col-12 q-col-gutter-sm">
-            <div class="col-2 subName">
-              <label>คำอธิบาย</label>
-            </div>
-            <div class="col-10">
-              <q-input
-                dense
-                borderless
-                class="full-width datepicker q-pb-none"
-                v-model="name"
-                type="textarea"
-                :rules="[(val) => (val && val.length > 0) || '']"
-              />
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right" class="text-primary">
-          <q-btn unelevated label="บันทึก" color="public" type="submit">
-            <!-- icon="mdi-content-save-outline"
-            <q-tooltip>บันทึก</q-tooltip> -->
-          </q-btn>
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <!-- modal ลบวันหยุด -->
-  <q-dialog v-model="modalDelete" persistent>
-    <q-card style="min-width: 550px">
-      <q-card-section class="row items-center q-pb-xs">
-        <div class="text-bold">ต้องการลบข้อมูลนี้หรือไม่?</div>
-        <q-space />
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          v-close-popup
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-card-section>
-      <q-separator />
-      <q-card-section class="row items-center">
-        <div class="q-pr-md">
-          <q-avatar
-            icon="mdi-trash-can-outline"
-            font-size="25px"
-            size="lg"
-            color="red-1"
-            text-color="red"
-          />
-        </div>
-        <div class="col text-dark">
-          <span>ข้อมูลที่กำลังถูกลบนี้จะมีผลใช้งานทันที</span>
-        </div>
-      </q-card-section>
-      <q-separator />
-      <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="ตกลง" color="primary" @click="deleteConfirm" />
-      </q-card-actions>
-    </q-card>
-  </q-dialog>
-</template>
-<script setup lang="ts">
-import { onMounted, ref, watch } from "vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import type {
-  RequestItemsObject,
-  DataDateRowObject,
-  DataDateAddObject,
-  DataDateListsObject,
-  TabsObject,
-} from "@/modules/01_metadataNew/interface/index/Calendar";
-
-import { useCounterMixin } from "@/stores/mixin";
-
-const props = defineProps({
-  dateYear: {
-    //filter ปี วันหยุด
-    type: Number,
-    required: true,
-  },
-  refreshData: {
-    //หน้า main มีการอัพเดทค่าให้ refresh data
-    type: Boolean,
-    required: true,
-  },
-  fetchDataSummaryCalendar: {
-    //ฟังก์ชันอัพเดทสรุปวันหยุด
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-
-const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const {
-  success,
-  dateToISO,
-  dateMonth2Thai,
-  weekThai,
-  messageError,
-  showLoader,
-  hideLoader,
-} = mixin;
-const $q = useQuasar(); //ใช้ noti quasar
-const calendarData = ref<DataDateListsObject[]>([]); //data วันหยุด
-const modalAdd = ref<boolean>(false); //modal เพิ่มวันหยุด
-const modalDelete = ref<boolean>(false); //modal ลบวันหยุด
-const name = ref<string>(""); //ชื่อวันหยุด
-const isSpecial = ref<boolean>(true); //เช็ควันหยุด
-const dateAdd = ref<[Date, Date]>([new Date(), new Date()]); //วันที่ ที่เพิ่มเป็นวันหยุด
-const rowData = ref<DataDateListsObject>(); //data ที่ถูกเลือกใน row นั้น
-const formDate = ref<any>(); //ref เพิ่ม แก้ไข วันหยุดสำหรับ validate
-
-const currentTab = ref<string>("normal"); //เลือก tab ประเภทวันหยุด
-const tabs = ref<TabsObject[]>([
-  { label: "ทำงานจันทร์-ศุกร์ (5 วัน)", value: "normal" },
-  { label: "ทำงานจันทร์-เสาร์ (6 วัน)", value: "6day" },
-]); //tab ประเภทวันหยุดทั้งหมด
-
-//columns รายการวันหยุด
-const columns = ref<any>([
-  {
-    name: "week",
-    align: "left",
-    label: "-",
-    sortable: true,
-    field: "week",
-    style: "font-size: 15px",
-  },
-  {
-    name: "holidayDate",
-    align: "left",
-    label: "-",
-    sortable: true,
-    field: "holidayDate",
-    style: "font-size: 15px",
-  },
-  {
-    name: "detail",
-    align: "left",
-    label: "-",
-    sortable: true,
-    field: "detail",
-    style: "font-size: 15px",
-  },
-]);
-
-/**
- * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้
- */
-onMounted(async () => {
-  await fetchData();
-});
-
-/**
- * ค่า props(วันปีที่เลือก และเพิ่มหรือแก้ไข) ตอนอัพเดท ค่าฏิทินให้อัพเดทใหม่
- */
-watch(props, async (count, prevCount) => {
-  await fetchData();
-});
-
-/**
- * กดปุ่มแก้ไขวันหยุด
- * @param val data วันหยุดทั้ง row
- */
-const editCalendar = async (val: DataDateListsObject) => {
-  rowData.value = val;
-  dateAdd.value = [val.dateRange[0], val.dateRange[1]];
-  name.value = val.detail;
-  isSpecial.value = true;
-  modalAdd.value = true;
-};
-
-/**
- * กดปุ่มลบวันหยุด
- * @param val data วันหยุดทั้ง row
- */
-const deleteClick = async (val: DataDateListsObject) => {
-  rowData.value = val;
-  modalDelete.value = true;
-};
-
-/**
- * fetch วันหยุดในรายการ
- */
-const fetchData = async () => {
-  calendarData.value = [];
-  showLoader();
-  await http
-    .get(config.API.listHolidayHistoryYear(props.dateYear))
-    .then((res) => {
-      let data = res.data.result.normal;
-      if (currentTab.value == "6day") {
-        data = res.data.result.sixDays;
-      }
-      const dateStart = ref<Date | null>();
-      const firstEvent = ref<boolean>(true);
-      const dateRow = ref<DataDateRowObject[]>([]);
-      data.map((e: RequestItemsObject, index: number) => {
-        dateRow.value.push({
-          holidayDate: new Date(e.holidayDate),
-          name: e.name,
-          isSpecial: true,
-          id: e.id,
-        });
-        if (
-          index == data.length - 1 ||
-          data[index + 1].name != e.name ||
-          (data[index + 1].name == e.name &&
-            dateToISO(new Date(data[index + 1].holidayDate)) !=
-              dateToISO(
-                new Date(
-                  new Date(e.holidayDate).setDate(
-                    new Date(e.holidayDate).getDate() + 1
-                  )
-                )
-              ))
-        ) {
-          firstEvent.value = true;
-          calendarData.value.push({
-            id: e.id,
-            dateRange: [
-              dateStart.value ? dateStart.value : new Date(e.holidayDate),
-              new Date(e.holidayDate),
-            ],
-            dataRangeRow: dateRow.value,
-            detail:
-              dateToISO(new Date(e.holidayDate)) ==
-              dateToISO(new Date(e.originalDate))
-                ? e.name
-                : `ชดเชย ${e.name}`,
-            isSpecial: true,
-          });
-          dateStart.value = null;
-          dateRow.value = [];
-        } else if (firstEvent.value == true) {
-          firstEvent.value = false;
-          dateStart.value = new Date(e.holidayDate);
-        }
-      });
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      await props.fetchDataSummaryCalendar();
-    });
-};
-
-/**
- * ลบข้อมูลวันหยุด
- */
-const deleteConfirm = async () => {
-  modalDelete.value = false;
-  const dataDelete = ref<DataDateAddObject[]>([]);
-  if (rowData.value != null) {
-    await rowData.value.dataRangeRow.map((e: DataDateRowObject) => {
-      dataDelete.value.push({
-        year: new Date(e.holidayDate).getFullYear(),
-        holidayDate: dateToISO(e.holidayDate),
-        name: e.name,
-        isSpecial: true,
-      });
-    });
-  } else {
-    return;
-  }
-  showLoader();
-  await http
-    .post(
-      config.API.listHolidayHistoryDelete(currentTab.value),
-      dataDelete.value
-    )
-    .then((res) => {
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      await fetchData();
-    });
-};
-
-/**
- * บันทึกแก้ไขวันหยุด
- */
-const editData = async () => {
-  await formDate.value.validate().then(async (result: boolean) => {
-    if (result) {
-      const dataEdit = ref<DataDateAddObject[]>([]);
-      let i = 0;
-      const dateStart = ref<Date>(dateAdd.value[0]);
-      do {
-        i = i + 1;
-        dataEdit.value.push({
-          year: new Date(dateStart.value).getFullYear(),
-          holidayDate: dateToISO(new Date(dateStart.value)),
-          name: name.value,
-          isSpecial: true,
-        });
-        dateStart.value = new Date(
-          new Date(dateStart.value).setDate(
-            new Date(dateStart.value).getDate() + 1
-          )
-        );
-      } while (new Date(dateStart.value) <= new Date(dateAdd.value[1]));
-      const _dataHistory = ref<DataDateAddObject[]>([]);
-      if (rowData.value != null) {
-        rowData.value.dataRangeRow.map(
-          (e: DataDateRowObject, index: number) => {
-            _dataHistory.value.push({
-              year: new Date(e.holidayDate).getFullYear(),
-              holidayDate: dateToISO(e.holidayDate),
-              name: e.name,
-              isSpecial: true,
-            });
-          }
-        );
-      }
-      showLoader();
-      await http
-        .post(config.API.listHolidayHistoryEdit(currentTab.value), {
-          history: _dataHistory.value,
-          updated: dataEdit.value,
-        })
-        .then((res) => {
-          modalAdd.value = false;
-          success($q, "แก้ไขข้อมูลสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(async () => {
-          await fetchData();
-        });
-    } else {
-    }
-  });
-};
-
-/**
- * เปลี่ยน tab ดูวันหยุดตามประเภท
- * @param tab tab ประเภทวันหยุดที่เลือก
- */
-const changeTab = async (tab: string) => {
-  currentTab.value = tab;
-  await fetchData();
-};
-
-/**
- * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง
- * @param val ช่วงวันที่
- */
-const dateThaiRange = (val: [Date, Date]) => {
-  if (val === null) {
-    return "";
-  } else if (dateMonth2Thai(val[0], true) === dateMonth2Thai(val[1], true)) {
-    return `${dateMonth2Thai(val[0], true)}`;
-  } else {
-    return `${dateMonth2Thai(val[0], true)} - ${dateMonth2Thai(val[1], true)}`;
-  }
-};
-
-/**
- * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง(เช่นวันจันทร์ -วันศุกร์)
- * @param val ช่วงวันที่
- */
-const dayThaiRange = (val: [Date, Date]) => {
-  if (val === null) {
-  } else if (dateToISO(val[0]) == dateToISO(val[1])) {
-    return `${weekThai(new Date(val[0]).getDay())}`;
-  } else {
-    return `${weekThai(new Date(val[0]).getDay())} - ${weekThai(
-      new Date(val[1]).getDay()
-    )}`;
-  }
-};
-</script>
-
-<style lang="scss" scope>
-.custom-header-table {
-  max-height: 64vh;
-
-  .q-table tr:nth-child(odd) td {
-    background: white;
-  }
-
-  .q-table tr:nth-child(even) td {
-    background: #f8f8f8;
-  }
-
-  .q-table thead tr {
-    background: #ecebeb;
-  }
-
-  .q-table thead tr th {
-    position: sticky;
-    z-index: 1;
-  }
-
-  /* this will be the loading indicator */
-  .q-table thead tr:last-child th {
-    /* height of all previous header rows */
-    top: 48px;
-  }
-
-  .q-table thead tr:first-child th {
-    top: 0;
-  }
-}
-
-.my-table-details {
-  white-space: -moz-pre-wrap !important;
-  /* Mozilla, since 1999 */
-  white-space: -webkit-pre-wrap;
-  /* Chrome & Safari */
-  white-space: -pre-wrap;
-  /* Opera 4-6 */
-  white-space: -o-pre-wrap;
-  /* Opera 7 */
-  white-space: pre-wrap;
-  /* CSS3 */
-  word-wrap: break-word;
-  /* Internet Explorer 5.5+ */
-  word-break: break-all;
-  white-space: normal;
-}
-
-.table_ellipsis {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: wrap;
-  max-width: 250px;
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/calendar/calendarMain.vue b/src/modules/01_metadataNew/components/calendar/calendarMain.vue
deleted file mode 100644
index 56690be39..000000000
--- a/src/modules/01_metadataNew/components/calendar/calendarMain.vue
+++ /dev/null
@@ -1,589 +0,0 @@
-<!-- page:จัดการข้อมูลหลัก tab วันหยุด -->
-<template>
-  <div>
-    <div class="row col-12 q-col-gutter-sm">
-      <div class="row items-center">
-        <!-- filter เลือกเดือนปี -->
-        <datepicker
-          v-model="dateMonth"
-          :locale="'th'"
-          autoApply
-          month-picker
-          :enableTimePicker="false"
-          v-if="currentTab === 'calendar'"
-          @update:modelValue="updateMonth"
-        >
-          <template #year="{ year }">{{ year + 543 }}</template>
-          <template #year-overlay-value="{ value }">{{
-            parseInt(value + 543)
-          }}</template>
-          <template #trigger>
-            <q-input
-              :model-value="monthYearThai(dateMonth)"
-              dense
-              outlined
-              style="width: 130px"
-            >
-              <template v-slot:prepend>
-                <q-icon
-                  name="event"
-                  class="cursor-pointer"
-                  style="color: var(--q-primary)"
-                >
-                </q-icon>
-              </template>
-            </q-input>
-          </template>
-        </datepicker>
-
-        <!-- filter เลือกปี -->
-        <datepicker
-          v-model="dateYear"
-          :locale="'th'"
-          autoApply
-          year-picker
-          :enableTimePicker="false"
-          v-if="currentTab === 'list'"
-          @update:modelValue="updateYear"
-        >
-          <template #year="{ year }">{{ year + 543 }}</template>
-          <template #year-overlay-value="{ value }">{{
-            parseInt(value + 543)
-          }}</template>
-          <template #trigger>
-            <q-input
-              :model-value="dateYear + 543"
-              dense
-              outlined
-              style="width: 100px"
-            >
-              <template v-slot:prepend>
-                <q-icon
-                  name="event"
-                  class="cursor-pointer"
-                  style="color: var(--q-primary)"
-                >
-                </q-icon>
-              </template>
-            </q-input>
-          </template>
-        </datepicker>
-        <div class="q-ml-sm">
-          <!-- icon เพิ่มวันหยุด -->
-          <q-btn round dense flat size="13px" class="q-px-sm">
-            <q-icon
-              name="mdi-plus"
-              size="25px"
-              color="primary"
-              @click="addCalendar()"
-            />
-            <q-tooltip>เพิ่มวันหยุด</q-tooltip>
-          </q-btn>
-          <!-- icon คัดลอกวันหยุด -->
-          <q-btn round dense flat size="13px" class="q-px-sm">
-            <q-icon
-              name="mdi-content-copy"
-              size="22px"
-              color="blue-6"
-              @click="copyCalendar()"
-            />
-            <q-tooltip>คัดลอกวันหยุด</q-tooltip>
-          </q-btn>
-        </div>
-      </div>
-      <q-space />
-      <div class="justify-center row q-gutter-md items-center">
-        <!-- tab รูปแบบแสดงวันหยุด ปฏิทินกับรายการ -->
-        <q-tabs
-          v-model="currentTab"
-          indicator-color="transparent"
-          align="left"
-          active-color="activetab"
-          class="text-nativetab"
-          inline-label
-          dense
-        >
-          <q-btn
-            name="calendar"
-            round
-            flat
-            icon="mdi-calendar-month"
-            @click="currentTab = 'calendar'"
-            :color="currentTab == 'calendar' ? 'primary' : ''"
-            class="q-mr-sm"
-          >
-            <q-tooltip>ปฏิทิน</q-tooltip>
-          </q-btn>
-          <q-separator vertical inset />
-          <q-btn
-            name="list"
-            round
-            flat
-            icon="mdi-format-list-bulleted"
-            @click="currentTab = 'list'"
-            :color="currentTab == 'list' ? 'primary' : ''"
-            class="q-ml-sm"
-          >
-            <q-tooltip>รายการ</q-tooltip>
-          </q-btn>
-        </q-tabs>
-      </div>
-    </div>
-    <div>
-      <!-- component ปฏิทินวันหยุด -->
-      <subCalendarComponent
-        v-if="currentTab === 'calendar'"
-        :dateYear="dateMonth.year"
-        :dateMonth="dateMonth.month"
-        :refreshData="refreshData"
-        :fetchDataSummaryCalendar="fetchDataSummaryCalendar"
-      />
-      <!-- component รายการวันหยุด -->
-      <subCalendarListComponent
-        v-if="currentTab === 'list'"
-        :dateYear="dateYear"
-        :refreshData="refreshData"
-        :fetchDataSummaryCalendar="fetchDataSummaryCalendar"
-      />
-    </div>
-  </div>
-  <!-- modal เพิ่มวันหยุด -->
-  <q-dialog v-model="modalAdd" persistent>
-    <q-card style="min-width: 550px">
-      <q-form ref="formDate" @submit.prevent.stop="onSubmit">
-        <q-card-section class="row items-center q-py-sm">
-          <div class="text-bold">เพิ่มวันหยุด</div>
-          <q-space />
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            v-close-popup
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-card-section>
-        <q-separator />
-        <q-card-section class="q-p-md row q-gutter-y-sm">
-          <datepicker
-            v-model="dateAdd"
-            :locale="'th'"
-            autoApply
-            range
-            :enableTimePicker="false"
-            week-start="0"
-          >
-            <template #year="{ year }">
-              {{ year + 543 }}
-            </template>
-            <template #year-overlay-value="{ value }">
-              {{ parseInt(value + 543) }}
-            </template>
-            <template #trigger>
-              <q-input
-                :model-value="dateThaiRange(dateAdd)"
-                outlined
-                label="เลือกวันที่"
-                dense
-                class="full-width datepicker"
-              >
-                <template v-slot:prepend>
-                  <q-icon
-                    name="event"
-                    class="cursor-pointer"
-                    style="color: var(--q-primary)"
-                  >
-                  </q-icon>
-                </template>
-              </q-input>
-            </template>
-          </datepicker>
-          <q-input
-            dense
-            label="คำอธิบาย"
-            outlined
-            class="full-width datepicker q-pb-none"
-            v-model="name"
-            type="textarea"
-            :rules="[(val) => (val && val.length > 0) || '']"
-          />
-          <q-option-group
-            dense
-            v-model="category"
-            :options="categoryOptions"
-            color="primary"
-            inline
-          />
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right" class="text-primary">
-          <q-btn unelevated label="บันทึก" color="public" type="submit">
-            <!-- icon="mdi-content-save-outline"
-            <q-tooltip>บันทึก</q-tooltip> -->
-          </q-btn>
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <!-- modal คัดลอกวันหยุด -->
-  <q-dialog v-model="modalCopy" persistent>
-    <q-card style="min-width: 500px">
-      <q-form @submit.prevent.stop="onSubmitCopy">
-        <q-card-section class="row items-center q-py-sm">
-          <div class="text-bold">คัดลอกวันหยุดปีก่อนหน้า</div>
-          <q-space />
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            v-close-popup
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-card-section>
-        <q-separator />
-        <q-card-section class="q-p-sm">
-          <div class="row col-12 q-col-gutter-sm">
-            <datepicker
-              v-model="dateYearStart"
-              :locale="'th'"
-              autoApply
-              year-picker
-              :enableTimePicker="false"
-            >
-              <template #year="{ year }">{{ year + 543 }}</template>
-              <template #year-overlay-value="{ value }">{{
-                parseInt(value + 543)
-              }}</template>
-              <template #trigger>
-                <q-input
-                  :model-value="dateYearStart + 543"
-                  dense
-                  outlined
-                  class="q-pb-sm"
-                  label="ปีที่คัดลอกวันหยุด"
-                >
-                  <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
-                    </q-icon>
-                  </template>
-                </q-input>
-              </template>
-            </datepicker>
-            <datepicker
-              v-model="dateYearEnd"
-              :locale="'th'"
-              autoApply
-              year-picker
-              :enableTimePicker="false"
-              :min-date="minDate"
-            >
-              <template #year="{ year }">{{ year + 543 }}</template>
-              <template #year-overlay-value="{ value }">{{
-                parseInt(value + 543)
-              }}</template>
-              <template #trigger>
-                <q-input
-                  :model-value="dateYearEnd + 543"
-                  dense
-                  outlined
-                  label="ปีที่ลงวันหยุดคัดลอก"
-                  class="q-pb-sm"
-                >
-                  <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
-                    </q-icon>
-                  </template>
-                </q-input>
-              </template>
-            </datepicker>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right" class="text-primary">
-          <q-btn unelevated label="บันทึก" color="public" type="submit">
-            <!-- icon="mdi-content-save-outline"
-            <q-tooltip>บันทึก</q-tooltip> -->
-          </q-btn>
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<script setup lang="ts">
-import { ref, watch, onMounted } from "vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import { useQuasar } from "quasar";
-
-import type {
-  DataDateMonthObject,
-  DataDateAddObject,
-} from "@/modules/01_metadataNew/interface/index/Calendar";
-
-import subCalendarComponent from "@/modules/01_metadataNew/components/calendar/Calendar.vue";
-import subCalendarListComponent from "@/modules/01_metadataNew/components/calendar/CalendarList.vue";
-
-import { useCounterMixin } from "@/stores/mixin";
-
-const props = defineProps({
-  dateYear: Number, //ปีที่ส่งไป parent สรุปวันหยุด
-  fetchDataSummaryCalendar: {
-    //ฟังก์ชันอัพเดทสรุปวันหยุด
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-
-const $q = useQuasar(); //ใช้ noti quasar
-const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const {
-  success,
-  dateToISO,
-  monthYear2Thai,
-  date2Thai,
-  messageError,
-  dialogMessage,
-  showLoader,
-  hideLoader,
-} = mixin;
-
-const currentTab = ref<string>("calendar"); //ระบุ tab ใช้งานอยู่ calendar=รายการ list=รายการ
-const modalAdd = ref<boolean>(false); //แสดง modal add calendar
-const modalCopy = ref<boolean>(false); //แสดง modal copy calendar
-const dateMonth = ref<DataDateMonthObject>({
-  month: new Date().getMonth(),
-  year: new Date().getFullYear(),
-}); //ค่าเดือนที่เลือก tab ปฏิทิน
-const dateYear = ref<number>(new Date().getFullYear()); //ค่าปีที่เลือก tab รายการ
-const dateYearStart = ref<number>(new Date().getFullYear()); //ค่าปีที่ copy วันหยุด
-const dateYearEnd = ref<number>(new Date().getFullYear()); //ค่าปีที่จะลงวันหยุด copy
-const dateAdd = ref<[Date, Date]>([new Date(), new Date()]); //วันที่ ที่เพิ่มเป็นวันหยุด
-const formDate = ref<any>(); //ref เช็ค validate เพิ่มวันหยุด
-const name = ref<string>(""); //ชื่อวันหยุด
-const isSpecial = ref<boolean>(true); //เช็ควันหยุดพิเศษ
-
-const category = ref<string>("all");
-const categoryOptions = ref<any>([
-  {
-    label: "ทั้งหมด",
-    value: "all",
-  },
-  {
-    label: "ทำงาน 5 วัน",
-    value: "normal",
-  },
-  {
-    label: "ทำงาน 6 วัน",
-    value: "6days",
-  },
-]);
-const minDate = ref<Date>();
-const refreshData = ref<boolean>(false); //ส่งค่าให้ component refresh data วันหยุด
-const emit = defineEmits(["update:dateYear"]);
-
-/**
- * มีการเลือก datepicker ให้แปลงค่าเป็น text ที่แสดง
- */
-watch(dateYearStart, () => {
-  dateYearEnd.value = dateYearStart.value + 1;
-  minDate.value = new Date(`${dateYearStart.value + 1}-01-01`);
-});
-
-/**
- * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้
- */
-onMounted(async () => {
-  dateYearEnd.value = dateYearStart.value + 1;
-  minDate.value = new Date(`${dateYearStart.value + 1}-01-01`);
-});
-
-/**
- * ค่าเดือนปีที่ถูกเลือกใน component ปฏิทินจะให้อัพเดทค่าสรุปวันหยุดรวม
- * @param e เลือกเดือนปี tab ปฏิทิน
- */
-const updateMonth = async (e: DataDateMonthObject) => {
-  if (e != null) {
-    dateYear.value = e.year;
-    emit("update:dateYear", e.year);
-    await props.fetchDataSummaryCalendar();
-  }
-};
-
-/**
- * ค่าปีที่ถูกเลือกใน component รายการจะให้อัพเดทค่าสรุปวันหยุดรวม
- * @param e เลือกปี tab รายการ
- */
-const updateYear = async (e: number) => {
-  dateMonth.value = { month: 0, year: e };
-  emit("update:dateYear", dateYear.value);
-  await props.fetchDataSummaryCalendar();
-};
-
-/**
- * ฟังก์ชันปุ่มเพิ่มวันหยุดแบบเลือกวันได้
- */
-const addCalendar = () => {
-  dateAdd.value = [new Date(), new Date()];
-  name.value = "";
-  category.value = "all";
-  isSpecial.value = true;
-  modalAdd.value = true;
-};
-
-/**
- * ฟังก์ชัน copy วันหยุดจากปีนิงไปอีกปี
- */
-const copyCalendar = () => {
-  modalCopy.value = true;
-  dateYearStart.value = new Date().getFullYear();
-  dateYearEnd.value = new Date().getFullYear() + 1;
-};
-
-/**
- * ฟังก์ชันปุ่มบันทึกเพิ่มวันหยุด
- */
-const onSubmit = async () => {
-  await formDate.value.validate().then(async (result: boolean) => {
-    if (result) {
-      const dataAdd = ref<DataDateAddObject[]>([]);
-      let i = 0;
-      const dateStart = ref<Date>(dateAdd.value[0]);
-      do {
-        i = i + 1;
-        dataAdd.value.push({
-          year: new Date(dateStart.value).getFullYear(),
-          holidayDate: dateToISO(new Date(dateStart.value)),
-          name: name.value,
-          isSpecial: true,
-        });
-        dateStart.value = new Date(
-          new Date(dateStart.value).setDate(
-            new Date(dateStart.value).getDate() + 1
-          )
-        );
-      } while (new Date(dateStart.value) <= new Date(dateAdd.value[1]));
-      showLoader();
-      await http
-        .post(config.API.listHolidayHistoryAdd(category.value), dataAdd.value)
-        .then(() => {
-          modalAdd.value = false;
-          success($q, "เพิ่มวันหยุดสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(() => {
-          refreshData.value = !refreshData.value;
-          hideLoader();
-        });
-    }
-  });
-  await props.fetchDataSummaryCalendar();
-};
-
-/**
- * ฟังก์ชันคัดลอกวันหยุด
- */
-const onSubmitCopy = async () => {
-  if (dateYearStart.value >= dateYearEnd.value) {
-    dialogMessage(
-      $q,
-      "ไม่สามารถคัดลอกวันหยุดได้",
-      "ปีที่เริ่มต้นคัดลอกต้องมากกว่าปีที่จะลงวันคัดลอก",
-      "warning",
-      undefined,
-      "orange",
-      undefined,
-      undefined,
-      true
-    );
-    return;
-  }
-  showLoader();
-  await http
-    .post(config.API.listHolidayCopy, {
-      fromYear: dateYearStart.value,
-      toYear: dateYearEnd.value,
-    })
-    .then(() => {
-      modalCopy.value = false;
-      success($q, "คัดลอกวันหยุดสำเร็จ");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      refreshData.value = !refreshData.value;
-      await props.fetchDataSummaryCalendar();
-    });
-};
-
-/**
- * แปลง ปีและเดือนเป็นภาษาไทย
- * @param val datepicker แบบเลือกปีและเดือน
- */
-const monthYearThai = (val: DataDateMonthObject) => {
-  if (val == null) return "";
-  else return monthYear2Thai(val.month, val.year);
-};
-
-/**
- * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง
- * @param val ช่วงวันที่
- */
-const dateThaiRange = (val: [Date, Date] | []) => {
-  if (val.length === 0) {
-  } else if (date2Thai(val[0]) === date2Thai(val[1])) {
-    return `${date2Thai(val[0])}`;
-  } else {
-    return `${date2Thai(val[0])} - ${date2Thai(val[1])} `;
-  }
-};
-</script>
-
-<style scoped>
-.my-menu-link {
-  color: black;
-  background: #d0d0d0;
-}
-
-.my-list-link {
-  color: black;
-  border-radius: 5px;
-  background: #f4f4f4;
-}
-
-.my-list {
-  padding: 10px 10px;
-}
-
-.my-card {
-  width: 100%;
-  max-width: 160px;
-}
-
-.sub-card {
-  height: 100%;
-  max-height: 265px;
-}
-
-.cardNum {
-  border-radius: 5px;
-}
-
-.fc-direction-ltr .fc-daygrid-event.fc-event-end,
-.fc-direction-rtl .fc-daygrid-event.fc-event-start {
-  padding-left: 5px;
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue b/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue
deleted file mode 100644
index 3d4502326..000000000
--- a/src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-import { useRouter } from "vue-router";
-import InsigniaList from "@/modules/01_metadataNew/components/insignia/InsigniaList.vue";
-
-const router = useRouter();
-
-const nameId = ref<string>("");
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
-    รายการข้อมูลเครื่องราชอิสริยาภรณ์ {{ nameId }}
-  </div>
-
-  <q-card flat bordered>
-    <InsigniaList v-model:insigniaTypeName="nameId" />
-  </q-card>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaList.vue b/src/modules/01_metadataNew/components/insignia/InsigniaList.vue
deleted file mode 100644
index ad974494c..000000000
--- a/src/modules/01_metadataNew/components/insignia/InsigniaList.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRoute } from "vue-router";
-import { useInsigniaDataStore } from "@/modules/01_metadataNew/stores/InsigniaStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import TableDraggable from "@/modules/01_metadataNew/components/insignia/TableDraggable.vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-const store = useInsigniaDataStore();
-const mixin = useCounterMixin();
-
-const insigniaTypeName = defineModel<string>("insigniaTypeName", {
-  required: true,
-});
-
-const {
-  dialogRemove,
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-} = mixin;
-const $q = useQuasar();
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px; width:0px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "name",
-    align: "left",
-    label: "ชื่อเครื่องราชฯ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "shortName",
-    align: "left",
-    label: "ชื่อย่อ",
-    sortable: true,
-    field: "shortName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "insigniaType",
-    align: "left",
-    label: "ลำดับชั้นเครื่องราชฯ",
-    sortable: true,
-    field: "insigniaType",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "createdAt",
-    align: "center",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "lastUpdatedAt",
-    align: "center",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "isActive",
-    align: "left",
-    label: "สถานะ",
-    sortable: true,
-    field: "isActive",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "note",
-    align: "left",
-    label: "หมายเหตุ",
-    sortable: true,
-    field: "note",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-]);
-const route = useRoute();
-const id = ref<string>(route.params.id.toString());
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const isActive = ref<boolean>(false);
-const shortName = ref<string>("");
-const note = ref<string>("");
-const name = ref<string>("");
-const insigniaTypeId = ref<string>("");
-const nameRef = ref<any>(null);
-const shortNameRef = ref<any>(null);
-const dialogStatus = ref<string>("");
-const editId = ref<string>("");
-const visibleColumns = ref<string[]>([
-  "no",
-  "name",
-  "shortName",
-  "insigniaType",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-  "isActive",
-  "note",
-]);
-
-function closeDialog() {
-  dialog.value = false;
-  name.value = "";
-  isActive.value = false;
-  shortName.value = "";
-  note.value = "";
-}
-
-function validateForm() {
-  nameRef.value.validate();
-  shortNameRef.value.validate();
-  onSubmit();
-}
-
-async function fetchData(id: string) {
-  showLoader();
-  await http
-    .get(config.API.insigniaTypeNewIdOrg(id))
-    .then(async (res) => {
-      insigniaTypeId.value = res.data.result.name;
-      store.fetchData(res.data.result.insignias, res.data.result.name);
-      insigniaTypeName.value = res.data.result.name;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-onMounted(async () => {
-  await fetchData(id.value);
-});
-
-async function onSubmit() {
-  if (name.value.length > 0 && shortName.value.length > 0) {
-    dialogConfirm(
-      $q,
-      async () => {
-        dialogStatus.value === "create" ? addData() : editData(editId.value);
-        closeDialog();
-        name.value = "";
-        shortName.value = "";
-        isActive.value = false;
-        note.value = "";
-      },
-      "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
-    );
-  }
-}
-
-async function addData() {
-  await http
-    .post(config.API.insigniaOrg, {
-      name: name.value,
-      isActive: isActive.value,
-      shortName: shortName.value,
-      note: note.value == "" || note.value == null ? "" : note.value,
-      insigniaTypeId: id.value,
-    })
-    .then(() => {
-      fetchData(id.value);
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(idData: string) {
-  console.log(note.value);
-
-  await http
-    .put(config.API.insigniaNewIdOrg(idData), {
-      name: name.value,
-      isActive: isActive.value,
-      shortName: shortName.value,
-      note: note.value == "" || note.value == null ? "" : note.value,
-      insigniaTypeId: id.value,
-    })
-    .then(() => {
-      fetchData(id.value);
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(idData: string) {
-  await http
-    .delete(config.API.insigniaNewIdOrg(idData))
-    .then(() => {
-      fetchData(id.value);
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-import { defineEmits } from "vue";
-
-const emit = defineEmits(["nameType"]);
-const dialogOrder = ref<boolean>(false);
-</script>
-
-<template>
-  <div class="q-pa-md">
-    <q-toolbar style="padding: 0">
-      <q-btn
-        flat
-        round
-        color="primary"
-        icon="add"
-        @click.stop="
-          () => {
-            dialogStatus = 'create';
-            dialog = true;
-          }
-        "
-      >
-        <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-      </q-btn>
-      <q-btn
-        v-if="store.row.length > 0"
-        flat
-        round
-        color="blue-6"
-        icon="mdi-sort"
-        @click.stop="() => (dialogOrder = true)"
-      >
-        <q-tooltip> จัดลำดับการแสดงผล </q-tooltip>
-      </q-btn>
-      <TableDraggable v-model:modal="dialogOrder" :fetchData="fetchData" />
-      <q-space />
-      <div class="row q-gutter-sm">
-        <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-        <q-select
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-        />
-      </div>
-    </q-toolbar>
-
-    <d-table
-      ref="table"
-      :columns="columns"
-      :rows="store.row"
-      :filter="filterKeyword"
-      row-key="name"
-      flat
-      bordered
-      :paging="true"
-      dense
-      class="custom-header-table"
-      :visible-columns="visibleColumns"
-    >
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            <span class="text-weight-bold">{{ col.label }}</span>
-          </q-th>
-          <q-th auto-width />
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props" class="cursor-pointer">
-          <q-td v-for="(col, index) in props.cols" :key="col.id">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else-if="col.name == 'isActive'">
-              <q-icon
-                v-if="col.value == false"
-                name="mdi-close"
-                color="red"
-                class="text-h5"
-              />
-              <q-icon
-                v-else
-                name="mdi-check"
-                color="positive"
-                class="text-h5"
-              />
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              color="edit"
-              flat
-              dense
-              round
-              class="q-mr-xs"
-              size="12px"
-              icon="edit"
-              clickable
-              @click.stop="
-                () => {
-                  dialogStatus = 'edit';
-                  dialog = true;
-                  editId = props.row.id;
-                  name = props.row.name;
-                  shortName = props.row.shortName;
-                  note = props.row.note;
-                  isActive = props.row.isActive;
-                }
-              "
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="red"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-delete"
-              clickable
-              @click.stop="
-                dialogRemove($q, async () => await deleteData(props.row.id))
-              "
-              v-close-popup
-            >
-              <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
-          </q-td>
-        </q-tr>
-      </template>
-    </d-table>
-  </div>
-
-  <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="min-width: 350px">
-      <form @submit.prevent="validateForm">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            :tittle="dialogStatus == 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-            :close="closeDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="q-pa-none">
-          <div class="col-12 q-ma-md">
-            <q-input
-              outlined
-              :model-value="insigniaTypeId"
-              label="ลำดับชั้นเครื่องราชฯ"
-              dense
-              lazy-rules
-              borderless
-              hide-bottom-space
-              readonly
-              class="inputgreen"
-            />
-          </div>
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="nameRef"
-              outlined
-              v-model="name"
-              label="ชื่อเครื่องราชฯ"
-              dense
-              lazy-rules
-              borderless
-              :rules="[
-                (val) => val.length > 0 || 'กรุณากรอกลำดับชั้นเครื่องราชฯ',
-              ]"
-              hide-bottom-space
-              class="inputgreen"
-            />
-          </div>
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="shortNameRef"
-              outlined
-              v-model="shortName"
-              label="ชื่อย่อ"
-              dense
-              lazy-rules
-              borderless
-              :rules="[
-                (val) => val.length > 0 || 'กรุณากรอกลำดับชั้นเครื่องราชฯ',
-              ]"
-              hide-bottom-space
-              class="inputgreen"
-            />
-          </div>
-          <div class="col-12 q-ma-md">
-            <q-input
-              outlined
-              v-model="note"
-              label="หมายเหตุ"
-              dense
-              type="textarea"
-              borderless
-              hide-bottom-space
-              class="inputgreen"
-            />
-          </div>
-          <div
-            class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
-          >
-            <div class="row items-center q-my-sm justify-between">
-              <p class="q-ma-none">สถานะการใช้งาน</p>
-              <label class="toggle-control">
-                <input type="checkbox" dense v-model="isActive" @change="" />
-                <span class="control"></span>
-              </label>
-            </div>
-          </div>
-        </q-card-section>
-
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped lang="scss">
-.border_custom {
-  border-radius: 6px !important;
-  border: 1px solid #e1e1e1;
-}
-$toggle-background-color-on: #06884d;
-$toggle-background-color-off: darkgray;
-$toggle-control-color: white;
-$toggle-width: 40px;
-$toggle-height: 25px;
-$toggle-gutter: 3px;
-$toggle-radius: 50%;
-$toggle-control-speed: 0.15s;
-$toggle-control-ease: ease-in;
-
-// These are our computed variables
-// change at your own risk.
-$toggle-radius: $toggle-height / 2;
-$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
-
-.toggle-control {
-  display: block;
-  position: relative;
-  padding-left: $toggle-width;
-  margin-bottom: 12px;
-  cursor: pointer;
-  font-size: 22px;
-  user-select: none;
-
-  input {
-    position: absolute;
-    opacity: 0;
-    cursor: pointer;
-    height: 0;
-    width: 0;
-  }
-
-  input:checked ~ .control {
-    background-color: $toggle-background-color-on;
-
-    &:after {
-      left: $toggle-width - $toggle-control-size - $toggle-gutter;
-    }
-  }
-
-  .control {
-    position: absolute;
-    top: -7px;
-    left: -15px;
-    height: $toggle-height;
-    width: $toggle-width;
-    border-radius: $toggle-radius;
-    background-color: $toggle-background-color-off;
-    transition: background-color $toggle-control-speed $toggle-control-ease;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: $toggle-gutter;
-      top: $toggle-gutter;
-      width: $toggle-control-size;
-      height: $toggle-control-size;
-      border-radius: $toggle-radius;
-      background: $toggle-control-color;
-      transition: left $toggle-control-speed $toggle-control-ease;
-    }
-  }
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaType.vue b/src/modules/01_metadataNew/components/insignia/InsigniaType.vue
deleted file mode 100644
index 22e786f1e..000000000
--- a/src/modules/01_metadataNew/components/insignia/InsigniaType.vue
+++ /dev/null
@@ -1,442 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { useInsigniaDataStore } from "@/modules/01_metadataNew/stores/InsigniaStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = useInsigniaDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const {
-  dialogRemove,
-  dialogConfirm,
-  success,
-  messageError,
-  showLoader,
-  hideLoader,
-} = mixin;
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "name",
-    align: "left",
-    label: "ลำดับชั้นเครื่องราชฯ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "center",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "center",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "isActive",
-    align: "left",
-    label: "สถานะ",
-    sortable: true,
-    field: "isActive",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-]);
-
-const $q = useQuasar();
-
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const isActive = ref<boolean>(false);
-const name = ref<string>("");
-const nameRef = ref<any>(null);
-const dialogStatus = ref<string>("");
-const visibleColumns = ref<string[]>([
-  "name",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-  "isActive",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.insigniaTypeOrg)
-    .then(async (res) => {
-      store.fetchData(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-
-function closeDialog() {
-  dialog.value = false;
-}
-
-function onclickDetail(id: string) {
-  router.push(`/master-data/insignia/detail/${id}`);
-}
-
-async function addData() {
-  await http
-    .post(config.API.insigniaTypeOrg, {
-      name: name.value,
-      isActive: isActive.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.insigniaTypeNewIdOrg(id), {
-      name: name.value,
-      isActive: isActive.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.insigniaTypeNewIdOrg(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-function validateForm() {
-  nameRef.value.validate();
-  onSubmit();
-}
-
-async function onSubmit() {
-  if (name.value.length > 0) {
-    dialogConfirm(
-      $q,
-      async () => {
-        dialogStatus.value === "create" ? addData() : editData(editId.value);
-        closeDialog();
-        name.value = "";
-        isActive.value = false;
-      },
-      "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
-    );
-  }
-}
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div v-if="col.name == 'isActive'">
-            <q-icon
-              v-if="col.value == false"
-              name="mdi-close"
-              color="red"
-              class="text-h5"
-            />
-            <q-icon v-else name="mdi-check" color="positive" class="text-h5" />
-          </div>
-          <div v-else>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                editId = props.row.id;
-                name = props.row.name;
-                isActive = props.row.isActive;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="min-width: 350px">
-      <form @submit.prevent="validateForm">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            :tittle="dialogStatus === 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-            :close="closeDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="q-pa-none">
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="nameRef"
-              outlined
-              v-model="name"
-              label="ลำดับชั้นเครื่องราชฯ"
-              dense
-              lazy-rules
-              borderless
-              :rules="[
-                (val) => val.length > 0 || 'กรุณากรอกลำดับชั้นเครื่องราชฯ',
-              ]"
-              hide-bottom-space
-            />
-          </div>
-          <div
-            class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
-          >
-            <div class="row items-center q-my-sm justify-between">
-              <p class="q-ma-none">สถานะการใช้งาน</p>
-              <label class="toggle-control">
-                <input type="checkbox" dense v-model="isActive" @change="" />
-                <span class="control"></span>
-              </label>
-            </div>
-          </div>
-        </q-card-section>
-
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped lang="scss">
-.border_custom {
-  border-radius: 6px !important;
-  border: 1px solid #e1e1e1;
-}
-$toggle-background-color-on: #06884d;
-$toggle-background-color-off: darkgray;
-$toggle-control-color: white;
-$toggle-width: 40px;
-$toggle-height: 25px;
-$toggle-gutter: 3px;
-$toggle-radius: 50%;
-$toggle-control-speed: 0.15s;
-$toggle-control-ease: ease-in;
-
-// These are our computed variables
-// change at your own risk.
-$toggle-radius: $toggle-height / 2;
-$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
-
-.toggle-control {
-  display: block;
-  position: relative;
-  padding-left: $toggle-width;
-  margin-bottom: 12px;
-  cursor: pointer;
-  font-size: 22px;
-  user-select: none;
-
-  input {
-    position: absolute;
-    opacity: 0;
-    cursor: pointer;
-    height: 0;
-    width: 0;
-  }
-
-  input:checked ~ .control {
-    background-color: $toggle-background-color-on;
-
-    &:after {
-      left: $toggle-width - $toggle-control-size - $toggle-gutter;
-    }
-  }
-
-  .control {
-    position: absolute;
-    top: -7px;
-    left: -15px;
-    height: $toggle-height;
-    width: $toggle-width;
-    border-radius: $toggle-radius;
-    background-color: $toggle-background-color-off;
-    transition: background-color $toggle-control-speed $toggle-control-ease;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: $toggle-gutter;
-      top: $toggle-gutter;
-      width: $toggle-control-size;
-      height: $toggle-control-size;
-      border-radius: $toggle-radius;
-      background: $toggle-control-color;
-      transition: left $toggle-control-speed $toggle-control-ease;
-    }
-  }
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/insignia/TableDraggable.vue b/src/modules/01_metadataNew/components/insignia/TableDraggable.vue
deleted file mode 100644
index 06173036d..000000000
--- a/src/modules/01_metadataNew/components/insignia/TableDraggable.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script setup lang="ts">
-import { ref, watch } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter, useRoute } from "vue-router";
-import { useInsigniaDataStore } from "@/modules/01_metadataNew/stores/InsigniaStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import DialogHeader from "@/components/DialogHeader.vue";
-
-import http from "@/plugins/http";
-import config from "@/app.config";
-const store = useInsigniaDataStore();
-const mixin = useCounterMixin();
-const { dialogRemove, dialogConfirm, showLoader, hideLoader, messageError } =
-  mixin;
-const $q = useQuasar();
-const route = useRoute();
-const modal = defineModel("modal", { type: Boolean });
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "name",
-    required: true,
-    label: "ชื่อเครื่องราชฯ",
-    align: "left",
-    field: "name",
-    sortable: true,
-  },
-  {
-    name: "shortName",
-    align: "center",
-    label: "ชื่อย่อ",
-    field: "shortName",
-  },
-  {
-    name: "insigniaType",
-    align: "left",
-    label: "ลำดับชั้นเครื่องราชฯ",
-    field: "insigniaType",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sortable: true,
-  },
-]);
-const id = ref<string>(route.params.id.toString());
-
-const props = defineProps({
-  fetchData: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-
-function onDrop(from: any, to: any) {
-  onDropRow(from, to);
-}
-
-const rows = ref<any[]>([]);
-function onDropRow(from: any, to: any) {
-  rows.value.splice(to, 0, rows.value.splice(from, 1)[0]);
-}
-
-async function save() {
-  const dataPost = await rows.value.map((obj: any) => {
-    return obj.id;
-  });
-  modal.value = false;
-
-  showLoader();
-  await http
-    .put(config.API.insigniaSortOrg(id.value), { id: dataPost })
-    .then(() => {
-      store.row = rows.value;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-      // props.fetchData(id.value);
-    });
-}
-
-async function onSubmit() {
-  dialogConfirm($q, async () => {
-    save();
-  });
-}
-
-watch(modal, () => {
-  if (modal.value === true) {
-    // rows.value = store.row;
-    rows.value = [...store.row]; // ดึงมาใช้ sort แล้วใน store ไม่เปลี่ยน
-  }
-});
-</script>
-
-<template>
-  <q-dialog v-model="modal" class="dialog" persistent>
-    <q-card style="min-width: 50vw" class="bg-grey-11">
-      <form @submit.prevent="onSubmit">
-        <DialogHeader
-          tittle="จัดลำดับการแสดงผล"
-          :close="() => (modal = false)"
-        />
-        <q-separator />
-        <q-card-section class="q-pa-md bg-grey-1">
-          <q-table
-            v-draggable-table="{
-              options: {
-                mode: 'row',
-                onlyBody: true,
-                dragHandler: 'th,td',
-              },
-              onDrop,
-            }"
-            flat
-            bordered
-            :rows="rows"
-            :columns="columns"
-            :rows-per-page-options="[100]"
-            row-key="name"
-            hide-bottom
-            hide-pagination
-            hide-header
-          />
-          <!-- <q-table
-            v-draggable-table="{
-              options: {
-                mode: 'row',
-                onlyBody: true,
-                dragHandler: 'tr',
-              },
-              onDrop,
-            }"
-            ref="table"
-            :columns="columns"
-            :rows="rows"
-            row-key="name"
-            flat
-            bordered
-            hide-bottom
-          /> -->
-        </q-card-section>
-
-        <q-separator />
-        <q-card-actions align="right">
-          <q-btn
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            class="q-px-md"
-          >
-            <!-- icon="mdi-content-save-outline" -->
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
deleted file mode 100644
index 422dbdce0..000000000
--- a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-const TABLE_COLUMNS = [
-  {
-    name: "prefix",
-    align: "left",
-    label: "คำนำหน้าชื่อ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-const store = usePersonalDataStore();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const prefix = ref<string>("");
-const editId = ref<string>("");
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("คำนำหน้าชื่อ");
-const visibleColumns = ref<string[]>([
-  "prefix",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgPrefix)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgPrefix, {
-      name: prefix.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgPrefixId(id), {
-      name: prefix.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgPrefixId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="TABLE_COLUMNS"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="TABLE_COLUMNS"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          {{ col.value }}
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                prefix = props.row.name;
-                editId = props.row.id;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="prefix"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/02ListRank.vue b/src/modules/01_metadataNew/components/personal/02ListRank.vue
deleted file mode 100644
index 7c0d9c93b..000000000
--- a/src/modules/01_metadataNew/components/personal/02ListRank.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-const columns = [
-  {
-    name: "rank",
-    align: "left",
-    label: "ยศ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const store = usePersonalDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-
-const $q = useQuasar();
-
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const rank = ref<string>("");
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("ยศ");
-const editId = ref<string>("");
-const visibleColumns = ref<string[]>([
-  "rank",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgRank)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgRank, {
-      name: rank.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgRankId(id), {
-      name: rank.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgRankId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                rank = props.row.name;
-                editId = props.row.id;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="rank"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
deleted file mode 100644
index 132e27b7b..000000000
--- a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = usePersonalDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-const columns = [
-  {
-    name: "bloodGroup",
-    align: "left",
-    label: "กลุ่มเลือด",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const editId = ref<string>("");
-const bloodGroup = ref<string>("");
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("กลุ่มเลือด");
-const visibleColumns = ref<string[]>([
-  "bloodGroup",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgBloodGroup)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgBloodGroup, {
-      name: bloodGroup.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgBloodGroupId(id), {
-      name: bloodGroup.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgBloodGroupId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                bloodGroup = props.row.name;
-                editId = props.row.id;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="bloodGroup"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/04ListGender.vue b/src/modules/01_metadataNew/components/personal/04ListGender.vue
deleted file mode 100644
index 0a7338575..000000000
--- a/src/modules/01_metadataNew/components/personal/04ListGender.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = usePersonalDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-const columns = [
-  {
-    name: "gender",
-    align: "left",
-    label: "เพศ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const gender = ref<string>("");
-const editId = ref<string>("");
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("เพศ");
-const visibleColumns = ref<string[]>([
-  "gender",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgGender)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgGender, {
-      name: gender.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgGenderId(id), {
-      name: gender.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgGenderId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                gender = props.row.name;
-                editId = props.row.id;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="gender"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/05ListReligion.vue b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
deleted file mode 100644
index fb9fda0cd..000000000
--- a/src/modules/01_metadataNew/components/personal/05ListReligion.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = usePersonalDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-const columns = [
-  {
-    name: "religion",
-    align: "left",
-    label: "ศาสนา",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const religion = ref<string>("");
-const editId = ref<string>("");
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("ศาสนา");
-const visibleColumns = ref<string[]>([
-  "religion",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgReligion)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgReligion, {
-      name: religion.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgReligionId(id), {
-      name: religion.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgReligionId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                religion = props.row.name;
-                editId = props.row.id;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="religion"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
deleted file mode 100644
index 694099997..000000000
--- a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = usePersonalDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-const columns = [
-  {
-    name: "relationship",
-    align: "left",
-    label: "สถานภาพ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const relationship = ref<string>("");
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("สถานภาพ");
-const visibleColumns = ref<string[]>([
-  "relationship",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-const editId = ref<string>("");
-const data = [
-  {
-    id: "1",
-    name: "เคยสมรสแต่ไม่ทราบสถานภาพสมรส",
-    createdAt: new Date(),
-    lastUpdatedAt: new Date(),
-    lastUpdateFullName: "สาวิตรี ศรีสมัย",
-  },
-  {
-    id: "2",
-    name: "สมรส",
-    createdAt: new Date(),
-    lastUpdatedAt: new Date(),
-    lastUpdateFullName: "System Administrator",
-  },
-  {
-    id: "3",
-    name: "แยกกันอยู่",
-    createdAt: new Date(),
-    lastUpdatedAt: new Date(),
-    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-  },
-  {
-    id: "4",
-    name: "โสด",
-    createdAt: new Date(),
-    lastUpdatedAt: new Date(),
-    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-  },
-];
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgRelationship)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgRelationship, {
-      name: relationship.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-async function editData(id: string) {
-  await http
-    .put(config.API.orgRelationshipId(id), {
-      name: relationship.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgRelationshipId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                relationship = props.row.name;
-                editId = props.row.id;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="relationship"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
deleted file mode 100644
index 8016e7c20..000000000
--- a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = usePersonalDataStore();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-const columns = [
-  {
-    name: "name",
-    align: "left",
-    label: "ชื่อ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "rank",
-    align: "left",
-    label: "ลำดับ",
-    sortable: true,
-    field: "rank",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const educationLevel = ref<string>("");
-const educationRank = ref<number>();
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("ระดับการศึกษา");
-const visibleColumns = ref<string[]>([
-  "name",
-  "rank",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgEducationLevel)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgEducationLevel, {
-      name: educationLevel.value,
-      rank: educationRank.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgEducationLevelId(id), {
-      name: educationLevel.value,
-      rank: educationRank.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgEducationLevelId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-          educationLevel = '';
-          educationRank = undefined;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                editId = props.row.id;
-                educationLevel = props.row.name;
-                educationRank = props.row.rank;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:educationRank="educationRank"
-    v-model:dialog="dialog"
-    v-model:data="educationLevel"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/08ListProvince.vue b/src/modules/01_metadataNew/components/personal/08ListProvince.vue
deleted file mode 100644
index cf57e4370..000000000
--- a/src/modules/01_metadataNew/components/personal/08ListProvince.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const router = useRouter();
-const store = usePersonalDataStore();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
-const columns = [
-  {
-    name: "name",
-    align: "left",
-    label: "จังหวัด",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const province = ref<string>("");
-
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("จังหวัด");
-const visibleColumns = ref<string[]>([
-  "name",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgProvince)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgProvince, {
-      name: province.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgProvince + `/${id}`, {
-      name: province.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgProvince + `/${id}`)
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-function nextPage(id: string) {
-  router.push(`/master-data/personal/district/${id}`);
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-          province = '';
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
-        <q-td
-          v-for="col in props.cols"
-          :key="col.id"
-          @click="nextPage(props.row.id)"
-        >
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                editId = props.row.id;
-                province = props.row.name;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="province"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/DialogForm.vue b/src/modules/01_metadataNew/components/personal/DialogForm.vue
deleted file mode 100644
index b76e2e488..000000000
--- a/src/modules/01_metadataNew/components/personal/DialogForm.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-import { useCounterMixin } from "@/stores/mixin";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { QInput, useQuasar } from "quasar";
-
-const $q = useQuasar();
-const mixin = useCounterMixin();
-const { dialogConfirm } = mixin;
-
-const dataRef = ref<QInput | null>(null);
-const zipCodeRef = ref<QInput | null>(null);
-const educationRankRef = ref<QInput | null>(null);
-const data = defineModel<string>("data", {
-  required: true,
-});
-const personalName = defineModel<string>("personalName");
-const dialogStatus = defineModel<string>("dialogStatus");
-const editId = defineModel<string>("editId");
-const dialog = defineModel<boolean>("dialog");
-const educationRank = defineModel<number>("educationRank");
-const zipCode = defineModel<string>("zipCode");
-const props = defineProps({
-  fetchData: {
-    type: Function,
-  },
-  addData: {
-    type: Function,
-    default: () => {},
-  },
-  editData: {
-    type: Function,
-    default: () => {},
-  },
-});
-
-function closeDialog() {
-  dialog.value = false;
-}
-
-function validateForm() {
-  dataRef.value?.validate();
-  zipCodeRef.value?.validate();
-  educationRankRef.value?.validate();
-  onSubmit();
-}
-
-async function onSubmit() {
-  if (data.value.length > 0) {
-    dialogConfirm(
-      $q,
-      async () => {
-        dialogStatus.value === "create"
-          ? props.addData()
-          : props.editData(editId.value);
-        closeDialog();
-        data.value = "";
-        educationRank.value = undefined;
-      },
-      "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
-    );
-  }
-}
-</script>
-
-<template>
-  <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="min-width: 350px">
-      <form @submit.prevent="validateForm">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            :tittle="dialogStatus == 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-            :close="closeDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="q-pa-none">
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="dataRef"
-              outlined
-              v-model="data"
-              :label="personalName"
-              dense
-              class="inputgreen"
-              lazy-rules
-              borderless
-              :rules="[(val) => val.length > 0 || 'กรุณากรอก' + personalName]"
-              hide-bottom-space
-            />
-          </div>
-        </q-card-section>
-        <q-card-section
-          class="q-pa-none"
-          v-if="personalName === 'ระดับการศึกษา'"
-        >
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="educationRankRef"
-              outlined
-              v-model="educationRank"
-              label="ลำดับ"
-              dense
-              type="number"
-              lazy-rules
-              borderless
-              min="1"
-              :rules="[(val) => val != undefined || 'กรุณากรอกลำดับ']"
-              hide-bottom-space
-            />
-          </div>
-        </q-card-section>
-        <q-card-section class="q-pa-none" v-if="personalName === 'แขวง/ตำบล'">
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="zipCodeRef"
-              outlined
-              v-model="zipCode"
-              label="รหัสไปรษณีย์"
-              dense
-              class="inputgreen"
-              lazy-rules
-              borderless
-              :rules="[(val) => val.length > 0 || 'กรุณากรอกรหัสไปรษณีย์']"
-              hide-bottom-space
-              mask="#####"
-            />
-          </div>
-        </q-card-section>
-        <q-separator color="grey-4" />
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/province/01_District.vue b/src/modules/01_metadataNew/components/personal/province/01_District.vue
deleted file mode 100644
index 7ee24b532..000000000
--- a/src/modules/01_metadataNew/components/personal/province/01_District.vue
+++ /dev/null
@@ -1,307 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter,useRoute } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import type{ FormDistrict } from '@/modules/01_metadataNew/interface/response/personal/personal'
-
-const router = useRouter();
-const route = useRoute();
-const id = ref<string>(route.params.id as string)
-const store = usePersonalDataStore();
-const mixin = useCounterMixin();
-const { dialogRemove, messageError, showLoader, hideLoader, success,date2Thai } = mixin;
-const columns = [
-  {
-    name: "name",
-    align: "left",
-    label: "เขต/อำเภอ",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const district = ref<string>("");
-const rows = ref<FormDistrict[]>([])
-
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("เขต/อำเภอ");
-const visibleColumns = ref<string[]>([
-  "name",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgProvince+`/${id.value}`)
-    .then(async (res) => {
-      const data = res.data.result.districts
-      const list = data.map((e:any) => ({
-      ...e,
-      createdAt: e.createdAt ? date2Thai(e.createdAt) : "",
-      lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "",
-    }));
-      rows.value = list
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgDistrict, {
-      name: district.value,
-      provinceId:id.value
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgDistrict + `/${id}`, {
-      name: district.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgDistrict + `/${id}`)
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-function nextPage(idSub: string) {
-  router.push(`/master-data/personal/sub-district/${id.value}/${idSub}`);
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
-    เขต/อำเภอ
-  </div>
-
-  
-  <q-card flat bordered>
-    <div class="q-pa-md">
-      <q-toolbar class="q-pa-none">
-        <q-btn
-          flat
-          round
-          color="primary"
-          icon="add"
-          @click.stop="
-            () => {
-              dialogStatus = 'create';
-              dialog = true;
-              district = '';
-            }
-          "
-        >
-          <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-        </q-btn>
-        <q-space />
-        <div class="row q-gutter-sm">
-          <q-input
-            outlined
-            dense
-            v-model="filterKeyword"
-            label="ค้นหา"
-          ></q-input>
-          <q-select
-            v-model="visibleColumns"
-            multiple
-            outlined
-            dense
-            options-dense
-            :display-value="$q.lang.table.columns"
-            emit-value
-            map-options
-            :options="columns"
-            option-value="name"
-            options-cover
-            style="min-width: 150px"
-          />
-        </div>
-      </q-toolbar>
-
-      <d-table
-        ref="table"
-        :columns="columns"
-        :rows="rows"
-        :filter="filterKeyword"
-        row-key="name"
-        flat
-        bordered
-        :paging="true"
-        dense
-        class="custom-header-table"
-        :visible-columns="visibleColumns"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-            <q-th auto-width />
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td
-              v-for="col in props.cols"
-              :key="col.id"
-              @click="nextPage(props.row.id)"
-            >
-              <div>
-                {{ col.value }}
-              </div>
-            </q-td>
-            <q-td auto-width>
-              <q-btn
-                color="edit"
-                flat
-                dense
-                round
-                class="q-mr-xs"
-                size="12px"
-                icon="edit"
-                clickable
-                @click.stop="
-                  () => {
-                    dialogStatus = 'edit';
-                    dialog = true;
-                    editId = props.row.id;
-                    district = props.row.name;
-                  }
-                "
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-              <q-btn
-                color="red"
-                flat
-                dense
-                round
-                size="12px"
-                icon="mdi-delete"
-                clickable
-                @click.stop="
-                  dialogRemove($q, async () => await deleteData(props.row.id))
-                "
-                v-close-popup
-              >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
-            </q-td>
-          </q-tr>
-        </template>
-      </d-table>
-    </div>
-  </q-card>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="district"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/personal/province/02_SubDistrict.vue b/src/modules/01_metadataNew/components/personal/province/02_SubDistrict.vue
deleted file mode 100644
index af8374df1..000000000
--- a/src/modules/01_metadataNew/components/personal/province/02_SubDistrict.vue
+++ /dev/null
@@ -1,324 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter, useRoute } from "vue-router";
-import { usePersonalDataStore } from "@/modules/01_metadataNew/stores/personalStore";
-import { useQuasar } from "quasar";
-import DialogForm from "@/modules/01_metadataNew/components/personal/DialogForm.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import type { FormSubDistrict } from "@/modules/01_metadataNew/interface/response/personal/personal";
-
-const rows = ref<FormSubDistrict[]>([]);
-const router = useRouter();
-const route = useRoute();
-const id = ref<string>(route.params.id as string);
-const idProvince = ref<string>(route.params.provinceId as string);
-const store = usePersonalDataStore();
-const mixin = useCounterMixin();
-const {
-  dialogRemove,
-  messageError,
-  showLoader,
-  hideLoader,
-  success,
-  date2Thai,
-} = mixin;
-const columns = [
-  {
-    name: "name",
-    align: "left",
-    label: "แขวง/ตำบล",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "zipCode",
-    align: "left",
-    label: "รหัสไปรษณีย์",
-    sortable: true,
-    field: "zipCode",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const subDistrict = ref<string>("");
-const zipCode = ref<string>("");
-
-const dialogStatus = ref<string>("");
-const personalName = ref<string>("แขวง/ตำบล");
-const visibleColumns = ref<string[]>([
-  "name",
-  "zipCode",
-  "createdAt",
-  "lastUpdatedAt",
-  "lastUpdateFullName",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgDistrict + `/${id.value}`)
-    .then(async (res) => {
-      const data = res.data.result.subDistricts;
-      const list = data.map((e: any) => ({
-        ...e,
-        createdAt: e.createdAt ? date2Thai(e.createdAt) : "",
-        lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "",
-      }));
-      rows.value = list;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgSubDistrict, {
-      name: subDistrict.value,
-      districtId: id.value,
-      zipCode: zipCode.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(idRow: string) {
-  await http
-    .put(config.API.orgSubDistrict + `/${idRow}`, {
-      name: subDistrict.value,
-      districtId: id.value,
-      zipCode: zipCode.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgSubDistrict + `/${id}`)
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
-    แขวง/ตำบล
-  </div>
-
-  <q-card flat bordered>
-    <div class="q-pa-md">
-      <q-toolbar class="q-pa-none">
-        <q-btn
-          flat
-          round
-          color="primary"
-          icon="add"
-          @click.stop="
-            () => {
-              dialogStatus = 'create';
-              dialog = true;
-              subDistrict = '';
-              zipCode = '';
-            }
-          "
-        >
-          <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-        </q-btn>
-        <q-space />
-        <div class="row q-gutter-sm">
-          <q-input
-            outlined
-            dense
-            v-model="filterKeyword"
-            label="ค้นหา"
-          ></q-input>
-          <q-select
-            v-model="visibleColumns"
-            multiple
-            outlined
-            dense
-            options-dense
-            :display-value="$q.lang.table.columns"
-            emit-value
-            map-options
-            :options="columns"
-            option-value="name"
-            options-cover
-            style="min-width: 150px"
-          />
-        </div>
-      </q-toolbar>
-
-      <d-table
-        ref="table"
-        :columns="columns"
-        :rows="rows"
-        :filter="filterKeyword"
-        row-key="name"
-        flat
-        bordered
-        :paging="true"
-        dense
-        class="custom-header-table"
-        :visible-columns="visibleColumns"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-            <q-th auto-width />
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="col in props.cols" :key="col.id">
-              <div>
-                {{ col.value }}
-              </div>
-            </q-td>
-            <q-td auto-width>
-              <q-btn
-                color="edit"
-                flat
-                dense
-                round
-                class="q-mr-xs"
-                size="12px"
-                icon="edit"
-                clickable
-                @click.stop="
-                  () => {
-                    dialogStatus = 'edit';
-                    dialog = true;
-                    editId = props.row.id;
-                    subDistrict = props.row.name;
-                    zipCode = props.row.zipCode;
-                  }
-                "
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-              <q-btn
-                color="red"
-                flat
-                dense
-                round
-                size="12px"
-                icon="mdi-delete"
-                clickable
-                @click.stop="
-                  dialogRemove($q, async () => await deleteData(props.row.id))
-                "
-                v-close-popup
-              >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
-            </q-td>
-          </q-tr>
-        </template>
-      </d-table>
-    </div>
-  </q-card>
-
-  <DialogForm
-    v-model:dialog="dialog"
-    v-model:data="subDistrict"
-    v-model:zipCode="zipCode"
-    v-model:personalName="personalName"
-    v-model:dialogStatus="dialogStatus"
-    v-model:editId="editId"
-    :addData="addData"
-    :fetch-data="fetchData"
-    :edit-data="editData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue b/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue
deleted file mode 100644
index b1e309a66..000000000
--- a/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue
+++ /dev/null
@@ -1,482 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive, onMounted } from "vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-/** importType*/
-import type { QTableProps } from "quasar";
-import type {
-  ObjectPosRef,
-  FormQuery,
-} from "@/modules/01_metadataNew/interface/index/positionEmployee";
-import type {
-  DataOption,
-  RowDetailPositions,
-} from "@/modules/01_metadataNew/interface/request/position/index";
-import type {
-  ResGroup,
-  ResLevel,
-  ResPossition,
-} from "@/modules/01_metadataNew/interface/response/positionEmployee/Main";
-
-/**importComponets*/
-import DialogHeader from "@/components/DialogHeader.vue";
-
-/**importStore*/
-import { useCounterMixin } from "@/stores/mixin";
-
-/**use*/
-const $q = useQuasar();
-const mixin = useCounterMixin();
-const {
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  dialogRemove,
-} = mixin;
-
-const rows = ref<ResPossition[]>([]);
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posDictName",
-    align: "left",
-    label: "ชื่อตำแหน่ง",
-    sortable: true,
-    field: "posDictName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "กลุ่มงาน",
-    sortable: true,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับชั้นงาน",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const visibleColumns = ref<string[]>([
-  "no",
-  "posDictName",
-  "posTypeName",
-  "posLevelName",
-]);
-
-const formQuery = reactive<FormQuery>({
-  type: "positionName",
-  keyword: "",
-});
-
-const optionFilter = ref<DataOption[]>([
-  { id: "positionName", name: "ชื่อตำแหน่ง" },
-  { id: "positionType", name: "กลุ่มงาน" },
-  { id: "positionLevel", name: "ระดับชั้นงาน" },
-]);
-
-const modalDialog = ref<boolean>(false);
-const isStatusEdit = ref<boolean>(false);
-const posId = ref<string>("");
-const formDataPos = reactive({
-  posName: "",
-  posTypeName: "",
-  posLevelName: "",
-});
-const posNameRef = ref<object | null>(null);
-const posTypeNameRef = ref<object | null>(null);
-const posLevelNameRef = ref<object | null>(null);
-const objectRef: ObjectPosRef = {
-  posName: posNameRef,
-  posTypeName: posTypeNameRef,
-  posLevelName: posLevelNameRef,
-};
-
-const posTypeMain = ref<ResGroup[]>([]);
-const posTypeOp = ref<DataOption[]>([]);
-const posLevelOp = ref<DataOption[]>([]);
-
-function deletePos(id: string) {
-  dialogRemove($q, () => {
-    showLoader();
-    http
-      .delete(config.API.orgEmployeePosById(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        fetchData();
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  });
-}
-
-async function onClickOpenDialog(typeEdit: boolean = false, data: any = []) {
-  modalDialog.value = true;
-  isStatusEdit.value = typeEdit;
-  await fetchType();
-  updatePosTypeName(data.posTypeId);
-  if (data) {
-    posId.value = data.id;
-    setTimeout(() => {
-      formDataPos.posName = data.posDictName;
-      formDataPos.posTypeName = data.posTypeId;
-      formDataPos.posLevelName = data.posLevelId;
-    }, 200);
-  }
-}
-
-async function fetchData(statusFetch: boolean = false) {
-  showLoader();
-  await http
-    .get(
-      config.API.orgEmployeePos +
-        `?keyword=${formQuery.keyword}&type=${
-          statusFetch ? "" : formQuery.type
-        }`
-    )
-    .then((res) => {
-      rows.value = res.data.result;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function fetchType() {
-  if (posTypeMain.value.length === 0) {
-    showLoader();
-    await http
-      .get(config.API.orgEmployeeType)
-      .then((res) => {
-        const data = res.data.result;
-        posTypeMain.value = data;
-        posTypeOp.value = data.map((e: ResGroup) => ({
-          id: e.id,
-          name: e.posTypeName,
-        }));
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  }
-}
-
-async function onClickSubmit() {
-  const hasError = [];
-  for (const key in objectRef) {
-    if (Object.prototype.hasOwnProperty.call(objectRef, key)) {
-      const property = objectRef[key];
-      if (property.value && typeof property.value.validate === "function") {
-        const isValid = property.value.validate();
-        hasError.push(isValid);
-      }
-    }
-  }
-  if (hasError.every((result) => result === true)) {
-    dialogConfirm($q, () => {
-      submit();
-    });
-  }
-}
-
-async function submit() {
-  const body = {
-    posDictName: formDataPos.posName,
-    posTypeId: formDataPos.posTypeName,
-    posLevelId: formDataPos.posLevelName,
-  };
-  showLoader();
-  try {
-    const url = !isStatusEdit.value
-      ? config.API.orgEmployeePos
-      : config.API.orgEmployeePosById(posId.value);
-    await http[!isStatusEdit.value ? "post" : "put"](url, body);
-    success($q, "บันทีกข้อมูลสำเร็จ");
-    fetchData();
-  } catch (err) {
-    messageError($q, err);
-  } finally {
-    hideLoader();
-    closeDialog();
-  }
-}
-
-function updatePosTypeName(id: string) {
-  const posLevel = posTypeMain.value.find((e: ResGroup) => e.id === id);
-  posLevelOp.value =
-    posLevel?.posLevels.map((e: ResLevel) => ({
-      id: e.id,
-      name: e.posLevelName.toString(),
-    })) ?? [];
-  formDataPos.posLevelName = "";
-}
-
-function closeDialog() {
-  modalDialog.value = false;
-  formDataPos.posName = "";
-  formDataPos.posTypeName = "";
-  formDataPos.posLevelName = "";
-}
-
-onMounted(() => {
-  fetchData(true);
-});
-</script>
-<template>
-  <div class="row col-12 q-mb-sm">
-    <div class="col-md-2">
-      <q-btn
-        id="addComplaints"
-        for="addComplaints"
-        size="12px"
-        flat
-        round
-        color="primary"
-        icon="mdi-plus"
-        @click="onClickOpenDialog()"
-        ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
-      >
-    </div>
-
-    <div class="row col-md-10 q-col-gutter-sm">
-      <div class="col-md-4">
-        <q-select
-          label="ค้นหาจาก"
-          v-model="formQuery.type"
-          :options="optionFilter"
-          emit-value
-          dense
-          map-options
-          outlined
-          option-label="name"
-          option-value="id"
-        />
-      </div>
-
-      <div class="col-md-6">
-        <q-input
-          ref="searchRef"
-          v-model="formQuery.keyword"
-          outlined
-          dense
-          lazy-rules
-          label="คำค้น"
-          hide-bottom-space
-          @keydown.enter="fetchData()"
-        >
-          <template v-slot:append>
-            <q-icon
-              v-if="formQuery.keyword"
-              name="cancel"
-              @click="(formQuery.keyword = ''), fetchData()"
-              class="cursor-pointer"
-            ></q-icon>
-          </template>
-        </q-input>
-      </div>
-
-      <div class="row col-md-2">
-        <q-btn
-          color="primary"
-          icon="search"
-          label="ค้นหา"
-          class="full-width"
-          @click="fetchData()"
-        />
-      </div>
-    </div>
-  </div>
-
-  <div class="full-width q-mt-sm">
-    <d-table
-      ref="table"
-      :columns="columns"
-      :rows="rows"
-      row-key="id"
-      flat
-      bordered
-      :paging="true"
-      dense
-      class="custom-header-table"
-      :visible-columns="visibleColumns"
-    >
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            style="color: #000000; font-weight: 500"
-          >
-            <span class="text-weight-medium">{{ col.label }}</span>
-          </q-th>
-          <q-th auto-width></q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props" class="cursor-pointer">
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-
-            <div v-else>
-              {{ col.value ? col.value : "-" }}
-            </div>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              color="blue-6"
-              flat
-              dense
-              round
-              class="q-mr-xs"
-              size="12px"
-              icon="mdi-content-copy"
-              clickable
-              @click.stop="
-                () => {
-                  onClickOpenDialog(false, props.row);
-                }
-              "
-            >
-              <q-tooltip>คัดลอกข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="edit"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-pencil"
-              clickable
-              @click.stop="onClickOpenDialog(true, props.row)"
-              v-close-popup
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="red"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-delete"
-              clickable
-              @click.stop="deletePos(props.row.id)"
-              v-close-popup
-            >
-              <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
-          </q-td>
-        </q-tr>
-      </template>
-    </d-table>
-  </div>
-
-  <q-dialog v-model="modalDialog" class="dialog" persistent>
-    <q-card style="width: 350px">
-      <form @submit.prevent="onClickSubmit">
-        <DialogHeader
-          :tittle="`${
-            isStatusEdit
-              ? 'แก้ไขข้อมูลตำแหน่งลูกจ้างประจำ'
-              : 'เพิ่มข้อมูลตำแหน่งลูกจ้างประจำ'
-          }`"
-          :close="closeDialog"
-        />
-        <q-separator />
-
-        <q-card-section>
-          <div class="row q-col-gutter-sm col-12">
-            <div class="col-12">
-              <q-input
-                ref="posNameRef"
-                v-model="formDataPos.posName"
-                dense
-                outlined
-                for="#positionName"
-                label="ชื่อตำแหน่ง"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณากรอกชื่อตำแหน่ง'}`]"
-              />
-            </div>
-
-            <div class="col-6">
-              <q-select
-                ref="posTypeNameRef"
-                label="กลุ่มงาน"
-                v-model="formDataPos.posTypeName"
-                :options="posTypeOp"
-                emit-value
-                dense
-                map-options
-                outlined
-                option-label="name"
-                option-value="id"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณาเลือกกลุ่มงาน'}`]"
-                @update:model-value="updatePosTypeName"
-              />
-            </div>
-
-            <div class="col-6">
-              <q-select
-                ref="posLevelNameRef"
-                label="ระดับชั้นงาน"
-                v-model="formDataPos.posLevelName"
-                :disable="formDataPos.posTypeName === ''"
-                :options="posLevelOp"
-                emit-value
-                dense
-                map-options
-                outlined
-                option-label="name"
-                option-value="id"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณาเลือกระดับชั้นงาน'}`]"
-              />
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right">
-          <q-btn type="submit" :label="`บันทึก`" color="public" />
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
diff --git a/src/modules/01_metadataNew/components/position-employee/02ListType.vue b/src/modules/01_metadataNew/components/position-employee/02ListType.vue
deleted file mode 100644
index b022f8b22..000000000
--- a/src/modules/01_metadataNew/components/position-employee/02ListType.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, reactive } from "vue";
-import { useRouter } from "vue-router";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-/** importType*/
-import type { QTableProps } from "quasar";
-import type { ObjectGroupRef } from "@/modules/01_metadataNew/interface/index/positionEmployee";
-import type { ResGroup } from "@/modules/01_metadataNew/interface/response/positionEmployee/Main";
-import type { FrmDataGroup } from "@/modules/01_metadataNew/interface/request/positionEmployee";
-
-/** importComponents*/
-import dialogHeader from "@/components/DialogHeader.vue";
-
-/** importStore*/
-import { usePositionEmployeeDataStore } from "@/modules/01_metadataNew/stores/positionEmployeeStore";
-import { useCounterMixin } from "@/stores/mixin";
-
-/** use*/
-const $q = useQuasar();
-const store = usePositionEmployeeDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const {
-  dialogRemove,
-  dialogConfirm,
-  success,
-  messageError,
-  showLoader,
-  hideLoader,
-} = mixin;
-
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "กลุ่มงาน",
-    sortable: true,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeShortName",
-    align: "left",
-    label: "อักษรย่อกลุ่มงาน",
-    sortable: true,
-    field: "posTypeShortName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeRank",
-    align: "left",
-    label: "ระดับกลุ่มงาน",
-    sortable: true,
-    field: "posTypeRank",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const visibleColumns = ref<string[]>([
-  "posTypeName",
-  "posTypeShortName",
-  "posTypeRank",
-]);
-
-/** from เพิ่มข้อมูลกลุ่มงาน */
-const formDataGroup = reactive<FrmDataGroup>({
-  posTypeName: "",
-  posTypeShortName: "",
-  posTypeRank: null,
-});
-
-/** formRef*/
-const posTypeNameRef = ref<Object | null>(null);
-const posTypeShortNameRef = ref<Object | null>(null);
-const posTypeRankRef = ref<Object | null>(null);
-const objectGroupRef: ObjectGroupRef = {
-  posTypeName: posTypeNameRef,
-  posTypeShortName: posTypeShortNameRef,
-  posTypeRank: posTypeRankRef,
-};
-
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const dialogStatus = ref<string>("");
-const rows = ref<ResGroup[]>([]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgEmployeeType)
-    .then(async (res) => {
-      rows.value = res.data.result;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function onClickSubmit() {
-  const hasError = [];
-  for (const key in objectGroupRef) {
-    if (Object.prototype.hasOwnProperty.call(objectGroupRef, key)) {
-      const property = objectGroupRef[key];
-      if (property.value && typeof property.value.validate === "function") {
-        const isValid = property.value.validate();
-        hasError.push(isValid);
-      }
-    }
-  }
-  if (hasError.every((result) => result === true)) {
-    dialogConfirm($q, () => {
-      submit();
-    });
-  }
-}
-
-async function submit() {
-  const body: FrmDataGroup = {
-    posTypeName: formDataGroup.posTypeName,
-    posTypeShortName: formDataGroup.posTypeShortName,
-    posTypeRank: Number(formDataGroup.posTypeRank),
-  };
-  showLoader();
-  try {
-    const url =
-      dialogStatus.value === "create"
-        ? config.API.orgEmployeeType
-        : config.API.orgEmployeeTypeById(editId.value);
-    await http[dialogStatus.value === "create" ? "post" : "put"](url, body);
-    success($q, "บันทีกข้อมูลสำเร็จ");
-    fetchData();
-  } catch (err) {
-    messageError($q, err);
-  } finally {
-    hideLoader();
-    closeDialog();
-  }
-}
-
-function onClickDelete(id: string) {
-  dialogRemove($q, () => {
-    showLoader();
-    http
-      .delete(config.API.orgEmployeeTypeById(id))
-      .then(() => {
-        fetchData();
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  });
-}
-
-function onClickOpenDialogEdit(data: ResGroup) {
-  dialogStatus.value = "edit";
-  dialog.value = true;
-  editId.value = data.id;
-  formDataGroup.posTypeName = data.posTypeName;
-  formDataGroup.posTypeShortName = data.posTypeShortName;
-  formDataGroup.posTypeRank = data.posTypeRank;
-}
-
-function onClickDetail(id: string) {
-  router.push(`/master-data/position-employee/level/${id}`);
-}
-
-function closeDialog() {
-  dialog.value = false;
-  clearFormData();
-}
-
-function clearFormData() {
-  formDataGroup.posTypeName = "";
-  formDataGroup.posTypeShortName = "";
-  formDataGroup.posTypeRank = null;
-}
-
-onMounted(() => {
-  fetchData();
-});
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="rows"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :rows-per-page-options="[10, 20, 50, 100]"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onClickDetail(props.row.id)"
-      >
-        <q-td v-for="col in props.cols" :key="col.id">
-          {{ col.value ? col.value : "-" }}
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            @click.stop="onClickOpenDialogEdit(props.row)"
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="onClickDelete(props.row.id)"
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="width: 350px">
-      <form @submit.prevent="onClickSubmit">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            :tittle="
-              dialogStatus === 'edit'
-                ? 'แก้ไขข้อมูลกลุ่มงาน'
-                : 'เพิ่มข้อมูลกลุ่มงาน'
-            "
-            :close="closeDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="row q-gutter-y-md">
-          <div class="col-12">
-            <q-input
-              ref="posTypeNameRef"
-              outlined
-              v-model="formDataGroup.posTypeName"
-              label="ชื่อกลุ่มงาน"
-              dense
-              lazy-rules
-              borderless
-              bg-color="white"
-              :rules="[(val) => val.length > 0 || 'กรุณากรอกชื่อกลุ่มงาน']"
-              hide-bottom-space
-            />
-          </div>
-
-          <div class="col-12">
-            <q-input
-              ref="posTypeShortNameRef"
-              v-model="formDataGroup.posTypeShortName"
-              dense
-              outlined
-              for="#positionShortName"
-              label="อักษรย่อกลุ่มงาน"
-              lazy-rules
-              hide-bottom-space
-              :rules="[(val) => !!val || `${'กรุณากรอกอักษรย่อกลุ่มงาน'}`]"
-            />
-          </div>
-
-          <div class="col-12">
-            <q-input
-              ref="posTypeRankRef"
-              outlined
-              v-model="formDataGroup.posTypeRank"
-              label="ระดับกลุ่มงาน"
-              dense
-              lazy-rules
-              borderless
-              min="1"
-              bg-color="white"
-              :rules="[(val) => val != undefined || 'กรุณากรอกระดับกลุ่มงาน']"
-              hide-bottom-space
-              mask="############"
-            />
-          </div>
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            class="q-px-md"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped lang="scss"></style>
diff --git a/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue b/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue
deleted file mode 100644
index 003824b9c..000000000
--- a/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue
+++ /dev/null
@@ -1,408 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, reactive } from "vue";
-import { useQuasar } from "quasar";
-import { useRouter, useRoute } from "vue-router";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-/** importType*/
-import type { QTableProps } from "quasar";
-import type {
-  ResGroup,
-  ResLevel,
-} from "@/modules/01_metadataNew/interface/response/positionEmployee/Main";
-import type { ObjectLevelRef } from "@/modules/01_metadataNew/interface/index/positionEmployee";
-import type { FormDataLevel } from "@/modules/01_metadataNew/interface/request/positionEmployee";
-
-/** importComponts*/
-import DialogHeader from "@/components/DialogHeader.vue";
-
-/** importStore*/
-import { useMainOptionDataStore } from "@/modules/01_metadataNew/stores/main";
-import { useCounterMixin } from "@/stores/mixin";
-
-/**use*/
-const $q = useQuasar();
-const route = useRoute();
-const router = useRouter();
-const posName = ref<string>("");
-const posTypeId = ref<string>(route.params.id.toString());
-
-const {
-  dialogRemove,
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-} = useCounterMixin();
-const storeOption = useMainOptionDataStore();
-
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px; width:0px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับชั้นงาน",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "กลุ่มงาน",
-    sortable: true,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-
-  {
-    name: "posLevelAuthority",
-    align: "left",
-    label: "ผู้มีอำนาจสั่งบรรจุ",
-    sortable: true,
-    field: "posLevelAuthority",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const rows = ref<any[]>([]);
-
-const visibleColumns = ref<string[]>([
-  "no",
-  "posLevelName",
-  "posTypeName",
-  "posLevelAuthority",
-]);
-const filter = ref<string>("");
-
-const levelId = ref<string>("");
-const titleName = ref<string | null>("");
-const formDataLevel = reactive<FormDataLevel>({
-  posLevelName: null,
-  posTypeName: "",
-  posLevelAuthority: "",
-});
-
-/** formRef*/
-const posLevelNameRef = ref<Object | null>(null);
-const commanderRef = ref<Object | null>(null);
-const objectLevelRef: ObjectLevelRef = {
-  posLevelName: posLevelNameRef,
-  posLevelAuthority: commanderRef,
-};
-
-const id = ref<string>(route.params.id.toString());
-
-function fetchData() {
-  showLoader();
-  http
-    .get(config.API.orgEmployeeTypeById(id.value))
-    .then((res) => {
-      titleName.value = res.data.result.posTypeName ?? null;
-      formDataLevel.posTypeName = res.data.result.posTypeName;
-      rows.value = res.data.result.posLevels.map((x: any) => ({
-        ...x,
-        posTypeName: res.data.result.posTypeName,
-      }));
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-const isStatusEdit = ref<boolean>(false);
-const modalDialog = ref<boolean>(false);
-function onClickOpenDialog(statusEdit: boolean = false, data: any = []) {
-  isStatusEdit.value = statusEdit;
-  modalDialog.value = true;
-
-  if (statusEdit) {
-    levelId.value = data.id;
-    formDataLevel.posLevelName = data.posLevelName;
-    formDataLevel.posTypeName = titleName.value;
-    formDataLevel.posLevelAuthority = data.posLevelAuthority;
-  } else {
-    formDataLevel.posTypeName = titleName.value ? titleName.value : "";
-  }
-}
-
-function onClickCloseDialog() {
-  modalDialog.value = false;
-  formDataLevel.posLevelName = null;
-  formDataLevel.posTypeName = "";
-  formDataLevel.posLevelAuthority = "";
-}
-
-function onClickSubmit() {
-  const hasError = [];
-  for (const key in objectLevelRef) {
-    if (Object.prototype.hasOwnProperty.call(objectLevelRef, key)) {
-      const property = objectLevelRef[key];
-      if (property.value && typeof property.value.validate === "function") {
-        const isValid = property.value.validate();
-        hasError.push(isValid);
-      }
-    }
-  }
-  if (hasError.every((result) => result === true)) {
-    dialogConfirm($q, () => {
-      submit();
-    });
-  }
-}
-
-async function submit() {
-  const body = {
-    posLevelName: Number(formDataLevel.posLevelName),
-    posTypeId: posTypeId.value,
-    posLevelRank: Number(formDataLevel.posLevelName),
-    posLevelAuthority: formDataLevel.posLevelAuthority,
-  };
-  showLoader();
-  try {
-    const url = !isStatusEdit.value
-      ? config.API.orgEmployeelevel
-      : config.API.orgEmployeelevelById(levelId.value);
-    await http[!isStatusEdit.value ? "post" : "put"](url, body);
-    success($q, "บันทีกข้อมูลสำเร็จ");
-    fetchData();
-    onClickCloseDialog();
-  } catch (err) {
-    messageError($q, err);
-  } finally {
-    hideLoader();
-  }
-}
-
-function onClickDelete(id: string) {
-  dialogRemove($q, () => {
-    http
-      .delete(config.API.orgEmployeelevelById(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        fetchData();
-      })
-      .catch((err) => {
-        messageError($q, err);
-      });
-  });
-}
-
-function convertPosLevelAuthority(val: string) {
-  const result = storeOption.posLevelAuthorityOption.find((e) => e.id === val);
-  return result?.label;
-}
-
-onMounted(() => {
-  posTypeId.value && fetchData();
-});
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
-    รายการระดับชั้นงาน{{ titleName }}
-  </div>
-
-  <q-card flat bordered>
-    <div class="q-pa-md">
-      <q-toolbar style="padding: 0">
-        <q-btn
-          flat
-          round
-          color="primary"
-          icon="add"
-          @click.stop.pervent="onClickOpenDialog()"
-        >
-          <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-        </q-btn>
-        <q-space />
-        <div class="row q-gutter-sm">
-          <q-input outlined dense v-model="filter" label="ค้นหา"></q-input>
-          <q-select
-            v-model="visibleColumns"
-            multiple
-            outlined
-            dense
-            options-dense
-            :display-value="$q.lang.table.columns"
-            emit-value
-            map-options
-            :options="columns"
-            option-value="name"
-            options-cover
-            style="min-width: 150px"
-          />
-        </div>
-      </q-toolbar>
-
-      <d-table
-        ref="table"
-        :columns="columns"
-        :rows="rows"
-        :filter="filter"
-        row-key="name"
-        flat
-        bordered
-        :paging="true"
-        dense
-        class="custom-header-table"
-        :visible-columns="visibleColumns"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-bold">{{ col.label }}</span>
-            </q-th>
-            <q-th auto-width />
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="(col, index) in props.cols" :key="col.id">
-              <div v-if="col.name == 'no'">
-                {{ props.rowIndex + 1 }}
-              </div>
-              <div v-else-if="col.name === 'posLevelAuthority'">
-                {{ col.value ? convertPosLevelAuthority(col.value) : "-" }}
-              </div>
-              <div v-else>
-                {{ col.value }}
-              </div>
-            </q-td>
-            <q-td auto-width>
-              <q-btn
-                color="edit"
-                flat
-                dense
-                round
-                class="q-mr-xs"
-                size="12px"
-                icon="edit"
-                @click.stop.pervent="onClickOpenDialog(true, props.row)"
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-              <q-btn
-                color="red"
-                flat
-                dense
-                round
-                size="12px"
-                icon="mdi-delete"
-                @click="onClickDelete(props.row.id)"
-              >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
-            </q-td>
-          </q-tr>
-        </template>
-      </d-table>
-    </div>
-  </q-card>
-
-  <q-dialog v-model="modalDialog" class="dialog" persistent>
-    <q-card style="width: 350px">
-      <form @submit.prevent="onClickSubmit">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <DialogHeader
-            :tittle="isStatusEdit ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-            :close="onClickCloseDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="row q-gutter-y-md">
-          <div class="col-12">
-            <q-input
-              outlined
-              ref="posLevelNameRef"
-              v-model="formDataLevel.posLevelName"
-              label="ระดับชั้นงาน"
-              dense
-              lazy-rules
-              borderless
-              bg-color="white"
-              hide-bottom-space
-              mask="#######################################"
-              :rules="[(val) => !!val || 'กรุณากรอกระดับชั้นงาน']"
-            />
-          </div>
-
-          <div class="col-12">
-            <q-select
-              ref="commanderRef"
-              outlined
-              v-model="formDataLevel.posLevelAuthority"
-              emit-value
-              map-options
-              :options="storeOption.posLevelAuthorityOption"
-              option-value="id"
-              label="ผู้มีอำนาจสั่งบรรจุ"
-              dense
-              lazy-rules
-              borderless
-              bg-color="white"
-              hide-bottom-space
-              :rules="[(val) => !!val || 'กรุณาเลือกผู้มีอำนาจสั่งบรรจุ']"
-            />
-          </div>
-
-          <div class="col-12">
-            <q-select
-              ref="posTypeIdRef"
-              v-model="formDataLevel.posTypeName"
-              label="กลุ่มงาน"
-              outlined
-              dense
-              bg-color="white"
-              options-cover
-              hide-bottom-space
-              readonly
-            />
-          </div>
-        </q-card-section>
-
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            class="q-px-md"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/01_metadataNew/components/position/01ListPosition.vue b/src/modules/01_metadataNew/components/position/01ListPosition.vue
deleted file mode 100644
index ea3e89c51..000000000
--- a/src/modules/01_metadataNew/components/position/01ListPosition.vue
+++ /dev/null
@@ -1,446 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive, onMounted } from "vue";
-import { useCounterMixin } from "@/stores/mixin";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import { useQuasar } from "quasar";
-import type {
-  DataOption,
-  FormPositionSelect,
-  ListMenu,
-  RowDetailPositions,
-} from "@/modules/01_metadataNew/interface/request/position/index";
-import type { QTableProps } from "quasar";
-import DialogAddPosition from "@/modules/01_metadataNew/components/position/DialogAddPosition.vue";
-
-const editPosition = ref<boolean>(false);
-const modalAddPosition = ref<boolean>(false);
-const levelOpsMain = ref<DataOption[]>([]);
-const dataLevel = ref<any>();
-const levelOps = ref<DataOption[]>([]);
-
-const isSpecial = ref<boolean>(false);
-const formPositionSelect = reactive<FormPositionSelect>({
-  positionId: "",
-  posTypeId: "",
-  positionName: "",
-  positionField: "",
-  positionType: "",
-  positionLevel: "",
-  positionExecutive: "",
-  positionExecutiveField: "",
-  positionArea: "",
-  isSpecial: false,
-});
-
-const rows = ref<RowDetailPositions[]>([]);
-const listMenu = ref<ListMenu[]>([
-  {
-    label: "คัดลอก",
-    icon: "mdi-content-copy",
-    type: "copy",
-    color: "blue-6",
-  },
-  {
-    label: "ลบ",
-    icon: "delete",
-    type: "remove",
-    color: "red",
-  },
-]);
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionName",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "positionName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionField",
-    align: "left",
-    label: "สายงาน",
-    sortable: true,
-    field: "positionField",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "ประเภทตำเเหน่ง",
-    sortable: true,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับตำแหน่ง",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posExecutiveName",
-    align: "left",
-    label: "ตำแหน่งทางการบริหาร",
-    sortable: true,
-    field: "posExecutiveName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionExecutiveField",
-    align: "left",
-    label: "ด้านทางการบริหาร",
-    sortable: true,
-    field: "positionExecutiveField",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionArea",
-    align: "left",
-    label: "ด้าน/สาขา",
-    sortable: true,
-    field: "positionArea",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const visibleColumns = ref<string[]>([
-  "no",
-  "positionName",
-  "positionField",
-  "posTypeName",
-  "posLevelName",
-  "posExecutiveName",
-  "positionExecutiveField",
-  "positionArea",
-]);
-
-const $q = useQuasar();
-const rowsPositionSelect = ref<RowDetailPositions[]>([]);
-const mixin = useCounterMixin();
-const {
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  dialogRemove,
-} = mixin;
-
-/** input ค้นหา */
-const searchRef = ref<any>(null);
-const search = ref<string>("");
-const type = ref<string>("positionName");
-const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
-const optionFilter = ref<DataOption[]>([
-  { id: "positionName", name: "ตำแหน่งในสายงาน" },
-  { id: "positionField", name: "สายงาน" },
-  { id: "positionType", name: "ประเภทตำแหน่ง" },
-  { id: "positionLevel", name: "ระดับตำแหน่ง" },
-  { id: "positionExecutive", name: "ตำแหน่งทางการบริหาร" },
-  { id: "positionExecutiveField", name: "ด้านทางการบริหาร" },
-  { id: "positionArea", name: "ด้าน/สาขา" },
-]);
-
-/**
- * คัดลอกข้อมูล
- * @param data ข้อมูลตำแหน่ง
- */
-function copyDetiail(data: RowDetailPositions) {
-  formPositionSelect.positionId = data.id;
-  formPositionSelect.posTypeId = data.posTypeId;
-  formPositionSelect.positionName = data.positionName;
-  formPositionSelect.positionField = data.positionField;
-  formPositionSelect.positionType = data.posTypeId;
-  formPositionSelect.positionLevel = data.posLevelId;
-  formPositionSelect.positionExecutive = data.posExecutiveId;
-  formPositionSelect.positionExecutiveField = data.positionExecutiveField;
-  formPositionSelect.positionArea = data.positionArea;
-  modalAddPosition.value = true;
-}
-/**
- * แก้ไขข้อมูล
- * @param data ข้อมูลตำแหน่ง
- */
-function editDetiail(data: RowDetailPositions) {
-  formPositionSelect.positionId = data.id;
-  formPositionSelect.posTypeId = data.posTypeId;
-  formPositionSelect.positionName = data.positionName;
-  formPositionSelect.positionField = data.positionField;
-  formPositionSelect.positionType = data.posTypeId;
-  formPositionSelect.positionLevel = data.posLevelId;
-  formPositionSelect.positionExecutive = data.posExecutiveId;
-  formPositionSelect.positionExecutiveField = data.positionExecutiveField;
-  formPositionSelect.positionArea = data.positionArea;
-  formPositionSelect.isSpecial = data.isSpecial;
-  modalAddPosition.value = true;
-  editPosition.value = true;
-}
-
-/**
- * ส่งค่า css ออกไปตามเงื่อนไข
- * @param val true/false
- */
-function inputEdit(val: boolean) {
-  return {
-    "full-width cursor-pointer inputgreen ": val,
-    "full-width cursor-pointer inputgreen": !val,
-  };
-}
-
-async function searchInput() {
-  showLoader();
-  await http
-    .get(
-      config.API.orgPosPosition + `?keyword=${search.value}&type=${type.value}`
-    )
-    .then((res) => {
-      rowsPositionSelect.value = res.data.result;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-function addPosition(data: RowDetailPositions) {
-  const isIdExist = rows.value.some((item: any) => item.id === data.id);
-
-  if (!isIdExist) {
-    rows.value = [data, ...rows.value];
-  }
-}
-
-function deletePos(id: string) {
-  dialogRemove($q, () => {
-    showLoader();
-    http
-      .delete(config.API.orgPosPositionById(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        searchInput();
-        hideLoader();
-      });
-  });
-}
-
-function popupAdd() {
-  modalAddPosition.value = true;
-}
-
-async function fetchData() {
-  search.value = "";
-  showLoader();
-  await http
-    .get(config.API.orgPosPosition + `?keyword=&type=ALL`)
-    .then((res) => {
-      rowsPositionSelect.value = res.data.result;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(() => {
-  fetchData();
-});
-</script>
-<template>
-  <div class="row col-12 q-mb-sm">
-    <div class="col-md-2">
-      <q-btn
-        id="addComplaints"
-        for="addComplaints"
-        size="12px"
-        flat
-        round
-        color="primary"
-        icon="mdi-plus"
-        @click="popupAdd()"
-        ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
-      >
-    </div>
-
-    <div class="row col-md-10 q-col-gutter-sm">
-      <div class="col-md-4">
-        <q-select
-          label="ค้นหาจาก"
-          v-model="type"
-          :options="optionFilter"
-          emit-value
-          dense
-          map-options
-          outlined
-          option-label="name"
-          option-value="id"
-        />
-      </div>
-
-      <div class="col-md-6">
-        <q-input
-          ref="searchRef"
-          :class="inputEdit(isReadonly)"
-          v-model="search"
-          outlined
-          dense
-          lazy-rules
-          label="คำค้น"
-          hide-bottom-space
-        >
-          <template v-slot:append>
-            <q-icon
-              v-if="search"
-              name="cancel"
-              @click="fetchData()"
-              class="cursor-pointer"
-            ></q-icon>
-          </template>
-        </q-input>
-      </div>
-
-      <div class="row col-md-2">
-        <q-btn
-          color="primary"
-          icon="search"
-          label="ค้นหา"
-          class="full-width"
-          @click="searchInput()"
-        />
-      </div>
-    </div>
-  </div>
-
-  <div class="full-width q-mt-sm">
-    <d-table
-      ref="table"
-      :columns="columns"
-      :rows="rowsPositionSelect"
-      row-key="id"
-      flat
-      bordered
-      :paging="true"
-      dense
-      class="custom-header-table"
-      :visible-columns="visibleColumns"
-    >
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            style="color: #000000; font-weight: 500"
-          >
-            <span class="text-weight-medium">{{ col.label }}</span>
-          </q-th>
-          <q-th auto-width></q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props" class="cursor-pointer">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="addPosition(props.row)"
-          >
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else-if="col.name === 'posLevelName'">
-              {{
-                props.row.posLevelName
-                  ? props.row.isSpecial == true
-                    ? `${props.row.posLevelName} (ฉ)`
-                    : props.row.posLevelName
-                  : "-"
-              }}
-            </div>
-            <div v-else>
-              {{ col.value ? col.value : "-" }}
-            </div>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              color="blue-6"
-              flat
-              dense
-              round
-              class="q-mr-xs"
-              size="12px"
-              icon="mdi-content-copy"
-              clickable
-              @click.stop="
-                () => {
-                  copyDetiail(props.row);
-                }
-              "
-            >
-              <q-tooltip>คัดลอกข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="edit"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-pencil"
-              clickable
-              @click.stop="editDetiail(props.row)"
-              v-close-popup
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="red"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-delete"
-              clickable
-              @click.stop="deletePos(props.row.id)"
-              v-close-popup
-            >
-              <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
-          </q-td>
-        </q-tr>
-      </template>
-    </d-table>
-  </div>
-  <DialogAddPosition
-    v-model:add-position="modalAddPosition"
-    v-model:form-data="formPositionSelect"
-    v-model:edit-check="editPosition"
-    :get-data="searchInput"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/position/02ListType.vue b/src/modules/01_metadataNew/components/position/02ListType.vue
deleted file mode 100644
index a7512e662..000000000
--- a/src/modules/01_metadataNew/components/position/02ListType.vue
+++ /dev/null
@@ -1,434 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QInput, QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRouter } from "vue-router";
-import { usePositionTypeDataStore } from "@/modules/01_metadataNew/stores/positionTypeStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-const store = usePositionTypeDataStore();
-const router = useRouter();
-const mixin = useCounterMixin();
-const {
-  dialogRemove,
-  dialogConfirm,
-  success,
-  messageError,
-  showLoader,
-  hideLoader,
-} = mixin;
-const columns = [
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "ประเภทตำแหน่ง",
-    sortable: true,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "posTypeRank",
-    align: "left",
-    label: "ระดับตำแหน่ง",
-    sortable: true,
-    field: "posTypeRank",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-
-const $q = useQuasar();
-
-const editId = ref<string>("");
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const posTypeName = ref<string>("");
-const posTypeNameRef = ref<QInput | null>(null);
-const posTypeRank = ref<number | null>(null);
-const posTypeRankRef = ref<QInput | null>(null);
-const dialogStatus = ref<string>("");
-const visibleColumns = ref<string[]>(["posTypeName", "posTypeRank"]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgPosType)
-    .then(async (res) => {
-      store.save(res.data.result);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgPosType, {
-      posTypeName: posTypeName.value,
-      posTypeRank: posTypeRank.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(id: string) {
-  await http
-    .put(config.API.orgPosTypeId(id), {
-      posTypeName: posTypeName.value,
-      posTypeRank: posTypeRank.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgPosTypeId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-onMounted(async () => {
-  fetchData();
-});
-
-function closeDialog() {
-  dialog.value = false;
-  posTypeName.value = "";
-  posTypeRank.value = null;
-}
-
-function onclickDetail(id: string) {
-  router.push(`/master-data/position/level/${id}`);
-}
-
-function validateForm() {
-  posTypeNameRef.value?.validate();
-  posTypeRankRef.value?.validate();
-  onSubmit();
-}
-
-async function onSubmit() {
-  if (posTypeName.value.length > 0 && posTypeRank.value !== null) {
-    dialogConfirm(
-      $q,
-      async () => {
-        dialogStatus.value === "create" ? addData() : editData(editId.value);
-        closeDialog();
-        posTypeName.value = "";
-        posTypeRank.value = null;
-      },
-      "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
-    );
-  }
-}
-</script>
-
-<template>
-  <q-toolbar style="padding: 0">
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="add"
-      @click.stop="
-        () => {
-          dialogStatus = 'create';
-          dialog = true;
-        }
-      "
-    >
-      <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-    </q-btn>
-    <q-space />
-    <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-      />
-    </div>
-  </q-toolbar>
-
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
-        <q-td v-for="col in props.cols" :key="col.id">
-          {{ col.value }}
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                editId = props.row.id;
-                posTypeName = props.row.posTypeName;
-                posTypeRank = props.row.posTypeRank;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="12px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="min-width: 350px">
-      <form @submit.prevent="validateForm">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            :tittle="dialogStatus === 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-            :close="closeDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="q-pa-none">
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="posTypeNameRef"
-              outlined
-              v-model="posTypeName"
-              label="ประเภทตำแหน่ง"
-              dense
-              lazy-rules
-              borderless
-              :rules="[(val) => val.length > 0 || 'กรุณากรอกประเภทตำแหน่ง']"
-              hide-bottom-space
-              class="inputgreen"
-            />
-          </div>
-          <div class="col-12 q-ma-md">
-            <q-input
-              ref="posTypeRankRef"
-              outlined
-              v-model="posTypeRank"
-              label="ระดับตำแหน่ง"
-              dense
-              lazy-rules
-              borderless
-              min="1"
-              :rules="[(val) => val != undefined || 'กรุณากรอกระดับตำแหน่ง']"
-              hide-bottom-space
-              mask="############"
-              class="inputgreen"
-            />
-          </div>
-        </q-card-section>
-
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            class="q-px-md"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped lang="scss">
-.border_custom {
-  border-radius: 6px !important;
-  border: 1px solid #e1e1e1;
-}
-$toggle-background-color-on: #06884d;
-$toggle-background-color-off: darkgray;
-$toggle-control-color: white;
-$toggle-width: 40px;
-$toggle-height: 25px;
-$toggle-gutter: 3px;
-$toggle-radius: 50%;
-$toggle-control-speed: 0.15s;
-$toggle-control-ease: ease-in;
-
-// These are our computed variables
-// change at your own risk.
-$toggle-radius: $toggle-height / 2;
-$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
-
-.toggle-control {
-  display: block;
-  position: relative;
-  padding-left: $toggle-width;
-  margin-bottom: 12px;
-  cursor: pointer;
-  font-size: 22px;
-  user-select: none;
-
-  input {
-    position: absolute;
-    opacity: 0;
-    cursor: pointer;
-    height: 0;
-    width: 0;
-  }
-
-  input:checked ~ .control {
-    background-color: $toggle-background-color-on;
-
-    &:after {
-      left: $toggle-width - $toggle-control-size - $toggle-gutter;
-    }
-  }
-
-  .control {
-    position: absolute;
-    top: -7px;
-    left: -15px;
-    height: $toggle-height;
-    width: $toggle-width;
-    border-radius: $toggle-radius;
-    background-color: $toggle-background-color-off;
-    transition: background-color $toggle-control-speed $toggle-control-ease;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: $toggle-gutter;
-      top: $toggle-gutter;
-      width: $toggle-control-size;
-      height: $toggle-control-size;
-      border-radius: $toggle-radius;
-      background: $toggle-control-color;
-      transition: left $toggle-control-speed $toggle-control-ease;
-    }
-  }
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/position/03ListLevel.vue b/src/modules/01_metadataNew/components/position/03ListLevel.vue
deleted file mode 100644
index bb6f217ca..000000000
--- a/src/modules/01_metadataNew/components/position/03ListLevel.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-import { useRouter } from "vue-router";
-import ListLevelDetail from "@/modules/01_metadataNew/components/position/05ListLevelDetail.vue";
-
-const router = useRouter();
-const posName = ref<string>("");
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
-    รายการระดับตำแหน่งของ {{ posName }}
-  </div>
-
-  <q-card flat bordered>
-    <ListLevelDetail v-model:posName="posName" />
-  </q-card>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/01_metadataNew/components/position/04ListExecutive.vue b/src/modules/01_metadataNew/components/position/04ListExecutive.vue
deleted file mode 100644
index 38ba37977..000000000
--- a/src/modules/01_metadataNew/components/position/04ListExecutive.vue
+++ /dev/null
@@ -1,242 +0,0 @@
-<script setup lang="ts">
-import { onMounted, ref } from "vue";
-import type { QTableProps } from "quasar";
-import { useQuasar } from "quasar";
-import type {
-  RowListForm,
-  ListMenu,
-} from "@/modules/01_metadataNew/interface/request/position";
-
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import DialogAdd from "@/modules/01_metadataNew/components/position/DialogAddExecutive.vue";
-import { useCounterMixin } from "@/stores/mixin";
-
-const $q = useQuasar();
-const mixin = useCounterMixin();
-const {
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  dialogRemove,
-} = mixin;
-
-const dataEdit = ref<any>();
-const isEdit = ref<boolean>(false);
-const modalAdd = ref<boolean>(false);
-const filterKeyword = ref<string>("");
-const rows = ref<RowListForm[]>([]);
-
-const listMenu = ref<ListMenu[]>([
-  {
-    label: "แก้ไข",
-    icon: "mdi-pencil",
-    type: "copy",
-    color: "teal-6",
-  },
-  {
-    label: "ลบ",
-    icon: "delete",
-    type: "remove",
-    color: "red",
-  },
-]);
-
-const visibleColumns = ref<string[]>([
-  "no",
-  "posExecutiveName",
-  "posExecutivePriority",
-]);
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posExecutiveName",
-    align: "left",
-    label: "ชื่อตำแหน่งทางการบริหาร",
-    sortable: true,
-    field: "posExecutiveName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posExecutivePriority",
-    align: "left",
-    label: "ลำดับความสำคัญ",
-    sortable: true,
-    field: "posExecutivePriority",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-
-function getData() {
-  showLoader();
-  http
-    .get(config.API.orgPosExecutive)
-    .then((res) => {
-      const dataList = res.data.result;
-      rows.value = dataList;
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-function popUpAdd() {
-  modalAdd.value = true;
-}
-
-function editPopUp(data: RowListForm[]) {
-  dataEdit.value = data;
-  modalAdd.value = true;
-  isEdit.value = true;
-}
-
-function deletePos(id: string) {
-  dialogRemove($q, () => {
-    showLoader();
-    http
-      .delete(config.API.orgPosExecutiveById(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        getData();
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  });
-}
-
-onMounted(() => {
-  getData();
-});
-</script>
-
-<template>
-  <div class="row col-12 q-col-gutter-x-sm">
-    <div class="col-2">
-      <q-btn
-        size="12px"
-        flat
-        round
-        color="primary"
-        icon="mdi-plus"
-        @click="popUpAdd()"
-      >
-        <q-tooltip>เพิ่มตำแหน่งทางการบริหาร</q-tooltip>
-      </q-btn>
-    </div>
-
-    <q-space />
-    <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-    <q-select
-      v-model="visibleColumns"
-      multiple
-      outlined
-      dense
-      options-dense
-      :display-value="$q.lang.table.columns"
-      emit-value
-      map-options
-      :options="columns"
-      option-value="name"
-      options-cover
-      style="min-width: 150px"
-    />
-  </div>
-  <div class="col-12 q-mt-sm">
-    <d-table
-      ref="table"
-      :columns="columns"
-      :rows="rows"
-      row-key="id"
-      flat
-      bordered
-      :paging="true"
-      dense
-      class="custom-header-table"
-      :visible-columns="visibleColumns"
-    >
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            style="color: #000000; font-weight: 500"
-          >
-            <span class="text-weight-medium">{{ col.label }}</span>
-          </q-th>
-          <q-th auto-width></q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props" class="cursor-pointer">
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              color="edit"
-              flat
-              dense
-              round
-              class="q-mr-xs"
-              size="12px"
-              icon="edit"
-              clickable
-              @click.stop="
-                () => {
-                  editPopUp(props.row);
-                }
-              "
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="red"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-delete"
-              clickable
-              @click.stop="deletePos(props.row.id)"
-              v-close-popup
-            >
-              <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
-          </q-td>
-        </q-tr>
-      </template>
-    </d-table>
-  </div>
-
-  <DialogAdd
-    v-model:executive="modalAdd"
-    v-model:form-data="dataEdit"
-    v-model:edit="isEdit"
-    :get-data="getData"
-  />
-</template>
diff --git a/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue b/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue
deleted file mode 100644
index 2d6146bb2..000000000
--- a/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue
+++ /dev/null
@@ -1,547 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { QInput, QTableProps } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
-import { useRoute } from "vue-router";
-import { usePositionDataStore } from "@/modules/01_metadataNew/stores/positionListStore";
-import { useMainOptionDataStore } from "@/modules/01_metadataNew/stores/main";
-import { usePositionTypeDataStore } from "@/modules/01_metadataNew/stores/positionTypeStore";
-import dialogHeader from "@/components/DialogHeader.vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-const store = usePositionDataStore();
-const storeOption = useMainOptionDataStore();
-const storeName = usePositionTypeDataStore();
-
-const mixin = useCounterMixin();
-
-const posName = defineModel<string>("posName", {
-  required: true,
-});
-
-const {
-  dialogRemove,
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-} = mixin;
-const $q = useQuasar();
-
-const columns = [
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px; width:0px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ชื่อระดับตำแหน่ง",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "ประเภทตำแหน่ง",
-    sortable: true,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "posLevelRank",
-    align: "left",
-    label: "ระดับของระดับตำแหน่ง",
-    sortable: true,
-    field: "posLevelRank",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "posLevelAuthority",
-    align: "left",
-    label: "ผู้มีอำนาจสั่งบรรจุ",
-    sortable: true,
-    field: "posLevelAuthority",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "createdAt",
-    align: "center",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "lastUpdatedAt",
-    align: "center",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-] as const satisfies QTableProps["columns"];
-const route = useRoute();
-const id = ref<string>(route.params.id.toString());
-const filterKeyword = ref<string>("");
-const dialog = ref<boolean>(false);
-const dialogStatus = ref<string>("");
-const editId = ref<string>("");
-const posLevelName = ref<string>("");
-const posLevelRank = ref<number>();
-const posLevelAuthority = ref<string>("");
-const posLevelNameRef = ref<QInput | null>(null);
-const posLevelRankRef = ref<QInput | null>(null);
-const posTypeIdRef = ref<QInput | null>(null);
-const posLevelAuthorityRef = ref<QInput | null>(null);
-const visibleColumns = ref<string[]>([
-  "no",
-  "posTypeName",
-  "posLevelName",
-  "posLevelRank",
-  "posLevelAuthority",
-]);
-
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.orgPosTypeId(id.value))
-    .then(async (res) => {
-      posName.value = res.data.result.posTypeName;
-      store.save(res.data.result.posLevels);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function addData() {
-  await http
-    .post(config.API.orgPosLevel, {
-      posLevelName: posLevelName.value,
-      posLevelRank: posLevelRank.value,
-      posLevelAuthority:
-        posLevelAuthority.value == "" ? "" : posLevelAuthority.value,
-      posTypeId: id.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function editData(editId: string) {
-  await http
-    .put(config.API.orgPosLevelId(editId), {
-      posLevelName: posLevelName.value,
-      posLevelRank: posLevelRank.value,
-      posLevelAuthority:
-        posLevelAuthority.value == "" ? "" : posLevelAuthority.value,
-      posTypeId: id.value,
-    })
-    .then(() => {
-      fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-async function deleteData(id: string) {
-  await http
-    .delete(config.API.orgPosLevelId(id))
-    .then(() => {
-      fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-function closeDialog() {
-  dialog.value = false;
-}
-
-function validateForm() {
-  posLevelNameRef.value?.validate();
-  posLevelRankRef.value?.validate();
-  posTypeIdRef.value?.validate();
-  posLevelAuthorityRef.value?.validate();
-  onSubmit();
-}
-
-async function onSubmit() {
-  if (
-    posLevelName.value.length > 0 &&
-    posLevelAuthority.value.length > 0 &&
-    posLevelRank.value !== undefined &&
-    posLevelRank.value > 0
-  ) {
-    dialogConfirm(
-      $q,
-      async () => {
-        dialogStatus.value === "create" ? addData() : editData(editId.value);
-        closeDialog();
-      },
-      "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
-    );
-  }
-}
-
-onMounted(async () => {
-  fetchData();
-});
-</script>
-
-<template>
-  <div class="q-pa-md">
-    <q-toolbar style="padding: 0">
-      <q-btn
-        flat
-        round
-        color="primary"
-        icon="add"
-        @click.stop="
-          () => {
-            dialogStatus = 'create';
-            dialog = true;
-            posLevelName = '';
-            posLevelRank = undefined;
-            posLevelAuthority = '';
-          }
-        "
-      >
-        <q-tooltip> เพิ่มข้อมูล </q-tooltip>
-      </q-btn>
-      <q-space />
-      <div class="row q-gutter-sm">
-        <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
-        <q-select
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-        />
-      </div>
-    </q-toolbar>
-
-    <d-table
-      ref="table"
-      :columns="columns"
-      :rows="store.row"
-      :filter="filterKeyword"
-      row-key="name"
-      flat
-      bordered
-      :paging="true"
-      dense
-      class="custom-header-table"
-      :visible-columns="visibleColumns"
-    >
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th v-for="col in props.cols" :key="col.name" :props="props">
-            <span class="text-weight-bold">{{ col.label }}</span>
-          </q-th>
-          <q-th auto-width />
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props" class="cursor-pointer">
-          <q-td v-for="(col, index) in props.cols" :key="col.id">
-            <div v-if="col.name === 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-if="col.name === 'posTypeName'">
-              {{ posName }}
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              color="edit"
-              flat
-              dense
-              round
-              class="q-mr-xs"
-              size="12px"
-              icon="edit"
-              clickable
-              @click.stop="
-                () => {
-                  dialogStatus = 'edit';
-                  editId = props.row.id;
-                  posLevelName = props.row.posLevelName;
-                  posLevelRank = props.row.posLevelRank;
-                  if (props.row.posLevelAuthority === 'หัวหน้าหน่วยงาน') {
-                    posLevelAuthority = 'HEAD';
-                  } else if (props.row.posLevelAuthority === 'ปลัด') {
-                    posLevelAuthority = 'DEPUTY';
-                  } else {
-                    posLevelAuthority = 'GOVERNOR';
-                  }
-
-                  dialog = true;
-                }
-              "
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              color="red"
-              flat
-              dense
-              round
-              size="12px"
-              icon="mdi-delete"
-              clickable
-              @click.stop="
-                dialogRemove($q, async () => await deleteData(props.row.id))
-              "
-              v-close-popup
-            >
-              <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
-          </q-td>
-        </q-tr>
-      </template>
-    </d-table>
-  </div>
-
-  <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="width: 350px">
-      <form @submit.prevent="validateForm">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            :tittle="dialogStatus == 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-            :close="closeDialog"
-          />
-        </q-card-section>
-
-        <q-separator color="grey-4" />
-        <q-card-section class="row q-gutter-y-md">
-          <div class="col-12">
-            <q-input
-              outlined
-              ref="posLevelNameRef"
-              v-model="posLevelName"
-              label="ชื่อระดับตำแหน่ง"
-              dense
-              lazy-rules
-              borderless
-              bg-color="white"
-              hide-bottom-space
-              :rules="[(val) => val.length > 0 || 'กรุณากรอกระดับตำแหน่ง']"
-              class="inputgreen"
-            />
-          </div>
-
-          <div class="col-12">
-            <q-input
-              ref="posLevelRankRef"
-              outlined
-              v-model="posLevelRank"
-              label="ระดับ"
-              dense
-              lazy-rules
-              borderless
-              min="1"
-              bg-color="white"
-              :rules="[(val) => val > 0 || 'กรุณากรอกระดับ']"
-              hide-bottom-space
-              mask="############"
-              class="inputgreen"
-            />
-          </div>
-
-          <div class="col-12">
-            <q-select
-              ref="posLevelAuthorityRef"
-              outlined
-              v-model="posLevelAuthority"
-              emit-value
-              map-options
-              :options="storeOption.posLevelAuthorityOption"
-              option-value="id"
-              label="ผู้มีอำนาจสั่งบรรจุ"
-              dense
-              lazy-rules
-              :rules="[(val) => !!val || 'กรุณาเลือกผู้มีอำนาจสั่งบรรจุ']"
-              borderless
-              bg-color="white"
-              hide-bottom-space
-              class="inputgreen"
-            />
-          </div>
-
-          <div class="col-12">
-            <q-select
-              ref="posTypeIdRef"
-              v-model="posName"
-              label="ประเภทตำแหน่ง"
-              outlined
-              dense
-              bg-color="white"
-              options-cover
-              hide-bottom-space
-              readonly
-              class="inputgreen"
-            />
-          </div>
-        </q-card-section>
-
-        <q-card-actions align="right">
-          <q-btn
-            id="onSubmit"
-            type="submit"
-            dense
-            unelevated
-            label="บันทึก"
-            color="public"
-            class="q-px-md"
-          >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped lang="scss">
-.border_custom {
-  border-radius: 6px !important;
-  border: 1px solid #e1e1e1;
-}
-$toggle-background-color-on: #06884d;
-$toggle-background-color-off: darkgray;
-$toggle-control-color: white;
-$toggle-width: 40px;
-$toggle-height: 25px;
-$toggle-gutter: 3px;
-$toggle-radius: 50%;
-$toggle-control-speed: 0.15s;
-$toggle-control-ease: ease-in;
-
-// These are our computed variables
-// change at your own risk.
-$toggle-radius: $toggle-height / 2;
-$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
-
-.toggle-control {
-  display: block;
-  position: relative;
-  padding-left: $toggle-width;
-  margin-bottom: 12px;
-  cursor: pointer;
-  font-size: 22px;
-  user-select: none;
-
-  input {
-    position: absolute;
-    opacity: 0;
-    cursor: pointer;
-    height: 0;
-    width: 0;
-  }
-
-  input:checked ~ .control {
-    background-color: $toggle-background-color-on;
-
-    &:after {
-      left: $toggle-width - $toggle-control-size - $toggle-gutter;
-    }
-  }
-
-  .control {
-    position: absolute;
-    top: -7px;
-    left: -15px;
-    height: $toggle-height;
-    width: $toggle-width;
-    border-radius: $toggle-radius;
-    background-color: $toggle-background-color-off;
-    transition: background-color $toggle-control-speed $toggle-control-ease;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: $toggle-gutter;
-      top: $toggle-gutter;
-      width: $toggle-control-size;
-      height: $toggle-control-size;
-      border-radius: $toggle-radius;
-      background: $toggle-control-color;
-      transition: left $toggle-control-speed $toggle-control-ease;
-    }
-  }
-}
-</style>
diff --git a/src/modules/01_metadataNew/components/position/DialogAddExecutive.vue b/src/modules/01_metadataNew/components/position/DialogAddExecutive.vue
deleted file mode 100644
index 1f93a2599..000000000
--- a/src/modules/01_metadataNew/components/position/DialogAddExecutive.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive, watch } from "vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import type { QTableProps } from "quasar";
-import DialogHeader from "@/components/DialogHeader.vue";
-import type {
-  FormExecutiveRef,
-  RowListForm,
-} from "@/modules/01_metadataNew/interface/request/position/index";
-import { useCounterMixin } from "@/stores/mixin";
-// import { bo } from "@fullcalendar/core/internal-common";
-const { dialogConfirm, showLoader, success, hideLoader, messageError } =
-  useCounterMixin();
-
-const formExecutive = reactive<RowListForm>({
-  id: "",
-  posExecutiveName: "",
-  posExecutivePriority: null,
-});
-const $q = useQuasar();
-
-const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
-const modal = defineModel<boolean>("executive", { required: true });
-const formData = defineModel<any>("formData", { required: true });
-const isEdit = defineModel<any>("edit", { required: true });
-
-const posExecutiveNameRef = ref<Object | null>(null);
-const posExecutivePriorityRef = ref<Object | null>(null);
-
-const objectExecutiveRef: FormExecutiveRef = {
-  posExecutiveName: posExecutiveNameRef,
-  posExecutivePriority: posExecutivePriorityRef,
-};
-
-const props = defineProps({
-    getData: Function,
-})
-/** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
-function validateFormExecutive() {
-  const hasError = [];
-  for (const key in objectExecutiveRef) {
-    if (Object.prototype.hasOwnProperty.call(objectExecutiveRef, key)) {
-      const property = objectExecutiveRef[key];
-      if (property.value && typeof property.value.validate === "function") {
-        const isValid = property.value.validate();
-        hasError.push(isValid);
-      }
-    }
-  }
-  if (hasError.every((result) => result === true)) {
-    if(isEdit.value == false){
-        onSubmit();
-    }else{
-        putSubmit()
-    }
-  }
-}
-
-/** ฟังชั่น บันทึก */
-function onSubmit() {
-  dialogConfirm(
-    $q,
-    async () => {
-      showLoader();
-      const body = {
-        posExecutiveName: formExecutive.posExecutiveName,
-        posExecutivePriority: formExecutive.posExecutivePriority, //สายงาน
-      };
-      await http
-        .post(config.API.orgPosExecutive, body)
-        .then(() => {
-          success($q, "เพิ่มข้อมูลสำเร็จ");
-          clearForm();
-          modal.value = false;
-          props.getData?.()
-        })
-        .catch((err) => {
-          messageError($q, err);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    },
-    "ยืนยันการเพิ่มตำแหน่ง",
-    "ต้องการยืนยันการเพิ่มตำแหน่งนี้ใช่หรือไม่?"
-  );
-}
-/** ฟังชั่น บันทึก */
-function putSubmit() {
-  dialogConfirm(
-    $q,
-    async () => {
-      showLoader();
-      const body = {
-        posExecutiveName: formExecutive.posExecutiveName,
-        posExecutivePriority: formExecutive.posExecutivePriority, //สายงาน
-      };
-      await http
-        .put(config.API.orgPosExecutive+`/${formExecutive.id}`, body)
-        .then(() => {
-          success($q, "เพิ่มข้อมูลสำเร็จ");
-          clearForm();
-          modal.value = false;
-          props.getData?.()
-        })
-        .catch((err) => {
-          messageError($q, err);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    },
-    "ยืนยันการเพิ่มตำแหน่ง",
-    "ต้องการยืนยันการเพิ่มตำแหน่งนี้ใช่หรือไม่?"
-  );
-}
-
-async function clearForm() {
-  formExecutive.id = "";
-  formExecutive.posExecutiveName = "";
-  formExecutive.posExecutivePriority = null;
-  isEdit.value = false;
-}
-
-/**
- * ส่งค่า css ออกไปตามเงื่อนไข
- * @param val true/false
- */
-function inputEdit(val: boolean) {
-  return {
-    "full-width cursor-pointer inputgreen ": val,
-    "full-width cursor-pointer inputgreen": !val,
-  };
-}
-
-function close() {
-  clearForm();
-  modal.value = false;
-}
-watch(
-  () => modal.value,
-  () => {
-    if (modal.value == true) {
-      const dataList = formData.value;
-      formExecutive.id = "";
-      formExecutive.posExecutiveName = "";
-      formExecutive.posExecutivePriority = null;
-      if (isEdit.value == true) {
-        formExecutive.id = dataList.id;
-        formExecutive.posExecutiveName = dataList.posExecutiveName;
-        formExecutive.posExecutivePriority = dataList.posExecutivePriority;
-      }
-    }
-  }
-);
-</script>
-
-<template>
-  <q-dialog v-model="modal" persistent>
-    <q-card style="min-width: 50vw">
-      <form @submit.prevent="validateFormExecutive">
-        <DialogHeader
-          :tittle="isEdit ? `แก้ไขตำแหน่งทางการบริหาร` : 'เพิ่มตำแหน่งทางการบริหาร'"
-          :close="close"
-        />
-        <q-separator />
-
-        <q-card-section>
-          <div class="row q-col-gutter-sm col-12">
-            <div class="col-6">
-              <q-input
-                ref="posExecutiveNameRef"
-                v-model="formExecutive.posExecutiveName"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#posExecutiveName"
-                label="ชื่อตำแหน่งทางการบริหาร"
-                lazy-rules
-                hide-bottom-space
-                :rules="[
-                  (val) => !!val || `${'กรุณากรอกชื่อตำแหน่งทางการบริหาร'}`,
-                ]"
-              />
-            </div>
-            <div class="col-6">
-              <q-input
-                ref="posExecutivePriorityRef"
-                v-model="formExecutive.posExecutivePriority"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                type="number"
-                for="#posExecutivePriority"
-                label="ลำดับความสำคัญ"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณากรอกลำดับความสำคัญ'}`]"
-              />
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn type="submit" :label="`บันทึก`" color="public" />
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
diff --git a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue
deleted file mode 100644
index 7c56b5b37..000000000
--- a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue
+++ /dev/null
@@ -1,407 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive, watch, defineProps } from "vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import type { QTableProps } from "quasar";
-import DialogHeader from "@/components/DialogHeader.vue";
-import type {
-  DataOption,
-  FormPositionSelectDialog,
-  FormPositionSelectRef,
-  OptionType,
-  OptionLevel,
-  OptionExecutive,
-} from "@/modules/01_metadataNew/interface/request/position/index";
-import { useCounterMixin } from "@/stores/mixin";
-const executiveOpsMain = ref<DataOption[]>([]);
-const levelOps = ref<DataOption[]>([]);
-const levelOpsMain = ref<DataOption[]>([]);
-const typeOps = ref<DataOption[]>([]);
-const typeOpsMain = ref<DataOption[]>([]);
-const dataLevel = ref<any>();
-const executiveOps = ref<DataOption[]>([]);
-const formPositionSelect = reactive<FormPositionSelectDialog>({
-  positionId: "",
-  positionName: "",
-  positionField: "",
-  positionType: "",
-  positionLevel: "",
-  positionExecutive: "",
-  positionExecutiveField: "",
-  positionArea: "",
-});
-const $q = useQuasar();
-const isSpecial = ref<boolean>(false);
-const props = defineProps({
-  getData: Function,
-});
-const { dialogConfirm, showLoader, success, hideLoader, messageError } =
-  useCounterMixin();
-
-const isReadonly = ref<boolean>(true); // อ่านได้อย่างเดียว
-const modal = defineModel<boolean>("addPosition", { required: true });
-const formData = defineModel<any>("formData", { required: true });
-const editCheck = defineModel<boolean>("editCheck", { required: true });
-
-const positionNameRef = ref<Object | null>(null);
-const positionFieldRef = ref<Object | null>(null);
-const positionTypeRef = ref<Object | null>(null);
-const positionLevelRef = ref<Object | null>(null);
-const positionExecutiveRef = ref<Object | null>(null);
-const positionExecutiveFieldRef = ref<Object | null>(null);
-const positionAreaRef = ref<Object | null>(null);
-
-const objectPositionSelectRef: FormPositionSelectRef = {
-  positionName: positionNameRef,
-  positionField: positionFieldRef,
-  positionType: positionTypeRef,
-  positionLevel: positionLevelRef,
-  positionExecutive: positionExecutiveRef,
-  positionExecutiveField: positionExecutiveFieldRef,
-  positionArea: positionAreaRef,
-};
-
-/** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
-function validateFormPositionEdit() {
-  const hasError = [];
-  for (const key in objectPositionSelectRef) {
-    if (Object.prototype.hasOwnProperty.call(objectPositionSelectRef, key)) {
-      const property = objectPositionSelectRef[key];
-      if (property.value && typeof property.value.validate === "function") {
-        const isValid = property.value.validate();
-        hasError.push(isValid);
-      }
-    }
-  }
-  if (hasError.every((result) => result === true)) {
-    if (editCheck.value == true) {
-      saveSelectEdit();
-    } else {
-      onSubmitSelectEdit();
-    }
-  }
-}
-
-/** ฟังชั่น บันทึก */
-function saveSelectEdit() {
-  dialogConfirm(
-    $q,
-    async () => {
-      showLoader();
-      const body = {
-        posDictName: formPositionSelect.positionName,
-        posDictField: formPositionSelect.positionField, //สายงาน
-        posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง
-        posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง
-        posExecutiveId: formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
-        posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
-        posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
-        isSpecial: isSpecial.value,
-      };
-      await http
-        .put(config.API.orgPosPositionById(formPositionSelect.positionId), body)
-        .then(() => {
-          success($q, "เพิ่มข้อมูลสำเร็จ");
-          clearFormPositionSelect();
-          modal.value = false;
-          editCheck.value = false;
-          props.getData?.();
-        })
-        .catch((err) => {
-          messageError($q, err);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    },
-    "ยืนยันการเพิ่มตำแหน่ง",
-    "ต้องการยืนยันการเพิ่มตำแหน่งนี้ใช่หรือไม่?"
-  );
-}
-/** ฟังชั่น บันทึก */
-function onSubmitSelectEdit() {
-  dialogConfirm(
-    $q,
-    async () => {
-      showLoader();
-      const body = {
-        posDictName: formPositionSelect.positionName,
-        posDictField: formPositionSelect.positionField, //สายงาน
-        posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง
-        posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง
-        posExecutiveId: formPositionSelect.positionExecutive,
-        posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
-        posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
-        isSpecial: isSpecial.value,
-      };
-      await http
-        .post(config.API.orgPosPosition, body)
-        .then(() => {
-          success($q, "เพิ่มข้อมูลสำเร็จ");
-          clearFormPositionSelect();
-          modal.value = false;
-          editCheck.value = false;
-        })
-        .catch((err) => {
-          messageError($q, err);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    },
-    "ยืนยันการเพิ่มตำแหน่ง",
-    "ต้องการยืนยันการเพิ่มตำแหน่งนี้ใช่หรือไม่?"
-  );
-}
-
-async function clearFormPositionSelect() {
-  formPositionSelect.positionId = "";
-  formPositionSelect.positionName = "";
-  formPositionSelect.positionField = "";
-  formPositionSelect.positionType = "";
-  formPositionSelect.positionLevel = "";
-  formPositionSelect.positionExecutive = "";
-  formPositionSelect.positionExecutiveField = "";
-  formPositionSelect.positionArea = "";
-}
-
-/**
- * ส่งค่า css ออกไปตามเงื่อนไข
- * @param val true/false
- */
-function inputEdit(val: boolean) {
-  return {
-    "full-width cursor-pointer inputgreen ": val,
-    "full-width cursor-pointer inputgreen": !val,
-  };
-}
-
-/** function เรียกรายการประเภทตำแหน่ง */
-async function fetchType() {
-  showLoader();
-  await http
-    .get(config.API.orgPosType)
-    .then((res) => {
-      const data = res.data.result;
-      dataLevel.value = data;
-      typeOpsMain.value = data.map((e: OptionType) => ({
-        id: e.id,
-        name: e.posTypeName,
-      }));
-      typeOps.value = typeOpsMain.value;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1000);
-    });
-}
-
-/** function เรียกรายการตำแหน่งทางการบริหาร */
-async function fetchExecutive() {
-  showLoader();
-  await http
-    .get(config.API.orgPosExecutive)
-    .then((res) => {
-      executiveOpsMain.value = res.data.result.map((e: OptionExecutive) => ({
-        id: e.id,
-        name: e.posExecutiveName,
-      }));
-      executiveOps.value = executiveOpsMain.value;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1000);
-    });
-}
-
-watch(
-  () => modal.value,
-  () => {
-    if (modal.value == true) {
-      fetchType();
-      fetchExecutive();
-      if (editCheck.value) {
-        const dataList = formData.value;
-        setTimeout(() => {
-          updateSelectType(dataList.posTypeId);
-        }, 1000);
-        formPositionSelect.positionId = dataList.positionId;
-        formPositionSelect.positionName = dataList.positionName;
-        formPositionSelect.positionField = dataList.positionField;
-        formPositionSelect.positionType = dataList.positionType;
-        formPositionSelect.positionLevel = dataList.positionLevel;
-        formPositionSelect.positionExecutive = dataList.positionExecutive;
-        formPositionSelect.positionExecutiveField =
-          dataList.positionExecutiveField;
-        formPositionSelect.positionArea = dataList.positionArea;
-        isSpecial.value = dataList.isSpecial;
-      }
-    }
-  }
-);
-
-function updateSelectType(val: string) {
-  const listLevel = dataLevel.value.find((e: any) => e.id === val);
-  levelOpsMain.value = listLevel.posLevels.map((e: OptionLevel) => ({
-    id: e.id,
-    name: e.posLevelName,
-  }));
-  levelOps.value = levelOpsMain.value;
-}
-
-function close() {
-  modal.value = false;
-  editCheck.value = false;
-  clearFormPositionSelect();
-}
-</script>
-
-<template>
-  <q-dialog v-model="modal" persistent>
-    <q-card style="min-width: 50vw">
-      <form @submit.prevent="validateFormPositionEdit">
-        <DialogHeader
-          :tittle="`${editCheck ? 'แก้ไขข้อมูลตำแหน่ง' : 'เพิ่มข้อมูลตำแหน่ง'}`"
-          :close="close"
-        />
-        <q-separator />
-
-        <q-card-section>
-          <div class="row q-col-gutter-sm col-12">
-            <div class="col-12">
-              <q-input
-                ref="positionNameRef"
-                v-model="formPositionSelect.positionName"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionName"
-                label="ตำแหน่งในสายงาน"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งในสายงาน'}`]"
-              />
-            </div>
-            <div class="col-6">
-              <q-input
-                ref="positionAreaRef"
-                v-model="formPositionSelect.positionArea"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionArea"
-                label="ด้าน/สาขา"
-                lazy-rules
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-6">
-              <q-input
-                ref="positionFieldRef"
-                v-model="formPositionSelect.positionField"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionField"
-                label="สายงาน"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณากรอกสายงาน'}`]"
-              />
-            </div>
-            <div class="col-6">
-              <q-select
-                ref="positionTypeRef"
-                :class="inputEdit(isReadonly)"
-                label="ประเภทตำแหน่ง"
-                v-model="formPositionSelect.positionType"
-                :options="typeOps"
-                emit-value
-                dense
-                @update:model-value="updateSelectType"
-                map-options
-                outlined
-                option-label="name"
-                option-value="id"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณาเลือกประเภทตำแหน่ง'}`]"
-              />
-            </div>
-            <div class="col-6">
-              <q-select
-                ref="positionLevelRef"
-                :class="inputEdit(isReadonly)"
-                label="ระดับตำแหน่ง"
-                v-model="formPositionSelect.positionLevel"
-                :disable="formPositionSelect.positionType === ''"
-                :options="levelOps"
-                emit-value
-                dense
-                map-options
-                outlined
-                option-label="name"
-                option-value="id"
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val) => !!val || `${'กรุณาเลือกระดับตำแหน่ง'}`]"
-              />
-            </div>
-            <div class="col-6">
-              <q-select
-                ref="positionExecutiveRef"
-                :class="inputEdit(isReadonly)"
-                label="ตำแหน่งทางการบริหาร"
-                v-model="formPositionSelect.positionExecutive"
-                :options="executiveOps"
-                emit-value
-                dense
-                map-options
-                outlined
-                option-label="name"
-                option-value="id"
-                lazy-rules
-                hide-bottom-space
-                clearable
-              />
-            </div>
-            <div class="col-6">
-              <q-input
-                ref="positionExecutiveFieldRef"
-                v-model="formPositionSelect.positionExecutiveField"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionExecutiveField"
-                label="ด้านทางการบริหาร"
-                lazy-rules
-                hide-bottom-space
-              />
-            </div>
-
-            <div class="col-6 self-center">
-              <q-checkbox
-                size="md"
-                v-model="isSpecial"
-                label="เฉพาะสายงานที่กำหนด"
-              />
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn type="submit" :label="`บันทึก`" color="public" />
-        </q-card-actions>
-      </form>
-    </q-card>
-  </q-dialog>
-</template>
diff --git a/src/modules/01_metadataNew/router.ts b/src/modules/01_metadataNew/router.ts
deleted file mode 100644
index 94f8fdcbc..000000000
--- a/src/modules/01_metadataNew/router.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-const calendarWorkPage = () =>
-  import("@/modules/01_metadataNew/views/calendar.vue");
-const masterInsignia = () =>
-  import("@/modules/01_metadataNew/views/insignia.vue");
-const detailInsignia = () =>
-  import("@/modules/01_metadataNew/components/insignia/InsigniaDetail.vue");
-const personalPage = () =>
-  import("@/modules/01_metadataNew/views/personal.vue");
-const personalDistrict = () =>
-  import("@/modules/01_metadataNew/components/personal/province/01_District.vue");
-const personalSubDistrict = () =>
-  import("@/modules/01_metadataNew/components/personal/province/02_SubDistrict.vue");
-const positionPage = () =>
-  import("@/modules/01_metadataNew/views/position.vue");
-const positionLevelPage = () =>
-  import("@/modules/01_metadataNew/components/position/03ListLevel.vue");
-const positionEmployeePage = () =>
-  import("@/modules/01_metadataNew/views/positionEmployee.vue");
-const positionEmployeeLevelPage = () =>
-  import(
-    "@/modules/01_metadataNew/components/position-employee/03ListLevel.vue"
-  );
-
-const IndicatorByPlan = () =>
-  import("@/modules/01_metadataNew/views/indicatorByPlan.vue");
-const IndicatorByPlanDetail = () =>
-  import(
-    "@/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue"
-  );
-const IndicatorByRole = () =>
-  import("@/modules/01_metadataNew/views/indicatorByRole.vue");
-const IndicatorByRoleDetail = () =>
-  import(
-    "@/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue"
-  );
-const competencyPage = () =>
-  import("@/modules/01_metadataNew/views/competency.vue");
-const competencyAddPage = () =>
-  import("@/modules/01_metadataNew/components/competency/AddPage.vue");
-const StrategicView = () =>
-  import("@/modules/01_metadataNew/views/Strategic.vue");
-const AssignmentView = () =>
-  import("@/modules/01_metadataNew/views/Assignment.vue");
-const AssignmentDetailView = () =>
-  import(
-    "@/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue"
-  );
-
-export default [
-  {
-    path: "/master-data/calendar",
-    name: "masterCalendarWork",
-    component: calendarWorkPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/insignia",
-    name: "masterInsignia",
-    component: masterInsignia,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/insignia/detail/:id",
-    name: "masterInsigniadetail",
-    component: detailInsignia,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/personal",
-    name: "masterPersonal",
-    component: personalPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/personal/district/:id",
-    name: "masterPersonalDistrict",
-    component: personalDistrict,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/personal/sub-district/:provinceId/:id",
-    name: "masterPersonalSubDistrict",
-    component: personalSubDistrict,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/position",
-    name: "masterPosition",
-    component: positionPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/position/level/:id",
-    name: "masterPositionLevel",
-    component: positionLevelPage,
-    meta: {
-      Auth: true,
-      Key: [9],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/position-employee",
-    name: "masterPositionEmployee",
-    component: positionEmployeePage,
-    meta: {
-      Auth: true,
-      Key: [8],
-      Role: "metadata",
-    },
-  },
-  {
-    path: "/master-data/position-employee/level/:id",
-    name: "masterPositionEmployeeLevel",
-    component: positionEmployeeLevelPage,
-    meta: {
-      Auth: true,
-      Key: [9],
-      Role: "metadata",
-    },
-  },
-
-  {
-    path: "/KPI-indicator-plan",
-    name: "KPIIndicatorByPlan",
-    component: IndicatorByPlan,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-
-  {
-    path: "/KPI-indicator-plan/add",
-    name: "KPIIndicatorByPlan/Add",
-    component: IndicatorByPlanDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-plan/:id",
-    name: "KPIIndicatorByPlanByid",
-    component: IndicatorByPlanDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-role",
-    name: "KPIIndicatorByRole",
-    component: IndicatorByRole,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-role/add",
-    name: "KPIIndicatorByRoleAdd",
-    component: IndicatorByRoleDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-role/:id",
-    name: "KPIIndicatorByRoleByid",
-    component: IndicatorByRoleDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-competency",
-    name: "KPICompetency",
-    component: competencyPage,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-competency/add",
-    name: "KPICompetencyAdd",
-    component: competencyAddPage,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-competency/:id",
-    name: "KPICompetencyByid",
-    component: competencyAddPage,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-
-  {
-    path: "/strategic",
-    name: "strategic",
-    component: StrategicView,
-    meta: {
-      Auth: true,
-      Key: [1.6],
-      Role: "development",
-    },
-  },
-  {
-    path: "/assignment",
-    name: "KPIAssignment",
-    component: AssignmentView,
-    meta: {
-      Auth: true,
-      Key: [1.6],
-      Role: "development",
-    },
-  },
-  {
-    path: "/assignment/:id",
-    name: "KPIAssignmentById",
-    component: AssignmentDetailView,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-];
diff --git a/src/modules/16_positionEmployee/components/DialogAddPosition.vue b/src/modules/16_positionEmployee/components/DialogAddPosition.vue
index 800ec9c63..dfc4bcf65 100644
--- a/src/modules/16_positionEmployee/components/DialogAddPosition.vue
+++ b/src/modules/16_positionEmployee/components/DialogAddPosition.vue
@@ -10,8 +10,8 @@ import config from "@/app.config";
 import type {
   ResGroup,
   ResLevel,
-} from "@/modules/01_metadataNew/interface/response/positionEmployee/Main";
-import type { ObjectPosRef } from "@/modules/01_metadataNew/interface/index/positionEmployee";
+} from "@/modules/01_masterdata/interface/response/positionEmployee/Main";
+import type { ObjectPosRef } from "@/modules/01_masterdata/interface/index/positionEmployee";
 import type { DataOption } from "@/modules/16_positionEmployee/interface/index/Main";
 import type { OptionType } from "@/modules/16_positionEmployee/interface/response/organizational";
 
diff --git a/src/router/index.ts b/src/router/index.ts
index a52150311..33b085791 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,14 +5,14 @@ const Dashboard = () => import("@/views/Dashboard.vue");
 const Error404NotFound = () => import("@/views/Error404NotFound.vue");
 const loginView = () => import("@/views/login.vue");
 
-import ModuleMetadata from "@/modules/01_metadata/router";
-import ModuleMetadataNew from "@/modules/01_metadataNew/router";
-import ModuleOrganizational from "@/modules/02_organizational/router";
+// import ModuleMetadata from "@/modules/01_metadata/router";
+import ModuleMetadataNew from "@/modules/01_masterdata/router";
+// import ModuleOrganizational from "@/modules/02_organizational/router";
 import ModuleOrganizationalNew from "@/modules/02_organizationalNew/router";
 import ModulePositionEmployee from "@/modules/16_positionEmployee/router";
 import ModuleRecruiting from "@/modules/03_recruiting/router";
-import ModuleRecruitingNew from "@/modules/04_registryNew/router";
-import ModuleRegistry from "@/modules/04_registry/router";
+import ModuleRegistryNew from "@/modules/04_registryNew/router";
+// import ModuleRegistry from "@/modules/04_registry/router";
 import ModulePlacement from "@/modules/05_placement/router";
 import ModuleRetirement from "@/modules/06_retirement/router";
 import ModuleInsignia from "@/modules/07_insignia/router";
@@ -44,18 +44,17 @@ const router = createRouter({
           component: Dashboard,
           meta: {
             Auth: true,
-            Key: [7],
-            Role: "dashboard",
+            Key: "HOME",
           },
         },
-        ...ModuleMetadata,
+        // ...ModuleMetadata,
         ...ModuleMetadataNew,
-        ...ModuleOrganizational,
+        // ...ModuleOrganizational,
         ...ModuleOrganizationalNew,
         ...ModulePositionEmployee,
         ...ModuleRecruiting,
-        ...ModuleRecruitingNew,
-        ...ModuleRegistry,
+        // ...ModuleRegistry,
+        ...ModuleRegistryNew,
         ...ModulePlacement,
         ...ModuleRetirement,
         ...ModuleInsignia,
diff --git a/src/stores/menuList.ts b/src/stores/menuList.ts
index fcb1ca613..4682dd3be 100644
--- a/src/stores/menuList.ts
+++ b/src/stores/menuList.ts
@@ -32,14 +32,29 @@ export const useMenuDataStore = defineStore("menuUse", () => {
       {
         sysName: "ตามแผน",
         path: "KPIIndicatorByPlan",
+        meta: {
+          Auth: true,
+          Key: "SYS_EVA_INDICATOR",
+          Role: "STAFF",
+        },
       },
       {
         sysName: "ตามตำแหน่ง",
         path: "KPIIndicatorByRole",
+        meta: {
+          Auth: true,
+          Key: "SYS_EVA_INDICATOR",
+          Role: "STAFF",
+        },
       },
       {
         sysName: "งานที่ได้รับมอบหมาย",
         path: "KPIAssignment",
+        meta: {
+          Auth: true,
+          Key: "SYS_EVA_INDICATOR",
+          Role: "STAFF",
+        },
       },
     ],
     SYS_EXAM_CONTEST: [
@@ -109,7 +124,7 @@ export const useMenuDataStore = defineStore("menuUse", () => {
             if (!q.children) {
               q.children = [];
             }
-            // เพิ้ม ข้อมูลเลเวล 3
+            // เพิ่มเมนูเลเวล 3
             q.children.push(...config);
           }
         });
@@ -119,14 +134,14 @@ export const useMenuDataStore = defineStore("menuUse", () => {
   }
 
   /****************** สิทธิ์ **************************/
-  const dataPermissions = ref<DataPermissions>();
+  const permissions = ref<DataPermissions>();
 
   /**
    * function เรียก
    * @param data ข้อมูลสิทธิ์
    */
   function fetchDataPermission(data: DataPermissions) {
-    dataPermissions.value = data;
+    permissions.value = data;
   }
 
   return {
@@ -135,6 +150,6 @@ export const useMenuDataStore = defineStore("menuUse", () => {
     menuList,
     /****************** สิทธิ์ **************************/
     fetchDataPermission,
-    dataPermissions,
+    permissions,
   };
 });
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
new file mode 100644
index 000000000..b65c1bc53
--- /dev/null
+++ b/src/utils/permissions.ts
@@ -0,0 +1,19 @@
+/**
+ * Function สำหรับเช็ค permission ของ user
+ */
+import { useMenuDataStore } from "@/stores/menuList";
+import type { RoleData } from "@/interface/main";
+
+const storeMenu = useMenuDataStore();
+
+export function checkPermission(route: any): RoleData | null {
+  if (storeMenu.permissions && route.meta.Key) {
+    const role =
+      storeMenu.permissions.roles.find((item) =>
+        item.authSysId.includes(route.meta.Key)
+      ) ?? null;
+    return role;
+  } else {
+    return null;
+  }
+}
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 548d8be97..ac204ca6f 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -16,11 +16,7 @@ import type {
   notiType,
   optionType,
 } from "../interface/request/main/main";
-import {
-  menuList,
-  tabList,
-  tabListPlacement,
-} from "../interface/request/main/main";
+import { tabList, tabListPlacement } from "../interface/request/main/main";
 import { useroleUserDataStore } from "@/stores/roleUser";
 
 const { setVerticalScrollPosition, getVerticalScrollPosition } = scroll;
@@ -483,6 +479,7 @@ watch(
   }
 );
 
+/** ฟังก์ชั่นเช็ค redirect คู่มือการใช้งานระบบ */
 const handleButtonClick = () => {
   const currentPath = route.name;
   const queryParams = { role: "officer" }; // Replace with your query parameters
@@ -829,21 +826,14 @@ function fetchPermissionsSys() {
                         <!-- เมนูย่อย 2 ชั้น -->
                         <div
                           v-if="
-                            menuItem.id == 'SYS_EVA_METADATA' ||
-                            menuItem.id == 'SYS_EXAM' ||
-                            menuItem.id == 'SYS_DISCIPLINE' ||
-                            menuItem.id == 'SYS_EVA'
+                            menuItem.children && menuItem.children.length > 0
                           "
                         >
                           <q-item
                             dense
                             clickable
                             v-if="
-                              subMenu.id == 'SYS_EVA_INDICATOR' ||
-                              subMenu.id == 'SYS_EXAM_CONTEST' ||
-                              subMenu.id == 'SYS_EXAM_SELECT' ||
-                              subMenu.id == 'SYS_DISCIPLINE_INFO' ||
-                              subMenu.id == 'SYS_EVA_INFO'
+                              subMenu.children && subMenu.children.length > 0
                             "
                           >
                             <q-item-section
@@ -983,26 +973,13 @@ function fetchPermissionsSys() {
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
-                <div
-                  v-if="
-                    menuItem.id == 'SYS_EVA_METADATA' ||
-                    menuItem.id == 'SYS_EXAM' ||
-                    menuItem.id == 'SYS_DISCIPLINE' ||
-                    menuItem.id == 'SYS_EVA'
-                  "
-                >
+                <div v-if="menuItem.children && menuItem.children.length > 0">
                   <div v-for="(subMenu, i) in menuItem.children" :key="i">
                     <q-expansion-item
                       switch-toggle-side
                       dense-toggle
                       :label="subMenu.sysName"
-                      v-if="
-                        subMenu.id == 'SYS_EVA_INDICATOR' ||
-                        subMenu.id == 'SYS_EXAM_CONTEST' ||
-                        subMenu.id == 'SYS_EXAM_SELECT' ||
-                        subMenu.id == 'SYS_DISCIPLINE_INFO' ||
-                        subMenu.id == 'SYS_EVA_INFO'
-                      "
+                      v-if="subMenu.children && subMenu.children.length > 0"
                       class="expan2"
                       dense
                     >