diff --git a/resources/js/Permohonan/RekodMohon.vue b/resources/js/Permohonan/RekodMohon.vue
index 553dec6..e3a3f9d 100644
--- a/resources/js/Permohonan/RekodMohon.vue
+++ b/resources/js/Permohonan/RekodMohon.vue
@@ -73,10 +73,6 @@
                     Status
 
                 </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                    Tindakan
-                </th>
-
             </tr>
 
         </thead>
@@ -193,7 +189,7 @@
 
                         <div class="ml-3">
 
-                            <router-link :to="{ name: 'permohonanstatus', params: { mohonid: mohon.mohonid }}">
+                            <router-link :to="{ name: 'permohonanstatus', params: { mohonid: mohon.nopermohonan }}">
 
                                 <div class="border border-green-600 text-green-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-green-600 hover:text-white transition-all duration-300">
 
@@ -237,12 +233,6 @@
                     <span v-else class="p-2 bg-red-500 rounded text-white">Batal</span>
 
                 </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                    <button @click="DownloadBukti(mohon.kelulusanpbimage)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
-                        MUAT TURUN
-                    </button>
-                </td>
-
             </tr>
 
         </tbody>
diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue
index 7e6c414..df159cf 100644
--- a/resources/js/Permohonan/SenaraiMohon.vue
+++ b/resources/js/Permohonan/SenaraiMohon.vue
@@ -169,7 +169,7 @@
 
                         <div class="ml-3">
 
-                            <router-link :to="{ name: 'permohonanstatus', params: { mohonid: mohon.mohonid }}">
+                            <router-link :to="{ name: 'permohonanstatus', params: { mohonid: mohon.nopermohonan }}">
 
                                 <div class="border border-green-600 text-green-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-green-600 hover:text-white transition-all duration-300">
 
@@ -213,7 +213,7 @@
 
                         <div v-if="mohon.tagoperasi === 0 && mohon.tagcit === 1 && mohon.jenismohon === 'bayaranbalik'" class="ml-3">
 
-                            <button @click="funcsetuju(mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+                            <button @click="funcsetuju(mohon.nopermohonan)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
 
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
 
@@ -223,7 +223,7 @@
 
                             </button>
 
-                            <button @click="funcbatal(mohon.mohonid)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
+                            <button @click="funcbatal(mohon.nopermohonan)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
 
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
 
@@ -245,7 +245,7 @@
 
                         <div v-else-if="mohon.tagoperasi == 0 && mohon.jenismohon === 'permohonanwang'" class="ml-3">
 
-                            <button @click="funcsetuju(mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+                            <button @click="funcsetuju(mohon.nopermohonan)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
 
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
 
@@ -255,7 +255,7 @@
 
                             </button>
 
-                            <button @click="funcbatal(mohon.mohonid)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
+                            <button @click="funcbatal(mohon.nopermohonan)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
 
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
 
@@ -289,7 +289,7 @@
 
                         <div v-else-if="(mohon.tagoperasi === 1 && mohon.tagakaun === 0)" class="ml-3">
 
-                            <button @click="funcsetuju(mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+                            <button @click="funcsetuju(mohon.nopermohonan)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
 
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
 
@@ -299,7 +299,7 @@
 
                             </button>
 
-                            <button @click="funcbatal(mohon.mohonid)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
+                            <button @click="funcbatal(mohon.nopermohonan)" class="border border-red-600 text-red-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-red-600 hover:text-white transition-all duration-300">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
                                     <path stroke-linecap="round" stroke-linejoin="round" d="M10 14H5.236a2 2 0 01-1.789-2.894l3.5-7A2 2 0 018.736 3h4.018a2 2 0 01.485.06l3.76.94m-7 10v5a2 2 0 002 2h.096c.5 0 .905-.405.905-.904 0-.715.211-1.413.608-2.008L17 13V4m-7 10h2m5-10h2a2 2 0 012 2v6a2 2 0 01-2 2h-2.5" />
                                 </svg>
@@ -309,7 +309,7 @@
 
                         <div v-else-if="(mohon.tagakaun === 1 || mohon.tagakaun === 2) && mohon.tagprint === 0" class="ml-3">
 
-                            <button @click="CetakanPB(mohon.kodcaw,mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+                            <button @click="CetakanPB(mohon.kodcaw,mohon.nopermohonan)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
                                     <path stroke-linecap="round" stroke-linejoin="round" d="M17 17h2a2 2 0 002-2v-4a2 2 0 00-2-2H5a2 2 0 00-2 2v4a2 2 0 002 2h2m2 4h6a2 2 0 002-2v-4a2 2 0 00-2-2H9a2 2 0 00-2 2v4a2 2 0 002 2zm8-12V5a2 2 0 00-2-2H9a2 2 0 00-2 2v4h10z" />
                                 </svg>
@@ -317,13 +317,13 @@
                         </div>
 
                         <div v-else-if="mohon.tagprint === 1 && mohon.tagakaun === 1 && mohon.tagpb === 0">
-                            <button @click="KelulusanPB(mohon.mohonid,formatterfunction(mohon.amaun_mohon))" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+                            <button @click="KelulusanPB(mohon.nopermohonan,formatterfunction(mohon.amaun_mohon))" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
                                 PB
                             </button>
                         </div>
 
                         <div v-else-if="mohon.tagpb === 1 && mohon.tagdeposit === 0">
-                            <button @click="DepositBank(mohon.mohonid)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
+                            <button @click="DepositBank(mohon.nopermohonan)" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
                                 BANK
                             </button>
                         </div>
@@ -469,7 +469,7 @@ export default {
             })
 
             if (katalaluan !== undefined)
-                await this.axios.post('/mintasemulakelulusan', {
+                await this.axios.get('/mintasemulakelulusan', {
                     params: {
                         passsemula: katalaluan
                     }
@@ -488,7 +488,6 @@ export default {
                             cancelButtonText: 'Batal',
                             allowOutsideClick: false
                         }).then((result) => {
-
                             if (refer2.userroles === "operasi") {
                                 refer2.axios.put(refer2.$hostname + '/admin/permohonan/updateoperasi', {
                                     kelulusan: "Batal",
diff --git a/resources/js/Permohonan/StatusMohon.vue b/resources/js/Permohonan/StatusMohon.vue
index 66c0ace..9f18c5d 100644
--- a/resources/js/Permohonan/StatusMohon.vue
+++ b/resources/js/Permohonan/StatusMohon.vue
@@ -290,7 +290,7 @@
                                     </p>
 
                                     <p v-if="status.statusid === 7" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'KOMEN : ' + status[0].komen_batal  }}
+                                        {{ status.description }} <br>  {{ 'KOMEN : ' + status[0].komen  }}
                                     </p>
 
                                      <p v-if="status.statusid === 8" class="text-gray-900 whitespace-no-wrap">