diff --git a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
index d31badf..f15ab3e 100644
--- a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
@@ -168,6 +168,19 @@ function onDelete(id: string) {
   });
 }
 
+const modalProgress = ref<boolean>(false);
+const modalProblem = ref<boolean>(false);
+const type = ref<string>("");
+function openPopupProgress() {
+  modalProgress.value = true;
+  type.value = rows.value ? "plan" : rows.value ? "role" : "special";
+}
+
+function openPopupProblem() {
+  modalProblem.value = true;
+  type.value = rows.value ? "plan" : rows.value ? "role" : "special";
+}
+
 watch(
   () => modal.value,
   () => {
@@ -260,13 +273,7 @@ watch(
             <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
-              v-if="
-                store.dataEvaluation.evaluationStatus === 'NEW' &&
-                store.rolePerson === 'USER'
-              "
-            />
+            <q-th auto-width />
           </q-tr>
         </template>
         <template v-slot:body="props">
@@ -341,13 +348,37 @@ watch(
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
-            <td
-              v-if="
-                store.dataEvaluation.evaluationStatus === 'NEW' &&
-                store.rolePerson === 'USER'
-              "
-            >
+            <td>
               <q-btn
+                flat
+                round
+                icon="note"
+                color="blue-5"
+                size="12px"
+                dense
+                @click="openPopupProgress()"
+              >
+                <q-tooltip>รายงานความก้าวหน้า</q-tooltip>
+              </q-btn>
+              <q-btn
+                flat
+                round
+                icon="warning"
+                color="red-5"
+                size="12px"
+                dense
+                :type="data ? 'plan' : data ? 'role' : 'special'"
+                main="problem"
+                @click="openPopupProblem()"
+              >
+                <q-tooltip>รายงานปัญหา</q-tooltip>
+              </q-btn>
+
+              <q-btn
+                v-if="
+                  store.dataEvaluation.evaluationStatus === 'NEW' &&
+                  store.rolePerson === 'USER'
+                "
                 flat
                 round
                 icon="edit"
@@ -360,6 +391,10 @@ watch(
               </q-btn>
 
               <q-btn
+                v-if="
+                  store.dataEvaluation.evaluationStatus === 'NEW' &&
+                  store.rolePerson === 'USER'
+                "
                 flat
                 round
                 icon="delete"