diff --git a/src/modules/08_KPI/components/Tab/02_CommanderAbove.vue b/src/modules/08_KPI/components/Tab/02_CommanderAbove.vue
deleted file mode 100644
index d33dbfe..0000000
--- a/src/modules/08_KPI/components/Tab/02_CommanderAbove.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    <div class="q-pa-md">2</div>
-</template>
\ No newline at end of file
diff --git a/src/modules/08_KPI/components/Tab/02_Evaluator.vue b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
new file mode 100644
index 0000000..6bee11c
--- /dev/null
+++ b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="q-pa-md">ผู้ประเมิน</div>
+</template>
diff --git a/src/modules/08_KPI/components/Tab/03_CommanderAbove.vue b/src/modules/08_KPI/components/Tab/03_CommanderAbove.vue
new file mode 100644
index 0000000..d47994b
--- /dev/null
+++ b/src/modules/08_KPI/components/Tab/03_CommanderAbove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="q-pa-md">ผู้บังคับบัญชา เหนือขึ้นไป</div>
+</template>
diff --git a/src/modules/08_KPI/components/Tab/03_CommanderAboveOneStep.vue b/src/modules/08_KPI/components/Tab/03_CommanderAboveOneStep.vue
deleted file mode 100644
index c60e299..0000000
--- a/src/modules/08_KPI/components/Tab/03_CommanderAboveOneStep.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    <div class="q-pa-md">3</div>
-</template>
\ No newline at end of file
diff --git a/src/modules/08_KPI/components/Tab/04_CommanderAboveOneStep.vue b/src/modules/08_KPI/components/Tab/04_CommanderAboveOneStep.vue
new file mode 100644
index 0000000..4d5bde7
--- /dev/null
+++ b/src/modules/08_KPI/components/Tab/04_CommanderAboveOneStep.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="q-pa-md">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง</div>
+</template>
diff --git a/src/modules/08_KPI/components/Tab/04_File.vue b/src/modules/08_KPI/components/Tab/05_File.vue
similarity index 100%
rename from src/modules/08_KPI/components/Tab/04_File.vue
rename to src/modules/08_KPI/components/Tab/05_File.vue
diff --git a/src/modules/08_KPI/components/Tab/TabMain.vue b/src/modules/08_KPI/components/Tab/TabMain.vue
index 2978e6c..4c7f5d0 100644
--- a/src/modules/08_KPI/components/Tab/TabMain.vue
+++ b/src/modules/08_KPI/components/Tab/TabMain.vue
@@ -4,9 +4,10 @@ import { useKpiDataStore } from "@/modules/08_KPI/store";
 import { useRoute } from "vue-router";
 
 import Assessment from "@/modules/08_KPI/components/Tab/01_Assessment.vue";
-import CommanderAbove from "@/modules/08_KPI/components/Tab/02_CommanderAbove.vue";
-import CommanderAboveOneStep from "@/modules/08_KPI/components/Tab/03_CommanderAboveOneStep.vue";
-import File from "@/modules/08_KPI/components/Tab/04_File.vue";
+import Evaluator from "@/modules/08_KPI/components/Tab/02_Evaluator.vue";
+import CommanderAbove from "@/modules/08_KPI/components/Tab/03_CommanderAbove.vue";
+import CommanderAboveOneStep from "@/modules/08_KPI/components/Tab/04_CommanderAboveOneStep.vue";
+import File from "@/modules/08_KPI/components/Tab/05_File.vue";
 
 const store = useKpiDataStore();
 const route = useRoute();
@@ -19,14 +20,18 @@ const itemsTab = ref<any>([
   },
   {
     name: "2",
-    label: "ผู้บังคับบัญชาเหนือขึ้นไป",
+    label: "ผู้ประเมิน",
   },
   {
     name: "3",
-    label: "ผู้บังคับบัญชาเหนือขึ้นไปอีกหนึ่งขั้น",
+    label: "ผู้บังคับบัญชาเหนือขึ้นไป",
   },
   {
     name: "4",
+    label: "ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
+  },
+  {
+    name: "5",
     label: "ไฟล์เอกสาร",
   },
 ]);
