Skip to content

S
sistema_mcid
Commit 5298cb78 authored by sandroresende's avatar sandroresende
Browse files
Options

inclusao consulta execucao orcamentaria

parent f07d65e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1050 additions and 1042 deletions
app/Http/Controllers/Propostas/SelecaoController.php
View file @ 5298cb78
......@@ -1055,19 +1055,22 @@ public function pesquisarProponenteTransferegov(Request $request){
// return $where;
if($acaoSelecionada == 'true'){
$propostasTransferegov = ViewSysRelatorioGeralDiscricionarioSistema::selectRaw('acao_orcamentaria, programa_transferegov, situacao_ajustada, SUM(vlr_repasse_transferegov) AS vlr_repasse_transferegov' )
$propostasTransferegov = ViewSysRelatorioGeralDiscricionarioSistema::selectRaw('uf_transferegov,municipio_transferegov, count(DISTINCT identif_proponente_transferegov) as qtd_cpnj,acao_orcamentaria, programa_transferegov, situacao_ajustada, SUM(vlr_repasse_transferegov) AS vlr_repasse_transferegov' )
->where($where)
->groupBy('uf_transferegov','municipio_transferegov','acao_orcamentaria','programa_transferegov', 'situacao_ajustada')
->orderBy('uf_transferegov','ASC')
->orderBy('municipio_transferegov','ASC')
->orderBy('acao_orcamentaria','ASC')
->get();
}else{
$propostasTransferegov = ViewSysRelatorioGeralDiscricionarioSistema::selectRaw('acao_orcamentaria, situacao_ajustada, SUM(vlr_repasse_transferegov) AS vlr_repasse_transferegov' )
->where($where)
->whereNotNull('num_proposta_transferegov')
->groupBy('acao_orcamentaria','programa_transferegov', 'situacao_ajustada')
->get();
}else{
$propostasTransferegov = ViewSysRelatorioGeralDiscricionarioSistema::selectRaw('uf_transferegov,municipio_transferegov, count(DISTINCT identif_proponente_transferegov) as qtd_cpnj,acao_orcamentaria, programa_transferegov, situacao_ajustada, SUM(vlr_repasse_transferegov) AS vlr_repasse_transferegov' )
->where($where)
->groupBy('uf_transferegov','municipio_transferegov','acao_orcamentaria','programa_transferegov', 'situacao_ajustada')
->orderBy('uf_transferegov','ASC')
->orderBy('municipio_transferegov','ASC')
->groupBy('acao_orcamentaria', 'situacao_ajustada')
->orderBy('acao_orcamentaria','ASC')
->get();
}
if(count($propostasTransferegov) == 0){
......
public/js/app.js
View file @ 5298cb78
This diff is collapsed.
resources/assets/js/components/mod_propostas/FiltroExecucaoTransferegov.vue
View file @ 5298cb78
......@@ -187,7 +187,7 @@
console.log(erro);
})
axios.get(this.url + '/api/acaoPrograma').then(resposta => {
axios.get(this.url + '/api/acaoProgramaTransferegov').then(resposta => {
//console.log(resposta.data);
this.acaoProgramas = resposta.data;
this.acaoPrograma = '';
......
resources/views/layouts/nav/nav_sistema.blade.php
View file @ 5298cb78
......@@ -85,8 +85,8 @@
<ul>
@can('eGestao')
<li><a class="menu-item" href="{{ url('/admin/transferegov/execucao_orcamentaria/consultar') }}" title="Execução Orçamentária"><span class="icon">
<i class="fas fa-file fa-lg"></i></span><span class="content">Execução Orçamentária</span></a>
<li><a class="menu-item" href="{{ url('/admin/transferegov/execucao_orcamentaria/consultar') }}" title="Execução Transferegov"><span class="icon">
<i class="fas fa-file fa-lg"></i></span><span class="content">Execução Transferegov</span></a>
</li>
<li><a class="menu-item" href="{{ url('/admin/selecao/propostas/transferegov') }}" title="Propostas Transferegov"><span class="icon">
<i class="fas fa-file fa-lg"></i></span><span class="content">Propostas Transferegov</span></a>
......
resources/views/modulo_propostas/proposta/admin/ListaExecucaoTransferegov.blade.php
View file @ 5298cb78
......@@ -17,7 +17,7 @@
:telanterior01="'Propostas'"
:telanterior02="'Transferegov'"
:telanterior02="'Consultar Execução Orçamentária'"
:telatual="'Execução Orçamentária Transferegov'"
:telatual="'Execução Transferegov'"
>
</historico-navegacao>
......@@ -26,7 +26,7 @@
<div class="main-content pl-sm-3 mt-5" id="main-content" style="min-height: 100% width 100%">
<cabecalho-relatorios
:titulo="'Execução Orçamentária Transferegov'"
:titulo="'Execução Transferegov'"
barracompartilhar="false">
</cabecalho-relatorios>
......@@ -45,14 +45,13 @@
<tr class="text-center">
@if($acaoSelecionada == 'false')
@if($acaoSelecionada == 'true')
<th>#</th>
<th>UF Sistema</th>
<th>Município Sistema</th>
@endif
<th>Ação Transferegov</th>
<th>Programa Transferegov</th>
<th>Situação Ajustada</th>
<th>Valor Repasse</th>
</tr>
......@@ -62,7 +61,7 @@
<tr class="text-center">
@if($acaoSelecionada == 'false')
@if($acaoSelecionada == 'true')
<td>{{$loop->index+1}} </td>
<td>{{$dados->uf_transferegov}}</td>
<td>{{$dados->municipio_transferegov}}</td>
......@@ -75,7 +74,6 @@
-->
@endif
<td>{{$dados->acao_orcamentaria}}</td>
<td>{{$dados->programa_transferegov}}</td>
<td>{{$dados->situacao_ajustada}}</td>
<td >{{number_format( ($dados->vlr_repasse_transferegov), 2, ',' , '.')}}</td>
......@@ -83,10 +81,10 @@
</tr>
@endforeach
<tr class="total">
@if($acaoSelecionada == 'false')
<td colspan="6" > <strong>TOTAL</strong></td>
@if($acaoSelecionada == 'true')
<td colspan="5" > <strong>TOTAL</strong></td>
@else
<td colspan="3" > <strong>TOTAL</strong></td>
<td colspan="2" > <strong>TOTAL</strong></td>
@endif
<td> <strong> {{number_format( ($propostasTransferegov->sum('vlr_repasse_transferegov')), 2, ',' , '.')}}</strong></td>
</tr>
......
routes/api.php
View file @ 5298cb78
......@@ -64,6 +64,9 @@ Route::get('/situacao_ajustada_proposta', 'ApiController@buscarSituacaoPropostaA
Route::get('/sistema_vs_transferegov', 'ApiController@buscarSistemaVsTransferegov');
Route::get('/valida_cnpj', 'ApiController@buscarValidaCnpj');
Route::get('/acaoProgramaTransferegov', 'ApiController@buscarAcaoProgramaTransferegov');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment