diff --git a/src/components/table.vue b/src/components/table.vue
index bd7c946e3f70d5a06fd3d2e7f7f0b40b248f8e28..ead873c5dd54523264ac7f55baa8c2ed2fbc5e28 100644
--- a/src/components/table.vue
+++ b/src/components/table.vue
@@ -16,7 +16,6 @@
         </tr>
       </thead>
       <tbody>
-        
         <tr
           v-for="e in this.entries.slice(
             (this.page - 1) * this.entry_per_page,
@@ -34,11 +33,12 @@
                 </td>
               </template>
             </template>
-
+          <template v-if="this.edit || this.delete"> 
           <td style="text-align: center">
             <button v-if="this.edit" @click="this.$emit('edit-entry', e[columns.Id.data])" class="btn btn-blue"> <i class="icon ion-android-create" style="font-size: 20px"></i> Edit </button>
             <button v-if="this.delete" @click="this.$emit('delete-entry', e[columns.Id.data])" class="btn-red"> <i class="icon ion-ios-trash-outline" style="font-size: 23px"></i> </button>
           </td>
+          </template>
         </tr>
       </tbody>
     </table>
diff --git a/src/views/KpiManagerDetail.vue b/src/views/KpiManagerDetail.vue
index e7e913158ed1e199af3ef7847d42c16320f7f504..cd4b00520e6ff7cd74ff5338e61884cc707b5644 100644
--- a/src/views/KpiManagerDetail.vue
+++ b/src/views/KpiManagerDetail.vue
@@ -201,6 +201,10 @@ export default {
         assign(){
             //for all selected_employee attach kpi
             //tambahin ke employees
+            if (this.selected_employee.length == 0){
+                alert("Tidak ada karyawan yang dipilih")
+                return
+            }
             let emp_ids = {employee_ids: []}
             this.selected_employee.forEach((emp) => {
                 this.assignees.push(emp)
@@ -224,6 +228,9 @@ export default {
         getBawahan(){
             //get bawahan ke backend
             this.employees = this.temp_employees
+            HTTP.get("managed-employees").then((res)=>{
+                this.employees = res.data.data
+            }).catch(() => alert("Error loading page"))
         },
         getKpi(){
             //get kpi dengan id kpi_id
diff --git a/src/views/ManagerKaryawanIndex.vue b/src/views/ManagerKaryawanIndex.vue
index fcc8ee07cb70bb56c8782d6dfd29e2fdc7b18bda..87b4512f71a6f1510e2eeeae1627c8bf847be711 100644
--- a/src/views/ManagerKaryawanIndex.vue
+++ b/src/views/ManagerKaryawanIndex.vue
@@ -10,15 +10,14 @@
                         </div>
                     </div>
                     <div class="row p-2">
-                        <Table2
-                            :endpoint="'kpis'"
+                        <Table
+                            :data="bawahan"
                             :columns="columns"
                             :filter="filter"
-                            :filter_column="'period_type'"
                             :edit = "false"
                             :delete = "false"
                             @detail-entry="detailKaryawan"
-                        ></Table2>
+                        ></Table>
                     </div>
                 </div>
             </div>
@@ -27,10 +26,11 @@
 
 <script>
 
-import Table2 from "../components/table-2";
+// import Table2 from "../components/table-2";
+import Table from "../components/table";
 import Header from "../components/header";
 import Sidebar from "../components/sidebar";
-// import { HTTP } from "../http-common";
+import { HTTP } from "../http-common";
 
 
 export default {
@@ -38,11 +38,12 @@ export default {
     components: {
         Header,
         Sidebar,
-        Table2
+        Table
     },
     data(){
         return{
             filter: "",
+            bawahan: [],
             columns: {
                 Id: {
                 name : "Id",
@@ -56,9 +57,9 @@ export default {
                 hidden : false,
                 clickable : true
                 },
-                Periode: {
-                name : "Periode",
-                data : "period_type",
+                Posisi: {
+                name : "Posisi",
+                data : "position",
                 hidden : false,
                 clickable : false
                 },
@@ -68,9 +69,18 @@ export default {
     methods: {
         detailKaryawan(id){
             //routing page detail
-            console.log(id)
+            this.$router.push({ name: "ManagerKaryawanDetail", params: { id: id }});
+        },
+        getBawahan(){
+            HTTP.get("managed-employees").then((res)=>{
+                console.log(res.data.data)
+                this.bawahan =res.data.data
+            }).catch(()=>alert("Error loading page"))
         }
-    }
+    },
+    mounted(){
+        this.getBawahan()
+    },
     
 }
 </script>