diff --git a/src/modules/00_support/router.ts b/src/modules/00_support/router.ts
index d2762cfc7..9e7f32720 100644
--- a/src/modules/00_support/router.ts
+++ b/src/modules/00_support/router.ts
@@ -2,7 +2,7 @@ const supportMain = () => import("@/modules/00_support/views/MainPage.vue");
 const supportCategory = () =>
   import("@/modules/00_support/views/ManageCategory.vue");
 
-const testView = () => import("@/views/TestManagement.vue");
+// const testView = () => import("@/views/TestManagement.vue");
 
 export default [
   {
@@ -26,14 +26,14 @@ export default [
     },
   },
 
-  {
-    path: "/test",
-    name: "testView",
-    component: testView,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "support",
-    },
-  },
+  // {
+  //   path: "/test",
+  //   name: "testView",
+  //   component: testView,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "support",
+  //   },
+  // },
 ];
diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
index 034445d6d..3a6fb8e4e 100644
--- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
+++ b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
@@ -625,11 +625,11 @@ watch([() => page.value, () => pageSize.value], () => {
                   />
                   <div class="col-12">
                     <d-table
-                      ref="table"
-                      flat
-                      :columns="columnsResult"
-                      :rows="rowResult"
-                      row-key="id"
+                    ref="table"
+                    flat
+                    :columns="columnsResult"
+                    :rows="rowResult"
+                    row-key="id"
                       dense
                       class="custom-header-table"
                       :paging="true"
@@ -637,6 +637,7 @@ watch([() => page.value, () => pageSize.value], () => {
                       @update:pagination="updatePagination"
                       selection="single"
                       v-model:selected="selectedProfile"
+                      :visible-columns="visibleColumnsResult"
                     >
                       <template v-slot:header="props">
                         <q-tr :props="props">
@@ -687,7 +688,7 @@ watch([() => page.value, () => pageSize.value], () => {
                           active-color="primary"
                           color="dark"
                           :max="totalPage"
-                           :max-pages="5"
+                          :max-pages="5"
                           size="sm"
                           boundary-links
                           direction-links
diff --git a/src/modules/05_placement/components/PersonalDetail/Education.vue b/src/modules/05_placement/components/PersonalDetail/Education.vue
index 6215e1905..a6695458f 100644
--- a/src/modules/05_placement/components/PersonalDetail/Education.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Education.vue
@@ -383,8 +383,11 @@ const clickNext = async () => {
  */
 const getData = () => {
   const row = rows.value[rowIndex.value];
+  const checkLevelEducation = OpsFilter.value.levelOptions.find(
+    (e) => e.id === row.educationLevelId
+  );
 
-  levelId.value = row.educationLevelId;
+  levelId.value = checkLevelEducation ? row.educationLevelId : "";
   isDate.value = row.isDate;
   isEducation.value = row.isEducation;
   //   positionPathId.value = resultPath;
@@ -494,7 +497,7 @@ const saveData = async () => {
       messageError($q, e);
     })
     .finally(async () => {
-      await props.fetch('Education');
+      await props.fetch("Education");
       rows.value = props.data;
     });
 };
@@ -503,12 +506,6 @@ const saveData = async () => {
  * บันทึกแก้ไขข้อมูล
  */
 const editData = async () => {
-  //   const filter = OpsFilter.value.levelOptions.filter(
-  //     (r: any) => r.id == levelId.value
-  //   );
-  //   const filterPositionPath = OpsFilter.value.positionPathOptions.filter(
-  //     (r: any) => r.id == positionPathId.value
-  //   );
   showLoader();
   await http
     .put(config.API.placementEducationId(route.params.personalId.toString()), {
@@ -544,7 +541,7 @@ const editData = async () => {
       messageError($q, e);
     })
     .finally(async () => {
-      await props.fetch('Education');
+      await props.fetch("Education");
       rows.value = props.data;
     });
 };
@@ -559,18 +556,16 @@ const deletePlacementEducation = async () => {
   showLoader();
   await http
     .delete(config.API.placementEducationId(id.value))
-    .then(async(res) => {
+    .then(async (res) => {
       success($q, "ลบข้อมูลสำเร็จ");
       modal.value = false;
-      await props.fetch('Education');
+      await props.fetch("Education");
       rows.value = props.data;
     })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
-
-    });
+    .finally(async () => {});
 };
 
 /**
@@ -600,12 +595,17 @@ const clickClose = async () => {
  * @param _props ค่า props ใน row ที่เลือก
  */
 const selectData = async (_props: DataProps) => {
+  const checkLevelEducation = OpsFilter.value.levelOptions.find(
+    (e) => e.id === _props.row.educationLevelId
+  );
+
   modalEdit.value = true;
   modal.value = true;
   edit.value = false;
   rawItem.value = _props.row;
   rowIndex.value = _props.rowIndex;
-  levelId.value = _props.row.educationLevelId;
+  levelId.value = checkLevelEducation ? _props.row.educationLevelId : "";
+
   //   positionPathId.value = resultPath;
   //   levelId.value = _props.row.levelId;
   //   positionPathId.value = _props.row.positionPathId;
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index c3d6187b8..8b8bdbca9 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -299,8 +299,6 @@ function deleteProductivitys(item: number) {
   }
 }
 
-
-
 /** get ข้อมูล */
 async function getUser() {
   await http
@@ -2341,6 +2339,7 @@ onMounted(async () => {
                   การเรียนรู้ด้วยตนเองเพื่อให้มีความรู้เกี่ยวกับกฎหมายกฎระเบียบแบบแผนของทางราชการ
                 </div>
                 <div class="col-12 text-top2 row items-center">
+                  c
                   <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
                   4.3
                   การอบรมสัมมนาร่วมกันเพื่อปลูกฝังการประพฤติปฏิบัติตนเป็นข้าราชการที่ดี
@@ -2497,12 +2496,11 @@ onMounted(async () => {
 
                 <div class="col-xs-12 col-sm-4">
                   <datepicker
-                    menu-class-name="modalfix"
                     v-model="date1"
                     :locale="'th'"
                     autoApply
                     :readonly="isEdit != true"
-                    borderless
+                    
                     :enableTimePicker="false"
                     week-start="0"
                   >
@@ -2518,9 +2516,7 @@ onMounted(async () => {
                         :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                         :readonly="isEdit != true"
                         dense
-                        borderless
                         :outlined="isEdit == true"
-                        class="full-width datepicker"
                         :model-value="date1 != null ? date2Thai(date1) : null"
                         label="ลงวันที่"
                         bg-color="white"
@@ -2600,11 +2596,10 @@ onMounted(async () => {
 
                 <div class="col-xs-12 col-sm-4">
                   <datepicker
-                    menu-class-name="modalfix"
                     v-model="date2"
                     :locale="'th'"
                     autoApply
-                    borderless
+                    
                     :enableTimePicker="false"
                     :readonly="isEdit != true"
                     week-start="0"
@@ -2621,9 +2616,9 @@ onMounted(async () => {
                         :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                         :readonly="isEdit != true"
                         dense
-                        borderless
+                        
                         :outlined="isEdit == true"
-                        class="full-width datepicker"
+                        
                         :model-value="date2 != null ? date2Thai(date2) : null"
                         label="ลงวันที่"
                         bg-color="white"
@@ -2695,11 +2690,11 @@ onMounted(async () => {
 
                 <div class="col-xs-12 col-sm-4">
                   <datepicker
-                    menu-class-name="modalfix"
+                    
                     v-model="date3"
                     :locale="'th'"
                     autoApply
-                    borderless
+                    
                     :enableTimePicker="false"
                     week-start="0"
                     :readonly="isEdit != true || !caretaker2"
@@ -2721,9 +2716,9 @@ onMounted(async () => {
                             ? [(val) => !!val || 'กรุณาเลือกวันที่']
                             : []
                         "
-                        borderless
+                        
                         :outlined="isEdit == true"
-                        class="full-width datepicker"
+                      
                         :model-value="
                           caretaker2 != null ? date2Thai(date3) : null
                         "
@@ -2806,7 +2801,7 @@ onMounted(async () => {
 
                 <div class="col-xs-12 col-sm-4">
                   <datepicker
-                    menu-class-name="modalfix"
+                    
                     v-model="date4"
                     :locale="'th'"
                     autoApply
@@ -2827,9 +2822,9 @@ onMounted(async () => {
                         :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                         :readonly="isEdit != true"
                         dense
-                        borderless
+                        
                         :outlined="isEdit == true"
-                        class="full-width datepicker"
+                      
                         :model-value="date4 != null ? date2Thai(date4) : null"
                         label="ลงวันที่"
                         bg-color="white"
@@ -2925,6 +2920,7 @@ onMounted(async () => {
     </div>
   </q-form>
 </template>
+
 <style lang="scss" scoped>
 .border_y {
   border-left: 1px solid #d8d8d8;
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 257a12f12..9cff5b3e1 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -274,11 +274,15 @@ function changtypeOc() {
 
 /** function เพิ่มรายชื่อ*/
 async function clickmodalAdd() {
+  await clearForm();
   let ocId = DataStore.typeOc ? DataStore.typeOc : DataStore.agency;
   // showLoader();
   await fecthInsignia();
   await fecthlistperson(ocId);
-  clearForm();
+}
+
+function onCloseModalAdd() {
+  modalAdd.value = false;
 }
 
 const maxPage = ref<number>(0);
@@ -662,6 +666,9 @@ function clearForm() {
   dataPerson.level = "";
   reason.value = "";
   insigniaType.value = "";
+  formFilter.page = 1;
+  formFilter.searchField = "citizenId";
+  formFilter.searchKeyword = "";
 }
 
 const insignia = ref<string>("");
@@ -1227,8 +1234,9 @@ onMounted(async () => {
   <!-- add -->
   <q-dialog v-model="modalAdd" persistent>
     <q-card style="width: 900px; max-width: 80vw">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
+      <DialogHeader tittle="เพิ่มรายชื่อ" :close="onCloseModalAdd" />
+      <!-- <q-toolbar class="q-py-md">
+        <q-toolbar-title class="text-h6"> </q-toolbar-title>
 
         <q-btn
           icon="close"
@@ -1244,7 +1252,7 @@ onMounted(async () => {
           "
           style="color: #ff8080; background-color: #ffdede"
         />
-      </q-toolbar>
+      </q-toolbar> -->
       <q-separator />
       <q-card-section class="q-pa-sm bg-grey-1">
         <div class="row col-12 q-col-gutter-sm">
@@ -1423,7 +1431,7 @@ onMounted(async () => {
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <q-btn dense unelevated label="บันทึก" color="public" @click="clickAdd">
+        <q-btn unelevated label="บันทึก" color="public" @click="clickAdd">
           <q-tooltip>บันทึก</q-tooltip>
         </q-btn>
       </q-card-actions>
diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue
index 1521ab657..54436aa0e 100644
--- a/src/modules/13_salary/views/salaryEmployeeLists.vue
+++ b/src/modules/13_salary/views/salaryEmployeeLists.vue
@@ -53,7 +53,6 @@ const nextPage = ref<number>(1);
 
 /**function เรียกข้อมูลรอบการขึ้นค่าจ้าง*/
 function getRound() {
-  roundOptions.value = [];
   isDisable.value = false;
   showLoader();
   http
@@ -62,11 +61,13 @@ function getRound() {
         `?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
     )
     .then(async (res) => {
+      roundOptions.value = [];
+      roundFilter.value = [];
       const data = res.data.result.data;
       if (data.length !== 0) {
         isDisable.value = true;
         lastPage.value = Math.ceil(res.data.result.total / pageSize.value);
-        const optionMain = await data.map((x: DataRound) => ({
+        roundOptions.value = await data.map((x: DataRound) => ({
           id: x.id,
           revisionId: x.revisionId,
           shortCode: x.period,
@@ -79,9 +80,7 @@ function getRound() {
               ? "รอบพิเศษ "
               : "รอบเมษายน ",
         }));
-        roundOptions.value.push(...optionMain);
 
-        roundFilter.value = await [];
         roundFilter.value = await (roundOptions.value
           ? roundOptions.value[0]
           : "");
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 1da848cc3..768f34958 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -52,7 +52,6 @@ const nextPage = ref<number>(1);
 
 /**function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
 function getRound() {
-  roundOptions.value = [];
   showLoader();
   isDisable.value = false;
   http
@@ -61,11 +60,13 @@ function getRound() {
         `?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
     )
     .then(async (res) => {
+      roundOptions.value = [];
+      roundFilter.value = [];
       const data = res.data.result.data;
       if (data.length !== 0) {
         isDisable.value = true;
         lastPage.value = Math.ceil(res.data.result.total / pageSize.value);
-        const optionMain = await data.map((x: DataRound) => ({
+        roundOptions.value = await data.map((x: DataRound) => ({
           id: x.id,
           revisionId: x.revisionId,
           shortCode: x.period,
@@ -78,9 +79,7 @@ function getRound() {
               ? "รอบพิเศษ "
               : "รอบเมษายน ",
         }));
-        roundOptions.value.push(...optionMain);
 
-        roundFilter.value = await [];
         roundFilter.value = await (roundOptions.value
           ? roundOptions.value[0]
           : "");
@@ -348,14 +347,13 @@ onMounted(() => {
     </div>
     <q-space />
     <datepicker
-      menu-class-name="modalfix"
       v-model="year"
       :locale="'th'"
       autoApply
       year-picker
       :enableTimePicker="false"
       style="width: 150px"
-      @update:model-value="getRound"
+      @update:model-value="getRound()"
     >
       <template #year="{ year }">{{ year + 543 }}</template>
       <template #year-overlay-value="{ value }">{{
diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index 5dadefdf7..61e26f8b3 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -216,7 +216,7 @@ onMounted(() => {
     ]).finally(() => {
       setTimeout(() => {
         hideLoader();
-      }, 2000);
+      }, 2500);
     });
 });
 </script>
diff --git a/src/modules/14_KPI/components/Tab/04_Result.vue b/src/modules/14_KPI/components/Tab/04_Result.vue
index 54893b488..a2f529859 100644
--- a/src/modules/14_KPI/components/Tab/04_Result.vue
+++ b/src/modules/14_KPI/components/Tab/04_Result.vue
@@ -198,8 +198,12 @@ function getData() {
 }
 
 onMounted(() => {
-  getData();
-  fetchEvaluation();
+  showLoader();
+  Promise.all([fetchEvaluation(), getData()]).finally(() => {
+    setTimeout(() => {
+      hideLoader();
+    }, 3000);
+  });
 });
 </script>
 
diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue
index a397da424..f499aa22d 100644
--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@@ -62,7 +62,14 @@ const isReadonly = <boolean>(route.name === "KPIEditEvaluator" ? true : false);
 const store = useKpiDataStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, dialogConfirm, success ,findOrgName} = mixin;
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  dialogConfirm,
+  success,
+  findOrgName,
+} = mixin;
 
 const evaluatorIdOp = ref<DataOption[]>([]);
 const commanderIdOp = ref<DataOption[]>([]);
@@ -95,25 +102,15 @@ async function fetchEvaluation() {
     .then(async (res) => {
       const data = res.data.result;
       store.dataEvaluation = await data;
-      // store.dataProfile = await data;
       formProfile.status = store.convertStatus(data.evaluationStatus);
       formProfile.result = store.convertResults(data.evaluationResults);
       store.checkCompetency();
       store.checkCompetencyDefaultCompetencyLevel();
 
       fetchProfile(data.profileId);
-
-      // plannedPoint.value = data.plannedPoint == null ? "" : data.plannedPoint;
-      // rolePoint.value = data.rolePoint == null ? "" : data.rolePoint;
-      // specialPoint.value = data.specialPoint == null ? "" : data.specialPoint;
-      // capacityPoint.value =
-      //   data.capacityPoint == null ? "" : data.capacityPoint;
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -173,7 +170,7 @@ function onSubmit() {
 }
 async function getOrgOp() {
   http
-    .get(config.API.Kpiorg+`/${store.dataProfile.profileId}`)
+    .get(config.API.Kpiorg + `/${store.dataProfile.profileId}`)
     .then((res) => {
       const data = res.data.result;
       evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({
@@ -242,50 +239,19 @@ function filterOption(val: any, update: Function, refData: string) {
   }
 }
 
-// function onSubmitScore() {
-//   showLoader();
-//   http
-//     .put(config.API.kpiScoreTotal() + `/${id.value}`, {
-//       plannedPoint: plannedPoint.value,
-//       rolePoint: rolePoint.value,
-//       specialPoint: specialPoint.value,
-//       capacityPoint: capacityPoint.value,
-//     })
-//     .then(async (res) => {
-//       await fetchEvaluation();
-//       success($q, "บันทึกสำเร็จ");
-//       modalScore.value = false;
-//     })
-//     .catch((e) => {
-//       messageError($q, e);
-//     })
-//     .finally(() => {
-//       hideLoader();
-//     });
-// }
-
-// async function clearScore() {
-//   modalScore.value = false;
-//   plannedPoint.value = "";
-//   rolePoint.value = "";
-//   specialPoint.value = "";
-//   capacityPoint.value = "";
-//   getAll();
-// }
 async function getProfile() {
   await http
     .get(config.API.profilePosition + `/${store.dataEvaluation.profileId}`)
     .then(async (res) => {
       const data = await res.data.result;
       store.dataProfile = await data;
-      await store.checkStep();
+      await setTimeout(() => {
+        store.checkStep();
+      }, 800);
     })
     .catch((e) => {
       messageError($q, e);
     });
-  // .finally(() => {
-  //   hideLoader();
-  // });
 }
 async function getAll() {
   await fetchEvaluation();
@@ -345,31 +311,7 @@ function sendToEvaluateEvaluatore() {
     "ต้องการยืนยันส่งให้ผู้ประเมินรายงานผลสำเร็จของงานใช่หรือไม่?"
   );
 }
-// function sendToSummary(status: string) {
-//   dialogConfirm(
-//     $q,
-//     () => {
-//       if (id.value) {
-//         showLoader();
-//         http
-//           .get(config.API.kpiSendToSummary(id.value))
-//           .then((res) => {
-//             success($q, "ส่งไปสรุปผลการประเมินสำเร็จ");
-//             getAll();
-//             store.tabMain = "4";
-//           })
-//           .catch((e) => {
-//             messageError($q, e);
-//           })
-//           .finally(() => {
-//             hideLoader();
-//           });
-//       }
-//     },
-//     "ยืนยันการส่งไปสรุปผลการประเมิน",
-//     "ต้องการยืนยันส่งไปสรุปผลการประเมินใช่หรือไม่?"
-//   );
-// }
+
 function requireEdit() {
   dialogConfirm(
     $q,
@@ -494,7 +436,6 @@ async function fetchProfileEvaluator(id: string) {
 }
 
 onMounted(async () => {
-
   store.isUpdate = await false;
   await getAll();
 });
@@ -526,9 +467,6 @@ onMounted(async () => {
         <q-img src="@/assets/avatar_user.jpg" v-else />
       </q-avatar>
     </div>
-    <!-- <div class="row text-center">
-        
-          </div> -->
 
     <div
       v-if="$q.screen.gt.xs"
@@ -696,7 +634,7 @@ onMounted(async () => {
                 color="grey-2"
                 text-color="edit"
                 size="md"
-                @click="modalEdit = true,getOrgOp()"
+                @click="(modalEdit = true), getOrgOp()"
               >
                 <q-tooltip>{{
                   store.dataEvaluation.evaluationStatus === "NEW" &&
@@ -1232,7 +1170,6 @@ onMounted(async () => {
   </q-dialog> -->
   <DialogGovernment v-model:modal="modalGovernment" />
 
-
   <!-- <DialogStatus
     v-model:modal="modalStatus"
     v-model:is-probation="store.dataProfile.isProbation"
diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index ce55c4d3d..335fedf20 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -231,9 +231,9 @@ onMounted(async () => {
                   dense
                   outlined
                   hide-bottom-space
-                  :model-value="!!year ? year + 543 : null"
+                  :model-value="year === null ? 'ทั้งหมด' : Number(year) + 543"
                   :label="`${'ปีงบประมาณ'}`"
-                  clearable
+                  :clearable="year !== null"
                   @clear="clearYear"
                 >
                   <template v-slot:prepend>
@@ -260,6 +260,7 @@ onMounted(async () => {
               emit-value
               map-options
               @update:model-value="changRound"
+              :disable="year === null"
             />
             <q-btn round color="primary" flat icon="add" @click="onDialog()">
               <q-tooltip>เพิ่มผู้ประเมิน</q-tooltip>
diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue
index c3cc28753..31031a75b 100644
--- a/src/modules/14_KPI/views/round.vue
+++ b/src/modules/14_KPI/views/round.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, watch } from "vue";
+import { ref, reactive, onMounted, watch, nextTick } from "vue";
 import { useQuasar, type QTableProps } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
@@ -352,6 +352,12 @@ watch(
   }
 );
 
+async function handleUpdateYear() {
+  await nextTick();
+  formQuery.page = 1;
+  fetchList();
+}
+
 onMounted(() => {
   fetchList();
 });
@@ -371,7 +377,7 @@ onMounted(() => {
           autoApply
           year-picker
           :enableTimePicker="false"
-          @update:model-value="(formQuery.page = 1), fetchList()"
+          @update:model-value="handleUpdateYear"
         >
           <template #year="{ year }">{{ year + 543 }}</template>
           <template #year-overlay-value="{ value }">{{
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index de08d05ec..d0e834468 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -290,7 +290,7 @@ onMounted(() => {
 
       <q-space />
       <div class="row q-gutter-sm">
-        <q-btn
+        <!-- <q-btn
           flat
           round
           dense
@@ -299,7 +299,7 @@ onMounted(() => {
           @click="onDownload"
         >
           <q-tooltip>ดาวน์โหลด</q-tooltip>
-        </q-btn>
+        </q-btn> -->
 
         <q-input
           standout
diff --git a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
index 8a88b0f8a..a84b50894 100644
--- a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
+++ b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
@@ -603,6 +603,7 @@ watch([() => page.value, () => pageSize.value], () => {
                       @update:pagination="updatePagination"
                       selection="single"
                       v-model:selected="selectedProfile"
+                      :visible-columns="visibleColumnsResult"
                     >
                       <template v-slot:header="props">
                         <q-tr :props="props">
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 562d30cd6..2238acb78 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -426,7 +426,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     } else {
       console.error("err===>", e); // ***
 
-      if (e.message) {
+      if (e.message && e.message !== "R is not a function") {
         q.dialog({
           component: CustomComponent,
           componentProps: {
diff --git a/src/views/TestManagement.vue b/src/views/TestManagement.vue
index 410201c10..0b3c33c12 100644
--- a/src/views/TestManagement.vue
+++ b/src/views/TestManagement.vue
@@ -1,566 +1,38 @@
 <script setup lang="ts">
-import { ref, onMounted, reactive } from "vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-/** importType*/
-import type { QTableProps } from "quasar";
-
-/** importStore*/
-import { useCounterMixin } from "@/stores/mixin";
-
-/** use*/
-const $q = useQuasar();
-const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
-
-/** โครงสร้าง*/
-const expanded = ref<Array<string>>([]);
-const filter = ref<string>("");
-const nodeTree = ref<any[]>([]);
-const nodeId = ref<string>("");
-
-/** function เรียกข้อมูลโครงสร้าง แบบปัจุบัน*/
-function fetchOrganizationActive() {
-  showLoader();
-  http
-    .get(config.API.activeOrganization)
-    .then((res) => {
-      const data = res.data.result;
-      if (data) {
-        fetchOrganization(data.activeId);
-      }
-    })
-    .catch((err) => {
-      messageError($q, err);
-      hideLoader();
-    });
+function deleteCookie(name: string, path: string = "/", domain?: string) {
+  let cookieString = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=${path};`;
+  if (domain) {
+    cookieString += ` domain=${domain};`;
+  }
+  document.cookie = cookieString;
+  console.log("Deleted cookie:", name);
 }
 
-/**
- * function fetch ข้อมูลโครงสร้าาง
- * @param id id โครงสร้างปัจุบัน
- */
-function fetchOrganization(id: string) {
-  showLoader();
-  http
-    .get(config.API.orgByid(id.toString()))
-    .then((res) => {
-      const data = res.data.result;
-      nodeTree.value = data.map((e: any) => ({
-        ...e,
-        owner: [
-          {
-            name: "นางอัจฉรา ศรีปริวาทิน",
-            pos: "หัวหน้า",
-          },
-          {
-            name: "นางศรีปริวาทิน",
-            pos: "รองหัวหน้า",
-          },
-        ],
-      }));
-      console.log(nodeTree.value);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
+function showCookies() {
+  const cookies = document.cookie.split(";").map((cookie) => cookie.trim());
+  const cookieNames = cookies.map((cookie) => cookie.split("=")[0]);
+  console.log("Cookies:", cookieNames);
 }
 
-function updateSelected(data: any) {
-  nodeId.value = data;
+function handleDeleteCookie() {
+  deleteCookie("AUTH_SESSION_ID");
 }
-
-/** ตำแหน่ง*/
-const rowPosition = ref<any[]>([
-  {
-    id: "1",
-    posMasterNo: "สกก.1",
-    positionName: "นักบริหาร",
-    posTypeName: "บริหาร",
-    posLevelName: "สูง",
-    positionIsSelected: "นางอัจฉรา ศรีปริวาทิน",
-  },
-]);
-const columnsPosition = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: (row) => rowPosition.value.indexOf(row) + 1,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posMasterNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: false,
-    field: "posMasterNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionName",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    field: "positionName",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "ประเภทตำแหน่ง",
-    sortable: false,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับตำแหน่ง",
-    sortable: false,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionIsSelected",
-    align: "left",
-    label: "คนครอง",
-    sortable: false,
-    field: "positionIsSelected",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const positionId = ref<string>("");
-
-const reqMaster = reactive({
-  isAll: false,
-  keyword: "",
-});
-
-function selectPosition(id: string) {
-  positionId.value = id;
-}
-
-/** รายชื่อคนรักษาการ*/
-const rowListPerson = ref<any[]>([
-  {
-    id: "1",
-    citizenId: "1101700019241",
-    name: "เรือตรีพนัส บิณศิรวานิช",
-    posMasterNo: "สพข.54",
-    positionName: "นายแพทย์",
-    posTypeName: "ทั่วไป",
-    posLevelName: "สูง",
-  },
-  {
-    id: "2",
-    citizenId: "1101700019241",
-    name: "เรือตรีพนัส บิณศิรวานิช",
-    posMasterNo: "สพข.54",
-    positionName: "นายแพทย์",
-    posTypeName: "ทั่วไป",
-    posLevelName: "สูง",
-  },
-]);
-const columnsPerson = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: (row) => rowListPerson.value.indexOf(row) + 1,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "citizenId",
-    align: "left",
-    label: "เลขประจำตัวประชาชน",
-    sortable: false,
-    field: "citizenId",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "name",
-    align: "left",
-    label: "ชื่อ-นามสกุล",
-    field: "name",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posMasterNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: false,
-    field: "posMasterNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionName",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: false,
-    field: "positionName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posTypeName",
-    align: "left",
-    label: "ตำแหน่งประเภท",
-    sortable: false,
-    field: "posTypeName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับ",
-    sortable: false,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-
-function onSwapPerson(type: string, id: string) {}
-
-onMounted(() => {
-  fetchOrganizationActive();
-});
 </script>
 
 <template>
-  <div class="toptitle text-dark col-12 row items-center">
-    รักษาการในตำแหน่ง
-  </div>
-  <q-card style="height: 100%">
-    <q-card-section :horizontal="$q.screen.gt.sm">
-      <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm">
-        <div>
-          <q-input dense outlined v-model="filter" label="ค้นหา">
-            <template v-slot:append>
-              <q-icon
-                v-if="filter !== ''"
-                name="clear"
-                class="cursor-pointer"
-                @click="filter = ''"
-              />
-              <q-icon name="search" color="grey-5" />
-            </template>
-          </q-input>
-        </div>
-        <div class="bg-white tree-container q-pa-xs">
-          <q-tree
-            class="q-pa-sm q-gutter-sm"
-            dense
-            :nodes="nodeTree"
-            node-key="orgTreeId"
-            label-key="labelName"
-            :filter="filter"
-            no-results-label="ไม่พบข้อมูลที่ค้นหา"
-            no-nodes-label="ไม่มีข้อมูล"
-            v-model:expanded="expanded"
-          >
-            <template v-slot:default-header="prop">
-              <q-item
-                clickable
-                class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
-              >
-                <div>
-                  <div class="text-weight-medium">
-                    {{ prop.node.orgTreeName }}
-                  </div>
-                  <div class="text-weight-light text-grey-8">
-                    {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
-                    {{
-                      prop.node.orgTreeShortName == null
-                        ? null
-                        : prop.node.orgTreeShortName
-                    }}
-                  </div>
-                </div>
-              </q-item>
-            </template>
+  <q-btn
+    color="white"
+    text-color="black"
+    label="Del"
+    @click="handleDeleteCookie"
+  />
 
-            <template v-slot:default-body="prop">
-              <div v-if="prop.node.owner">
-                <q-list dense v-for="col in prop.node.owner">
-                  <q-item
-                    clickable
-                    :active="nodeId == col.name"
-                    active-class="my-list-link text-primary text-weight-medium"
-                    @click.stop="updateSelected(col.name)"
-                  >
-                    <q-item-section>
-                      {{ col.name }} {{ col.pos }}</q-item-section
-                    >
-                  </q-item>
-                </q-list>
-                <div></div>
-              </div>
-            </template>
-          </q-tree>
-        </div>
-      </q-card-section>
-
-      <q-separator :vertical="$q.screen.gt.xs" />
-
-      <q-card-section
-        v-if="nodeId"
-        class="col-lg-9 col-md-8 col-xs-12 scroll"
-        style="height: 86vh"
-      >
-        <div class="column q-col-gutter-sm">
-          <div class="col">
-            <q-card bordered style="height: 100%; border: 1px solid #d6dee1">
-              <div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
-                เลือกตำแหน่ง
-              </div>
-              <div class="col-12"><q-separator /></div>
-              <div class="row q-pa-md">
-                <div class="col-12">
-                  <q-toolbar style="padding: 0">
-                    <q-space />
-                    <div class="row q-gutter-md">
-                      <div>
-                        <!-- <q-checkbox
-                          keep-color
-                          v-model="reqMaster.isAll"
-                          label="แสดงตำแหน่งทั้งหมด"
-                          color="primary"
-                        >
-                          <q-tooltip
-                            >แสดงตำแหน่งทั้งหมดภายใต้หน่วยงาน/ส่วนราชการที่เลือก</q-tooltip
-                          >
-                        </q-checkbox> -->
-                      </div>
-                      <div>
-                        <q-input
-                          outlined
-                          dense
-                          v-model="reqMaster.keyword"
-                          label="ค้นหา"
-                        >
-                          <template v-slot:append>
-                            <q-icon name="search" color="grey-5" />
-                          </template>
-                        </q-input>
-                      </div>
-                    </div>
-                  </q-toolbar>
-                </div>
-                <div class="col-12">
-                  <d-table
-                    ref="table"
-                    :columns="columnsPosition"
-                    :rows="rowPosition"
-                    :paging="true"
-                    row-key="id"
-                    flat
-                    bordered
-                    dense
-                    :rows-per-page-options="[10, 25, 50, 100]"
-                  >
-                    <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-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="selectPosition(props.row.id)"
-                          :class="
-                            props.row.id === positionId ? 'bg-blue-2' : ''
-                          "
-                        >
-                          <div>
-                            {{ col.value ? col.value : "-" }}
-                          </div>
-                        </q-td>
-                      </q-tr>
-                    </template>
-                    <!-- <template v-slot:pagination="scope">
-                        <q-pagination
-                          v-model="reqMaster.page"
-                          active-color="primary"
-                          color="dark"
-                          :max="totalPage"
-                          :max-pages="5"
-                          size="sm"
-                          boundary-links
-                          direction-links
-                        ></q-pagination>
-                      </template> -->
-                  </d-table>
-                </div>
-              </div>
-            </q-card>
-          </div>
-          <div class="col" v-if="positionId">
-            <q-card bordered style="height: 100%; border: 1px solid #d6dee1">
-              <div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
-                รายชื่อคนรักษาการ
-              </div>
-              <div class="col-12"><q-separator /></div>
-              <div class="row q-pa-md">
-                <div class="col-12">
-                  <q-toolbar style="padding: 0">
-                    <q-space />
-                    <div class="row q-gutter-md">
-                      <div>
-                        <q-input
-                          outlined
-                          dense
-                          v-model="reqMaster.keyword"
-                          label="ค้นหา"
-                        >
-                          <template v-slot:append>
-                            <q-icon name="search" color="grey-5" />
-                          </template>
-                        </q-input>
-                      </div>
-                    </div>
-                  </q-toolbar>
-                </div>
-                <div class="col-12">
-                  <d-table
-                    ref="table"
-                    :columns="columnsPerson"
-                    :rows="rowListPerson"
-                    :paging="true"
-                    row-key="id"
-                    flat
-                    bordered
-                    dense
-                    :rows-per-page-options="[10, 25, 50, 100]"
-                  >
-                    <template v-slot:header="props">
-                      <q-tr :props="props">
-                        <q-th auto-width v-if="rowListPerson.length !== 1" />
-                        <q-th auto-width v-if="rowListPerson.length !== 1" />
-                        <q-th
-                          v-for="col in props.cols"
-                          :key="col.name"
-                          :props="props"
-                        >
-                          <span class="text-weight-medium">{{
-                            col.label
-                          }}</span>
-                        </q-th>
-                      </q-tr>
-                    </template>
-                    <template v-slot:body="props">
-                      <q-tr :props="props" class="cursor-pointer">
-                        <q-td auto-width v-if="rowListPerson.length !== 1">
-                          <q-btn
-                            dense
-                            size="12px"
-                            flat
-                            round
-                            :color="props.rowIndex + 1 == 1 ? 'grey' : 'green'"
-                            :disable="props.rowIndex + 1 == 1"
-                            icon="mdi-arrow-up-bold"
-                            @click="onSwapPerson('up', props.row.id)"
-                          >
-                            <!-- <q-tooltip>เลื่อนลำดับขึ้น</q-tooltip> -->
-                          </q-btn>
-                        </q-td>
-                        <q-td auto-width v-if="rowListPerson.length !== 1">
-                          <q-btn
-                            dense
-                            size="12px"
-                            flat
-                            round
-                            :color="
-                              rowListPerson.length == props.rowIndex + 1
-                                ? 'grey'
-                                : 'red'
-                            "
-                            :disable="
-                              rowListPerson.length == props.rowIndex + 1
-                            "
-                            icon="mdi-arrow-down-bold"
-                            @click="onSwapPerson('down', props.row.id)"
-                          >
-                            <!-- <q-tooltip>เลื่อนลำดับลง</q-tooltip> -->
-                          </q-btn>
-                        </q-td>
-                        <q-td
-                          v-for="col in props.cols"
-                          :key="col.name"
-                          :props="props"
-                        >
-                          <div>
-                            {{ col.value ? col.value : "-" }}
-                          </div>
-                        </q-td>
-                      </q-tr>
-                    </template>
-                    <!-- <template v-slot:pagination="scope">
-                        <q-pagination
-                          v-model="reqMaster.page"
-                          active-color="primary"
-                          color="dark"
-                          :max="totalPage"
-                          :max-pages="5"
-                          size="sm"
-                          boundary-links
-                          direction-links
-                        ></q-pagination>
-                      </template> -->
-                  </d-table>
-                </div>
-              </div>
-            </q-card>
-          </div>
-        </div>
-      </q-card-section>
-    </q-card-section>
-  </q-card>
+  <q-btn
+    color="white"
+    text-color="black"
+    label="Show Cookies"
+    @click="showCookies"
+  />
 </template>
 
-<style scoped>
-.tree-container {
-  overflow: auto;
-  height: 79vh;
-  border: 1px solid #e6e6e7;
-  border-radius: 10px;
-}
-
-.my-list-link {
-  color: rgb(118, 168, 222);
-  border-radius: 5px;
-  background: #a3d3fb48 !important;
-  font-weight: 600;
-  border: 1px solid rgba(175, 185, 196, 0.217);
-}
-</style>
+<style scoped></style>