@@ -51,13 +56,14 @@ const splitterModel = ref<number>(12);
           :label="tab.label"
         /> -->
         <q-tab name="1" label="ผู้ขอรับการประเมิน" />
-        <q-tab name="2" label="ผู้บังคับบัญชา">
+        <q-tab name="2" label="ผู้ประเมิน"> </q-tab>
+        <q-tab name="3" label="ผู้บังคับบัญชา">
           <div class="text-caption">เหนือขึ้นไป</div>
         </q-tab>
-        <q-tab name="3" label="ผู้บังคับบัญชา">
-          <div class="text-caption">เหนือขึ้นไปอีกหนึ่งขั้น</div>
+        <q-tab name="4" label="ผู้บังคับบัญชา">
+          <div class="text-caption">เหนือขึ้นไปอีกชั้นหนึ่ง</div>
         </q-tab>
-        <q-tab name="4" label="ไฟล์เอกสาร" />
+        <q-tab name="5" label="ไฟล์เอกสาร" />
       </q-tabs>
     </template>
 
@@ -77,9 +83,10 @@ const splitterModel = ref<number>(12);
           class="q-pa-none"
         >
           <Assessment v-if="store.tabMain === '1'" />
-          <CommanderAbove v-if="store.tabMain === '2'" />
-          <CommanderAboveOneStep v-if="store.tabMain === '3'" />
-          <File v-if="store.tabMain === '4'" />
+          <Evaluator v-if="store.tabMain === '2'" />
+          <CommanderAbove v-if="store.tabMain === '3'" />
+          <CommanderAboveOneStep v-if="store.tabMain === '4'" />
+          <File v-if="store.tabMain === '5'" />
         </q-tab-panel>
       </q-tab-panels>
     </template>
diff --git a/src/modules/08_KPI/views/mainEvaluator.vue b/src/modules/08_KPI/views/mainEvaluator.vue
index 31cbb3a..164c763 100644
--- a/src/modules/08_KPI/views/mainEvaluator.vue
+++ b/src/modules/08_KPI/views/mainEvaluator.vue
@@ -108,6 +108,7 @@ function fetchRoundOption() {
             : "",
       }));
       roundOp.value = list;
+      round.value = "";
       fetchList();
     })
     .catch((err) => {
@@ -123,7 +124,7 @@ function fetchList() {
   http
     .get(
       config.API.kpiEvaluation +
-        `/admin?page=${formQuery.page}&pageSize=${formQuery.pageSize}&kpiPeriodId=${round.value}`
+        `/admin?page=${formQuery.page}&pageSize=${formQuery.pageSize}&kpiPeriodId=${round.value}&keyword=${filterKeyword.value}`
     )
     .then((res) => {
       const data = res.data.result;
@@ -251,8 +252,19 @@ onMounted(async () => {
                 outlined
                 dense
                 v-model="filterKeyword"
-                label="ค้นหา"
-              ></q-input>
+                label="ค้นหาผู้ขอรับการประเมิน"
+                @keydown.enter.prevent="changRound"
+              >
+                <template v-slot:append>
+                  <q-icon
+                    v-if="filterKeyword !== ''"
+                    name="clear"
+                    class="cursor-pointer"
+                    @click="(filterKeyword = ''), changRound()"
+                  />
+                  <q-icon v-else name="search" color="grey-5" />
+                </template>
+              </q-input>
               <q-select
                 v-model="visibleColumns"
                 multiple
@@ -274,7 +286,6 @@ onMounted(async () => {
               ref="table"
               :columns="columns"
               :rows="rows"
-              :filter="filterKeyword"
               row-key="id"
               flat
               bordered