diff --git a/resources/js/WTD/Rekod.vue b/resources/js/WTD/Rekod.vue index ae43e3a..68c2608 100644 --- a/resources/js/WTD/Rekod.vue +++ b/resources/js/WTD/Rekod.vue @@ -14,14 +14,35 @@
Jumlah WTD
:
-
RM {{ formattext(sb.baki) }}
+ +
+ RM{{ formattext(sb.baki) }} +
-
Tarikh Proses WTD +
Tahun Lelong +
+
:
+
{{ (sb.tahun) ? sb.tahun : 'Tiada' }}
+
+
+
Bulan Lelong +
+
:
+
{{ (sb.bulan) ? sb.bulan : 'Tiada' }}
+
+
+
Tarikh Proses
:
{{ (sb.t_jual) ? sb.t_jual : 'Tiada' }}
+
+
Tarikh Hantar +
+
:
+
{{ (sb.t_htr_ag) ? sb.t_htr_ag : 'Tiada' }}
+
Status
diff --git a/resources/js/WTD/SelectWTD.vue b/resources/js/WTD/SelectWTD.vue index 6a8a49c..77e623b 100644 --- a/resources/js/WTD/SelectWTD.vue +++ b/resources/js/WTD/SelectWTD.vue @@ -19,7 +19,7 @@
- + Batchno: {{ this.batchno }}
@@ -38,9 +38,9 @@ Tarikh Lelong - + Baki @@ -60,9 +60,9 @@ {{ bl.t_jual }} - + {{ formattext(bl.baki) }} @@ -103,7 +103,7 @@ export default { kodcaw: this.$kodcaw, } }).then(response => { - console.log(response); + //console.log(response); this.arraybakilelong = response.data; }) }, @@ -153,7 +153,7 @@ export default { if (boolkatalaluan == 1) { await this.$swal({ - title: 'Proses WTD?', + title: 'Serahan WTD?', text: "anda tidak boleh ulang kembali setelah di proses!", icon: 'warning', showCancelButton: true, @@ -165,16 +165,59 @@ export default { if (result.isConfirmed) { + //new added this.$swal({ - title: "Masukkan No Cek:", - // text: "Write something interesting:", - input: 'text', - showCancelButton: true - }).then((result) => { - if (result.value) { - this.proseswtd(result.value); - } - }); + title: 'Sila Isi Butiran Berikut', + html: ` +
+
+ + +
+ +
+ + +
+
+ `, + focusConfirm: false, + showCancelButton: true, + confirmButtonText: 'Simpan', + cancelButtonText: 'Batal', + + customClass: { + popup: 'swal-popup', + confirmButton: 'swal-confirm', + cancelButton: 'swal-cancel' + }, + + preConfirm: () => { + const noCek = document.getElementById('noCek').value.trim(); + const tarikhAG = document.getElementById('tarikhAG').value; + + if (!noCek || !tarikhAG) { + this.$swal.showValidationMessage( + 'Sila masukkan No Cek dan Tarikh Hantar ke AG' + ); + return false; + } + + return { noCek, tarikhAG }; + } +}).then((result) => { + if (result.isConfirmed) { + this.proseswtd(result.value.noCek, result.value.tarikhAG); + } +}); + + + //end new added } }); } else { @@ -197,11 +240,12 @@ export default { } }); }, - proseswtd: function (nocek) { + proseswtd: function (nocek,tarikhAG) { this.axios.post(this.$hostname + '/admin/wtd/process', { kodcaw: this.$kodcaw, batch: this.batchno, - nocek: nocek + nocek: nocek, + tarikhAG: tarikhAG }).then(response => { if (response.data == 'success') { diff --git a/resources/views/wtd/index.blade.php b/resources/views/wtd/index.blade.php index 7530aac..cfda47e 100644 --- a/resources/views/wtd/index.blade.php +++ b/resources/views/wtd/index.blade.php @@ -8,7 +8,7 @@
- +
diff --git a/resources/views/wtd/simulasi/show.blade.php b/resources/views/wtd/simulasi/show.blade.php new file mode 100644 index 0000000..011852b --- /dev/null +++ b/resources/views/wtd/simulasi/show.blade.php @@ -0,0 +1,131 @@ +@extends('layouts.app') + +@section('content') +
+ @if (session('success')) +
+ {{ session('success') }} +
+ @endif +

Senarai Batch Simulasi Untuk Tahun: {{ $year }}

+ +
+

Jumlah Baki Lelong: + RM 0.00 +

+
+ +
+ @csrf +
+ + + + + + + + + + + + + {{-- @dd($senaraiSimulasi); --}} + @foreach ($senaraiSimulasi as $index => $item) + + + + + + + + + + + @endforeach + +
#BulanJumlah SAGPembiayaanBaki + +
{{ $index + 1 }} + + {{ $item['bulan'] }} + + + + + + {{ $item['jumlah_norujukan'] ?? 0 }} + + + {{ number_format($item['pembiayaan'], 2) }} + + + {{ number_format($item['baki'], 2) }} + + + +
+
+ +
+ +
+
+
+ @include('layouts.footer') +@endsection + +