diff --git a/src/modules/08_KPI/components/Evaluator/02_TabOther.vue b/src/modules/08_KPI/components/Evaluator/02_TabOther.vue
index 4c89395..6814765 100644
--- a/src/modules/08_KPI/components/Evaluator/02_TabOther.vue
+++ b/src/modules/08_KPI/components/Evaluator/02_TabOther.vue
@@ -132,7 +132,11 @@ function onClickApprove(type: string = "") {
 
       <template v-slot:body="props">
         <q-tr :props="props" class="cursor-pointer">
-          <q-td>
+          <q-td
+            v-if="
+              store.tabMainevaluator !== '5' && store.tabMainevaluator !== '6'
+            "
+          >
             <q-checkbox
               keep-color
               color="primary"
@@ -222,7 +226,12 @@ function onClickApprove(type: string = "") {
   </div>
 
   <div class="row justify-end q-mt-md q-gutter-sm">
-    <q-btn color="public" label="อนุมัติ" @click="onClickApprove('PASSED')" />
+    <q-btn
+      v-if="store.tabMainevaluator !== '5' && store.tabMainevaluator !== '6'"
+      color="public"
+      label="อนุมัติ"
+      @click="onClickApprove('PASSED')"
+    />
   </div>
 </template>
 
diff --git a/src/modules/08_KPI/store.ts b/src/modules/08_KPI/store.ts
index b561954..b94ba04 100644
--- a/src/modules/08_KPI/store.ts
+++ b/src/modules/08_KPI/store.ts
@@ -121,10 +121,12 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
       case "EVALUATING":
         return "รายงานผลสำเร็จของงาน";
       case "EVALUATING_EVALUATOR":
-        return "รอผู้ประเมินตรวจสอบผล";
-      case "EVALUATING_COMMANDER":
+        return "ผู้ประเมินรายงานผลสำเร็จของงาน";
+      case "SUMMARY":
+        return "สรุปผลการประเมิน";
+      case "SUMMARY_COMMANDER":
         return "รอผู้บังคับบัญชาเหนือขึ้นไปตรวจสอบผล";
-      case "EVALUATING_COMMANDER_HIGH":
+      case "SUMMARY_COMMANDER_HIGH":
         return "รอผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่งตรวจสอบผล";
       case "COMPLETE":
         return "เสร็จสิ้น";
@@ -290,15 +292,15 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
       case "EVALUATING_EVALUATOR":
         tabOpen.value = 3;
         break;
-      case "EVALUATING_COMMANDER":
-        tabOpen.value = 3;
-        break;
-      case "EVALUATING_COMMANDER_HIGH":
-        tabOpen.value = 3;
-        break;
       case "SUMMARY":
         tabOpen.value = 4;
         break;
+      case "SUMMARY_COMMANDER":
+        tabOpen.value = 4;
+        break;
+      case "SUMMARY_COMMANDER_HIGH":
+        tabOpen.value = 4;
+        break;
       case "COMPLETE":
         tabOpen.value = 4;
         break;
diff --git a/src/modules/08_KPI/views/mainEvaluator.vue b/src/modules/08_KPI/views/mainEvaluator.vue
index d33a723..065562e 100644
--- a/src/modules/08_KPI/views/mainEvaluator.vue
+++ b/src/modules/08_KPI/views/mainEvaluator.vue
@@ -136,14 +136,14 @@ function fetchList() {
         : store.tabMainevaluator === "5"
         ? "EVALUATING_EVALUATOR"
         : store.tabMainevaluator === "6"
-        ? "EVALUATING_EVALUATOR"
-        : undefined,
-    evaluating:
-      store.tabMainevaluator === "5"
-        ? true
-        : store.tabMainevaluator === "6"
-        ? false
+        ? "SUMMARY"
         : undefined,
+    // evaluating:
+    //   store.tabMainevaluator === "5"
+    //     ? true
+    //     : store.tabMainevaluator === "6"
+    //     ? false
+    //     : undefined,
     reqedit: store.tabMainevaluator === "3" ? "NEW" : undefined,
   };
 
@@ -321,7 +321,6 @@ onMounted(async () => {
                 class="text-grey"
                 active-color="primary"
                 indicator-color="primary"
-                narrow-indicator
               >
                 <q-tab name="1" label="รายการทั้งหมด" @click="onChangTab" />
                 <q-tab name="2" label="รออนุมัติข้อตกลง" @click="onChangTab" />
@@ -335,12 +334,14 @@ onMounted(async () => {
                   label="อนุมัติเพื่อเริ่มประเมิน"
                   @click="onChangTab"
                 /> -->
-                <q-tab name="5" label="สรุปผลการประเมิน" @click="onChangTab" />
-                <q-tab
+                <q-tab name="5" label="รายงานผลสำเร็จ" @click="onChangTab" />
+                <q-tab name="6" label="สรุปผลการประเมิน" @click="onChangTab" />
+                <!-- <q-tab
                   name="6"
-                  label="ตรวจสอบผลการประเมิน"
+                  label="รายงานผลสำเร็จ"
+                  onChangTab
                   @click="onChangTab"
-                />
+                /> -->
               </q-tabs>
               <q-separator />
 
@@ -492,6 +493,7 @@ onMounted(async () => {
     </div>
   </div>
 </template>
+
 <style scoped lang="scss">
 .icon-color {
   color: #4154b3;