From e57b2c71c7165828b5f18581093490bac9fa9e51 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 26 Jul 2022 22:15:25 +0800
Subject: [PATCH] edit permohonan:

---
 resources/js/Permohonan/SenaraiMohon.vue | 34 +++++++++++++-----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue
index 24424a7..cccde1c 100644
--- a/resources/js/Permohonan/SenaraiMohon.vue
+++ b/resources/js/Permohonan/SenaraiMohon.vue
@@ -233,7 +233,7 @@
 
                     <div v-if="userroles == 'operasi'" class="flex items-center">
 
-                        <div v-if="mohon.tagoperasi === 0 && mohon.tagcit === 1 && mohon.jenismohon === 'bayaranbalik'" class="ml-3">
+                        <div v-if="mohon.tagoperasi === 0 && mohon.tagcit === 1 && mohon.tagjanapc === 2 && mohon.jenismohon === 'bayaranbalik'" class="ml-3">
 
                             <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">
 
@@ -256,7 +256,7 @@
                             </button>
 
                         </div>
-                        <div v-if="mohon.tagoperasi === 0 && mohon.tagcit === 0 && mohon.jenismohon === 'bayaranbalik'" class="ml-3">
+                        <div v-if="mohon.tagoperasi === 0 && mohon.tagcit === 0 && mohon.tagjanapc === 0 && mohon.tagjanapc === 1 && mohon.jenismohon === 'bayaranbalik'" class="ml-3">
 
                             <p class="text-white whitespace-no-wrap p-2 rounded bg-blue-500">
 
@@ -265,7 +265,7 @@
                             </p>
                         </div>
 
-                        <div v-else-if="mohon.tagoperasi == 0 && mohon.jenismohon === 'permohonanwang'" class="ml-3">
+                        <div v-else-if="mohon.tagoperasi == 0  && mohon.tagjanapc === 2 && mohon.jenismohon === 'permohonanwang'" class="ml-3">
 
                             <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">
 
@@ -289,7 +289,7 @@
 
                         </div>
 
-                        <div v-else-if="mohon.tagoperasi == 1" class="ml-3">
+                        <div v-else-if="mohon.tagoperasi === 1" class="ml-3">
 
                             <p class="text-white whitespace-no-wrap p-2 rounded bg-green-500">
 
@@ -331,7 +331,7 @@
 
                         <div v-else-if="(mohon.tagakaun === 1 || mohon.tagakaun === 2) && mohon.tagprint === 0" class="ml-3">
 
-                            <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">
+                            <button @click="CetakanPB(mohon.kodcaw,mohon.nopermohonan,mohon.files_kelakaun_id)" 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>
@@ -342,11 +342,11 @@
                             <button @click="KelulusanPB(mohon.nopermohonan,formatterfunction(mohon.amaun_mohon))" class="border mb-2 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>
-                            <button @click="CetakanPB(mohon.kodcaw,mohon.nopermohonan)" class="mt-2 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="mt-2 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="20" height="20" 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>
-                            </button>
+                            </button> -->
                         </div>
 
                         <div v-else-if="mohon.tagpb === 1 && mohon.tagdeposit === 0">
@@ -724,7 +724,8 @@ export default {
                     }
                 });
         },
-        CetakanPB: function (caw, mid) {
+        CetakanPB: function (caw,mid,perid) {
+
             let refer = this;
 
             this.axios.get(this.$hostname + '/admin/permohonan/get/' + caw + '/' + mid).then(response => {
@@ -741,6 +742,7 @@ export default {
                                 text: 'Cetakan Berjaya Dijana!',
                                 allowOutsideClick: false
                             }).then(function () {
+                                window.open('/api/check/muatturun?files_id=' + perid, '_blank');
                                 refer.getSenaraiMohon(refer.currentPage);
                             });
 
@@ -758,14 +760,14 @@ export default {
                     });
                 }
             })
-            let route = window.route('permohonan.cetakanpenuh', {
-                _query: {
-                    cawangan: caw,
-                    mohonid: mid
-                },
-            });
-            window.open(route, '_blank')
-            return;
+            // let route = window.route('permohonan.cetakanpenuh', {
+            //     _query: {
+            //         cawangan: caw,
+            //         mohonid: mid
+            //     },
+            // });
+            // window.open(route, '_blank')
+            // return;
 
         },
         KelulusanPB: function (mid, mohon) {