KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hafifierahman
2022-06-05 10:56:27 +08:00
parent ef17fd9cd4
commit 4669cbafaa
5 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/Logout.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div>
<div class="hidden lg:flex items-center">
<button @click.prevent="logout()" class="bg-transparent hover:bg-blue-500 text-blue-700 font-semibold hover:text-white py-2 px-4 border border-blue-500 hover:border-transparent rounded md:invisible lg:visible xl:visible">
Log out
Log Keluar
</button>
<button @click.prevent="logout()" class="bg-transparent hover:bg-blue-500 text-blue-700 font-semibold hover:text-white py-2 px-4 border border-blue-500 hover:border-transparent rounded md:visible lg:invisible xl:invisible">
<i class= "fas fa-sign-out-alt"></i>
resources/js/Permohonan/SenaraiMohon.vue
+45 -33
View File
@@ -339,9 +339,14 @@
</div>
<div v-else-if="mohon.tagprint === 1 && mohon.tagakaun === 1 && mohon.tagpb === 0">
<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">
<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">
<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>
</div>
<div v-else-if="mohon.tagpb === 1 && mohon.tagdeposit === 0">
@@ -521,7 +526,7 @@ export default {
refer2.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -530,7 +535,7 @@ export default {
refer2.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -548,7 +553,7 @@ export default {
refer2.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -557,7 +562,7 @@ export default {
refer2.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -618,7 +623,7 @@ export default {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -628,7 +633,7 @@ export default {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -646,7 +651,7 @@ export default {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -656,7 +661,7 @@ export default {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -682,33 +687,38 @@ export default {
},
CetakanPB: function (caw, mid) {
let refer = this;
this.axios.put(this.$hostname + '/admin/permohonan/updatecetak', {
mohonid: mid,
namaprint: this.username
}).then(response => {
if (response.data === 1) {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Cetakan Berjaya Dijana!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
} else {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Cetakan Tidak Berjaya!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
this.axios.get(this.$hostname + '/admin/permohonan/get/' + caw + '/' + mid).then(response => {
console.log(response.data.tagprint);
if (response.data.tagprint !== 1) {
this.axios.put(this.$hostname + '/admin/permohonan/updatecetak', {
mohonid: mid,
namaprint: this.username
}).then(response => {
if (response.data === 1) {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Cetakan Berjaya Dijana!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
} else {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Cetakan Tidak Berjaya!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
}
});
}
});
})
let route = window.route('permohonan.cetakanpenuh', {
_query: {
cawangan: caw,
@@ -716,6 +726,8 @@ export default {
},
});
window.open(route, '_blank')
return;
},
KelulusanPB: function (mid, mohon) {
this.$refs.modal.mohonid = mid;
resources/js/Permohonan/StatusMohon.vue
+1 -3
View File
@@ -1,9 +1,7 @@
<template>
<div class="container px-1 px-md-4 py-5 mx-auto">
<router-link to="/permohonan/rekod">
<i class="fas fa-backspace fa-3x text-yellow-500"></i>
</router-link>
<button class="fas fa-backspace fa-3x text-yellow-500" @click="$router.go(-1)"></button>
<div v-if="this.loadstatus == true" class="card">
resources/js/components/util/Bankmodal.vue
+15 -11
View File
@@ -8,7 +8,7 @@
<!--header-->
<div class="flex items-start bg-gray-200 justify-between p-5 border-b border-solid border-blueGray-200 rounded-t">
<h3 class="text-xl font-semibold">
Deposit Akaun Bank
Maklumat Penghantaran
</h3>
<button class="p-1 ml-auto border-0 text-black float-right text-3xl leading-none font-semibold outline-none focus:outline-none" v-on:click="toggleModal()">
<span class=" text-black h-6 w-6 text-2xl block outline-none focus:outline-none">
@@ -20,32 +20,36 @@
<div class="p-6">
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Jenis Bank
Nama Bank
</label>
<select v-model.trim="$v.selectedbank.$model" class="w-full p-2 rounded-md border bg-white border-gray-400 focus:outline-none rounded-md focus:ring-1 ring-cyan-500 uppercase">
<option value="" selected disabled hidden>Sila Pilih Bank Anda***</option>
<option v-for="(bank,i) in jenisbank" :key="i" :value="bank.abbreviation">{{ bank.name }}</option>
</select>
<!-- <input v-model="selectedbank" type="text" class="mr-2 bg-white appearance-none border-2 border-gray-400 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500 border-black" /> -->
<div class="text-red-500 text-xs italic" v-if="!$v.selectedbank.required">Field is required</div>
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
No Resit
No Rujukan
</label>
<input v-model.trim="$v.noresit.$model" type="text" class="mr-2 bg-white appearance-none border-2 border-gray-400 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500 border-black" />
<div class="text-red-500 text-xs italic" v-if="!$v.noresit.required">Field is required</div>
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Jenis Cash-In-Transit(CIT)
Kaedah Penghantaran
</label>
<select v-model.trim="$v.selectedjeniscit.$model" class="w-full p-2 rounded-md border bg-white border-gray-400 focus:outline-none rounded-md focus:ring-1 ring-cyan-500 uppercase">
<option value="CIT">Cash Diambil oleh CIT</option>
<option value="TT">tellygraphic transfer oleh PC</option>
<option value="" selected disabled hidden>Sila Pilih Kaedah Penghantaranr***</option>
<option value="CIT">Cash-in-Transit</option>
<option value="TT">tellygraphic Transfer</option>
</select>
<div class="text-red-500 text-xs italic" v-if="!$v.selectedjeniscit.required">Field is required</div>
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Nama Syarikat Cash-In-Transit(CIT)
Nota
</label>
<input v-model.trim="$v.namacit.$model" type="text" class="mr-2 bg-white appearance-none border-2 border-gray-400 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500 border-black" />
<div class="text-red-500 text-xs italic" v-if="!$v.noresit.required">Field is required</div>
<div class="text-red-500 text-xs italic" v-if="!$v.namacit.required">Field is required</div>
</div>
<!--footer-->
<div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
@@ -92,9 +96,9 @@ export default {
return {
showModal: false,
mohonid: 0,
selectedbank: 'Sila Pilih Bank',
selectedjeniscit: 'Sila Pilih Jenis Transfer',
noresit: 0,
selectedbank: '',
selectedjeniscit: '',
noresit: '',
namacit: '',
jenisbank: {}
}
resources/views/permohonan/cetakanfull.blade.php
+11 -3
View File
@@ -66,7 +66,7 @@
<div class="flex mb-6">
<div class="ml-2 w-1/2 flex flex-col justify-end">
<b class="text-xs border border-black pl-1">Daripada</b>
<p class="text-xs">Pengurus Cawangan {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">{{ ($permohonan['jawatan_pemohon'] == 'pc') ? 'Pengurus Cawangan' : 'Pen. Peng. Cawangan' }} {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">Nama : {{ $permohonan['nama_pemohon'] }}</p>
{{-- <p class="text-xs">NO KP : 970403-03-5003</p> --}}
@@ -87,7 +87,7 @@
<p class="text-xs w-2/3 border border-gray-400 text-right">RM {{ number_format($permohonan['amaun_mohon'],2) }}</p>
</div>
<div class="flex">
<p class="text-xs w-full">Tarikh serahan</p>
<p class="text-xs w-full">Tarikh mohon</p>
<p class="text-xs w-2/3 border border-gray-400 text-right">
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']);
@@ -164,13 +164,17 @@
<div class="ml-2 w-1/2 flex flex-col justify-end">
<b class="text-xs border border-black pl-1">Disediakan oleh</b>
<p class="h-14"></p>
<div class="flex">
{{-- <div class="w-2/3"></div> --}}
<p class="text-xs w-full text-right italic text-black">{{ $permohonan['nama_pemohon'] }}</p>
</div>
<div class="flex">
<div class="w-2/3"></div>
<div class="text-right border-t border-gray-300 w-1/3"></div>
</div>
<div class="flex">
<div class="w-2/3"></div>
<p class="text-xs w-1/3 text-center">Pengurus Cawangan</p>
<p class="text-xs w-2/3 text-right">{{ ($permohonan['jawatan_pemohon'] == 'pc') ? 'Pengurus Cawangan' : 'Pen. Peng. Cawangan' }}</p>
</div>
<div class="flex">
<p class="text-xs text-center w-2/3">Tarikh</p>
@@ -189,6 +193,10 @@
<b class="text-xs border border-black pl-1">Disahkan oleh</b>
<p class="h-14"></p>
<div class="flex">
{{-- <div class="w-2/3"></div> --}}
<p class="text-xs w-full text-right italic">{{ $permohonan['nama_operasi'] }}</p>
</div>
<div class="flex">
<div class="w-2/3"></div>
<div class="text-right border-t border-gray-300 w-1/3"></div>