From a7a6d91ffe41158ff68dc2013ec811a386c944b2 Mon Sep 17 00:00:00 2001 From: gus17 <gustavopantoja.ap@gmail.com> Date: Thu, 6 Apr 2023 18:02:33 -0300 Subject: [PATCH] git commit -m "IN-3 tela de import refeita" --- app/Http/Controllers/ContratoController.php | 4 +- resources/views/contratos/import.blade.php | 2 +- resources/views/contratos/index.blade.php | 83 ++++++++++++++------- 3 files changed, 60 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/ContratoController.php b/app/Http/Controllers/ContratoController.php index 0171cc1..0e0085e 100644 --- a/app/Http/Controllers/ContratoController.php +++ b/app/Http/Controllers/ContratoController.php @@ -5,6 +5,7 @@ use App\Imports\ContratoBancoImport; use App\Imports\ContratoImport; use App\Imports\PessoaImport; +use App\Models\ConsignanteMaster; use App\Models\Contrato; use App\Models\Pessoa; use Illuminate\Http\Request; @@ -17,7 +18,8 @@ class ContratoController extends Controller */ public function index() { - return view('contratos.index'); + $consignantes_masters = ConsignanteMaster::all(); + return view('contratos.index',compact('consignantes_masters')); } /** diff --git a/resources/views/contratos/import.blade.php b/resources/views/contratos/import.blade.php index 75ccf55..f7b4f70 100644 --- a/resources/views/contratos/import.blade.php +++ b/resources/views/contratos/import.blade.php @@ -111,7 +111,7 @@ </div> </div> - + @stop @section('css') diff --git a/resources/views/contratos/index.blade.php b/resources/views/contratos/index.blade.php index 7248b5d..4d68729 100644 --- a/resources/views/contratos/index.blade.php +++ b/resources/views/contratos/index.blade.php @@ -15,10 +15,29 @@ <div class="form-group"> <label for="">Arquivo</label> <input class="form-control" type="file" name="file"> + </div> <div class="form-group"> + <label for="">Consignante-Master</label> + <select class="form-control consignante_master" name="consignante_master_id" + id="consignante_master"> + <option></option> + @forelse($consignantes_masters as $consignantes_master) + <option value="{{$consignantes_master->id}}">{{$consignantes_master->name}}</option> + + @empty + @endforelse + </select> + </div> + <div class="form-group"> + <label for="">Consignantes</label> + <select class="form-control consignante_master" name="consignante_id" + id="consignante"> + <option></option> + + </select> </div> <div class="row"> - - + + <div class="form-group col-md-3"> <label>Coluna com CPF</label> <input class="form-control" type="text" name="cpf"> @@ -27,7 +46,7 @@ <label>Coluna com Matriculas</label> <input class="form-control" type="text" name="matricula"> </div> - + <div class="form-group col-md-3"> <label>Coluna com Consignatarias</label> <input class="form-control" type="text" name="nm_consignataria"> @@ -40,7 +59,7 @@ <label>Coluna com N Parcela</label> <input class="form-control" type="text" name="parcela_atual"> </div> - + <div class="form-group col-md-3"> <label>Coluna com Cod Verba</label> <input class="form-control" type="text" name="cod_verba"> @@ -49,12 +68,12 @@ <label>Coluna com Prazo Total</label> <input class="form-control" type="text" name="prazo_total"> </div> - + <div class="form-group col-md-3"> <label>Coluna com N° Contrato</label> <input class="form-control" type="text" name="n_contrato"> </div> - + <div class="form-group col-md-3"> <label>Coluna com Data de Efetivação</label> <input class="form-control" type="text" name=data_efetivacao> @@ -64,38 +83,29 @@ <label>Coluna com Data Primeiro desconto</label> <input class="form-control" type="text" name="data_primeiro_desconto"> </div> - + <div class="form-group col-md-3"> <label>Coluna com Data Ultimo desconto</label> <input class="form-control" type="text" name="data_ultimo_desconto"> </div> - - + + <div class="form-group col-md-3"> <label>Coluna com Valor Liberado</label> <input class="form-control" type="text" name="valor_liberado"> </div> - + <div class="form-group col-md-3"> <label>Coluna com Valor Total Financiado</label> <input class="form-control" type="text" name="valor_financiado"> </div> - + <div class="form-group col-md-3"> <label>Coluna com Valor Total Devedor</label> <input class="form-control" type="text" name="total_saldo_devedor"> </div> - - </div> - - - - - - - - + </div> <div class="form-group"> <button class="btn btn-block btn-success">Carregar</button> @@ -112,16 +122,35 @@ @section('css') @stop -@section('plugins.Datatables', true) -@section('js') - <script> console.log('Hi!'); </script> +@section('js') <script> - $(document).ready(function () { - - $('#consignante_master').DataTable(); + $(document).on('change', 'select#consignante_master', function () { + var consignante_master = $(this).val(); + $.ajax({ + url: '/api/consignante_master/' + consignante_master, + type: 'GET', + dataType: 'json', + success: function (dados) { + if (dados.length > 0) { + var options = '<option value="">Selecione a Consignante</option>'; + dados.forEach(function (obj) { + options += '<option value="' + obj.id + '">' + obj.name + '</option>'; + }); + $('#consignante').html(options).show(); + } else { + $('#consignante').html('<option value="">Não foram encontrados bairros</option>').hide(); + } + }, + error: function (error) { + console.error(error); + } + }); }); </script> + <script> console.log('Hi!'); </script> + + @stop -- GitLab