diff --git a/src/modules/08_KPI/components/Tab/02_Evaluator.vue b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
index 2d7374c..7a1092a 100644
--- a/src/modules/08_KPI/components/Tab/02_Evaluator.vue
+++ b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
@@ -19,6 +19,8 @@ const { showLoader, hideLoader, messageError, dialogConfirm, success } =
   useCounterMixin();
 
 const evaluatorId = ref<string>(route.params.id.toString());
+const isReadonly = <boolean>(route.name === "KPIEditEvaluator" ? true : false);
+
 const props = defineProps({
   type: {
     type: String,
@@ -103,7 +105,7 @@ function createValue(val: string, done: Function) {
 function filterFn(val: string, update: Function) {
   update(() => {
     optionTopic.value = optionTopicMain.value.filter(
-      (v: any) => v.indexOf(val) > -1
+      (v: string) => v.indexOf(val) > -1
     );
   });
 }
@@ -144,7 +146,15 @@ onMounted(() => {
 <template>
   <div class="q-pa-md">
     <q-toolbar style="padding: 0px">
-      <q-btn flat round dense icon="add" color="blue-4" @click="openDialog">
+      <q-btn
+        v-if="isReadonly"
+        flat
+        round
+        dense
+        icon="add"
+        color="blue-4"
+        @click="openDialog"
+      >
         <q-tooltip>เสนอความคิดเห็น</q-tooltip>
       </q-btn>
       <q-space />
diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index 0c7630a..46b3a33 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -58,7 +58,6 @@ function fetchEvaluation() {
       formProfile.status = store.convertStatus(data.evaluationStatus);
       formProfile.result = store.convertResults(data.evaluationResults);
       fetchProfile(data.profileId);
-      console.log(store.dataEvaluation);
     })
     .catch((e) => {
       messageError($q, e);
@@ -127,26 +126,27 @@ async function clearDialog() {
 
 function onSubmit() {
   dialogConfirm($q, () => {
-    if(id.value){
+    if (id.value) {
       showLoader();
-    http
-      .put(config.API.kpiEvaluationCheck + `/${id.value}`, {
-        evaluatorId: evaluatorId.value ? evaluatorId.value.id:null,
-        commanderId: commanderId.value ? commanderId.value.id:null,
-        commanderHighId: commanderHighId.value ? commanderHighId.value.id:null,
-      })
-      .then((res) => {
-        success($q, "บันทึกสำเร็จ");
-        clearDialog();
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        hideLoader();
-      });
+      http
+        .put(config.API.kpiEvaluationCheck + `/${id.value}`, {
+          evaluatorId: evaluatorId.value ? evaluatorId.value.id : null,
+          commanderId: commanderId.value ? commanderId.value.id : null,
+          commanderHighId: commanderHighId.value
+            ? commanderHighId.value.id
+            : null,
+        })
+        .then((res) => {
+          success($q, "บันทึกสำเร็จ");
+          clearDialog();
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
     }
-   
   });
 }
 
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 5b92180..a715fa8 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -406,6 +406,8 @@ export const useCounterMixin = defineStore("mixin", () => {
   }
 
   const messageError = (q: any, e: any = "", text: string = "") => {
+    console.log(e);
+
     if (e == "" && text != "") {
       q.dialog({
         component: CustomComponent,