Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sistema_mcid
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
marcio neto
sistema_mcid
Commits
226a1ea9
Commit
226a1ea9
authored
Oct 05, 2023
by
sandroresende
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
inclusao formulario painel
parent
b5944701
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
383 additions
and
17 deletions
+383
-17
app.js
public/js/app.js
+371
-11
CabecalhoRelatorios.vue
...urces/assets/js/components/gerais/CabecalhoRelatorios.vue
+2
-2
FormularioPainel.vue
.../js/components/mod_formulario_painel/FormularioPainel.vue
+1
-1
DadosContratoFormPainel.blade.php
...odulo_formulario_painel/DadosContratoFormPainel.blade.php
+7
-2
DadosProposta.blade.php
...s/views/modulo_propostas/proposta/DadosProposta.blade.php
+2
-1
No files found.
public/js/app.js
View file @
226a1ea9
...
...
@@ -50275,11 +50275,11 @@ var render = function() {
[_vm._v(_vm._s(_vm.subtitulo1) + " ")]
),
_vm._v(" "),
_c("p", { staticClass: "h
4
-subtitulo text-gray-70 text-center" }, [
_c("p", { staticClass: "h
3
-subtitulo text-gray-70 text-center" }, [
_vm._v(_vm._s(_vm.subtitulo2) + " ")
]),
_vm._v(" "),
_c("p", { staticClass: "text-gray-70 text-center" }, [
_c("p", { staticClass: "
h4-subtitulo
text-gray-70 text-center" }, [
_vm._v(_vm._s(_vm.subtitulo3) + " ")
]),
_vm._v(" "),
...
...
@@ -54798,6 +54798,49 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
props: ['url', 'dados'],
...
...
@@ -54806,7 +54849,15 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
uf: '',
municipio: '',
cod_contrato: '',
dte_assinatura_contrato: ''
dte_assinatura_contrato: '',
vlr_investimento: 0,
vlr_repasse: 0,
vlr_contrapartida: 0,
dte_inicio_obra_prevista: '',
dte_inicio_obra_efetiva: '',
dte_fim_obra_prevista: '',
dte_fim_obra: ''
};
},
...
...
@@ -54829,6 +54880,13 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
this.municipio = this.dados.municipio;
this.cod_contrato = this.dados.cod_contrato;
this.dte_assinatura_contrato = this.dados.dte_assinatura_contrato;
this.vlr_investimento = Number(this.dados.vlr_investimento);
this.vlr_repasse = Number(this.dados.vlr_repasse);
this.vlr_contrapartida = Number(this.dados.vlr_contrapartida);
this.dte_inicio_obra_prevista = this.dados.dte_inicio_obra_prevista;
this.dte_inicio_obra_efetiva = this.dados.dte_inicio_obra_efetiva;
this.dte_fim_obra_prevista = this.dados.dte_fim_obra_prevista;
this.dte_fim_obra = this.dados.dte_fim_obra;
}
}
});
...
...
@@ -54869,7 +54927,7 @@ var render = function() {
{ staticClass: "col col-xs-12 col-sm-2 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("
1.1.
UF")
_vm._v("UF")
]),
_vm._v(" "),
_c("input", {
...
...
@@ -54883,7 +54941,7 @@ var render = function() {
],
attrs: {
id: "uf",
name: "
cod_saci
",
name: "
uf
",
type: "text",
disabled: "disabled"
},
...
...
@@ -54905,7 +54963,7 @@ var render = function() {
{ staticClass: "col col-xs-12 col-sm-4 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("
1.2.
Município")
_vm._v("Município")
]),
_vm._v(" "),
_c("input", {
...
...
@@ -54919,7 +54977,7 @@ var render = function() {
],
attrs: {
id: "municipio",
name: "
cod_mcidades
",
name: "
nubicipio
",
type: "text",
disabled: "disabled"
},
...
...
@@ -54941,7 +54999,7 @@ var render = function() {
{ staticClass: "col col-xs-12 col-sm-3 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("
1.3.
Contrato")
_vm._v("
Código do
Contrato")
]),
_vm._v(" "),
_c("input", {
...
...
@@ -54955,7 +55013,7 @@ var render = function() {
],
attrs: {
id: "cod_contrato",
name: "cod_
mcidades
",
name: "cod_
contrato
",
type: "text",
disabled: "disabled"
},
...
...
@@ -54977,7 +55035,7 @@ var render = function() {
{ staticClass: "col col-xs-12 col-sm-3 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("
1.3.
Data de Assinatura")
_vm._v("Data de Assinatura")
]),
_vm._v(" "),
_c("input", {
...
...
@@ -55007,6 +55065,280 @@ var render = function() {
})
]
)
]),
_vm._v(" "),
_c("div", { staticClass: "row" }, [
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-4 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Valor Investimento")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.vlr_investimento,
expression: "vlr_investimento"
}
],
attrs: {
id: "vlr_investimento",
name: "vlr_investimento",
type: "text",
disabled: "disabled"
},
domProps: { value: _vm.vlr_investimento },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.vlr_investimento = $event.target.value
}
}
})
]
),
_vm._v(" "),
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-4 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Valor Repasse")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.vlr_repasse,
expression: "vlr_repasse"
}
],
attrs: {
id: "vlr_repasse",
name: "vlr_repasse",
type: "text",
disabled: "disabled"
},
domProps: { value: _vm.vlr_repasse },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.vlr_repasse = $event.target.value
}
}
})
]
),
_vm._v(" "),
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-4 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Valor Contrapartida")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.vlr_contrapartida,
expression: "vlr_contrapartida"
}
],
attrs: {
id: "vlr_contrapartida",
name: "vlr_contrapartida",
type: "text",
disabled: "disabled"
},
domProps: { value: _vm.vlr_contrapartida },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.vlr_contrapartida = $event.target.value
}
}
})
]
)
])
])
]
)
]),
_vm._v(" "),
_c("div", { staticClass: "accordion-item" }, [
_vm._m(1),
_vm._v(" "),
_c(
"div",
{
staticClass: "accordion-collapse collapse show",
attrs: {
id: "panelsStayOpen-collapseTwo",
"aria-labelledby": "panelsStayOpen-headingTwo"
}
},
[
_c("div", { staticClass: "accordion-body" }, [
_c("div", { staticClass: "row" }, [
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-3 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Data Início Previsto")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.dte_inicio_obra_prevista,
expression: "dte_inicio_obra_prevista"
}
],
attrs: {
id: "dte_inicio_obra_prevista",
name: "dte_inicio_obra_prevista",
type: "date",
disabled: "disabled"
},
domProps: { value: _vm.dte_inicio_obra_prevista },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.dte_inicio_obra_prevista = $event.target.value
}
}
})
]
),
_vm._v(" "),
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-3 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Data Início Efetiva")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.dte_inicio_obra_efetiva,
expression: "dte_inicio_obra_efetiva"
}
],
attrs: {
id: "dte_inicio_obra_efetiva",
name: "dte_inicio_obra_efetiva",
type: "date",
disabled: "disabled"
},
domProps: { value: _vm.dte_inicio_obra_efetiva },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.dte_inicio_obra_efetiva = $event.target.value
}
}
})
]
),
_vm._v(" "),
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-3 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Data Fim Previsto")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.dte_fim_obra_prevista,
expression: "dte_fim_obra_prevista"
}
],
attrs: {
id: "dte_fim_obra_prevista",
name: "dte_fim_obra_prevista",
type: "date",
disabled: "disabled"
},
domProps: { value: _vm.dte_fim_obra_prevista },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.dte_fim_obra_prevista = $event.target.value
}
}
})
]
),
_vm._v(" "),
_c(
"div",
{ staticClass: "col col-xs-12 col-sm-3 br-input" },
[
_c("label", { attrs: { for: "input-default" } }, [
_vm._v("Data Fim Efetiva")
]),
_vm._v(" "),
_c("input", {
directives: [
{
name: "model",
rawName: "v-model",
value: _vm.dte_fim_obra,
expression: "dte_fim_obra"
}
],
attrs: {
id: "dte_fim_obra",
name: "dte_fim_obra",
type: "date",
disabled: "disabled"
},
domProps: { value: _vm.dte_fim_obra },
on: {
input: function($event) {
if ($event.target.composing) {
return
}
_vm.dte_fim_obra = $event.target.value
}
}
})
]
)
])
])
]
...
...
@@ -55040,9 +55372,37 @@ var staticRenderFns = [
"aria-controls": "panelsStayOpen-collapseOne"
}
},
[_vm._v("\n Dados Principais\n ")]
)
]
)
},
function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c(
"h2",
{
staticClass: "accordion-header",
attrs: { id: "panelsStayOpen-headingTwo" }
},
[
_c(
"button",
{
staticClass: "accordion-button",
attrs: {
type: "button",
"data-bs-toggle": "collapse",
"data-bs-target": "#panelsStayOpen-collapseTwo",
"aria-expanded": "true",
"aria-controls": "panelsStayOpen-collapseTwo"
}
},
[
_vm._v(
"\n
1. Dados Principais\n
"
"\n
2. Dados de Monitoramento
"
)
]
)
resources/assets/js/components/gerais/CabecalhoRelatorios.vue
View file @
226a1ea9
...
...
@@ -2,8 +2,8 @@
<div>
<p
class=
"h1-titulo text-blue-warm-vivid-60 text-center"
>
{{
titulo
}}
</p>
<p
class=
"h5-subtitulo text-blue-warm-vivid-90 text-center"
>
{{
subtitulo1
}}
</p>
<p
class=
"h
4
-subtitulo text-gray-70 text-center"
>
{{
subtitulo2
}}
</p>
<p
class=
"text-gray-70 text-center"
>
{{
subtitulo3
}}
</p>
<p
class=
"h
3
-subtitulo text-gray-70 text-center"
>
{{
subtitulo2
}}
</p>
<p
class=
"
h4-subtitulo
text-gray-70 text-center"
>
{{
subtitulo3
}}
</p>
<p
class=
"text-gray-70 text-center"
>
{{
subtitulo4
}}
</p>
...
...
resources/assets/js/components/mod_formulario_painel/FormularioPainel.vue
View file @
226a1ea9
...
...
@@ -19,7 +19,7 @@
<input
id=
"municipio"
name=
"nubicipio"
type=
"text"
v-model=
"municipio"
disabled=
"disabled"
/>
</div>
<div
class=
"col col-xs-12 col-sm-3 br-input"
>
<label
for=
"input-default"
>
Contrato
</label>
<label
for=
"input-default"
>
C
ódigo do C
ontrato
</label>
<input
id=
"cod_contrato"
name=
"cod_contrato"
type=
"text"
v-model=
"cod_contrato"
disabled=
"disabled"
/>
</div>
<div
class=
"col col-xs-12 col-sm-3 br-input"
>
...
...
resources/views/modulo_formulario_painel/DadosContratoFormPainel.blade.php
View file @
226a1ea9
...
...
@@ -26,8 +26,13 @@
<cabecalho-relatorios
:titulo="
'{{$carteira->txt_empreendimento}}'
"
:subtitulo1="
'{{$carteira->tipo_instrumento}}'
"
:subtitulo2="
'{{$carteira->municipio}} - {{$carteira->uf}}'
"
:subtitulo1="
'{{$carteira->municipio}} - {{$carteira->uf}}'
"
:subtitulo2="
'{{$carteira->tipo_instrumento}}'
"
:subtitulo3="
'{{$carteira->dsc_area_investimento}}'
"
:subtitulo4="
'Execuçäo Física: {{number_format( ($carteira->prc_execucao), 0, '
,
' , '
.
')}}%'
"
:linkcompartilhar="
'{{ url("/formulario_painel/contrato/$carteira->cod_contrato") }}'
"
:dataatualizacao="
'{{date('
d
/
m
/
Y
',strtotime($carteira->dte_controle))}}'
"
barracompartilhar="
true
">
...
...
resources/views/modulo_propostas/proposta/DadosProposta.blade.php
View file @
226a1ea9
...
...
@@ -36,7 +36,8 @@
@elseif(
$proposta->created_at
)
:dataatualizacao="
'{{date('
d
/
m
/
Y
',strtotime($proposta->updated_at))}}'
"
@endif
barracompartilhar="
true
">
barracompartilhar="
true
"
>
<div class="
text
-
center
">
@if(
$proposta->situacao_proposta_id
== 4 ||
$proposta->situacao_proposta_id
== 6)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment