CIDWA/servicio_social_front
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge error

Browse Source
This commit is contained in:
Lemuel Marquez
2020-12-28 21:42:09 -06:00
parent 2cc5c41000 ac57ca1649
commit 065561783c
13 changed files with 354 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/admin/programa/infoResponsable/edit/index.vue
+1 -1
View File
@@ -8,7 +8,7 @@
</b-button>
<p class="is-size-2">Editar información del responsable</p>
<b-field label="Nombre">
<b-input type="email" v-model="nuevo.nombre" :placeholder="viejo.nombre">
<b-input type="text" v-model="nuevo.nombre" :placeholder="viejo.nombre">
</b-input>
</b-field>
<b-field label="Correo eletrónico">
pages/admin/programa/infoResponsable/index.vue
+26 -16
View File
@@ -3,22 +3,24 @@
<b-button class="boton is-info my-5" @click="regresar()">
Regresar
</b-button>
<p class="is-size-2 mb-4">Información del responsable</p>
<p class="is-size-4 mb-4">Nombre: {{ nombre }}</p>
<p class="is-size-4 mb-4">Correo: {{ correo }}</p>
<p class="is-size-4">Programa:</p>
<b-select v-model="selected" placeholder="Elija un programa">
<option
v-for="programa in programas"
v-bind:key="programa.id"
:value="programa"
>
{{ programa.programa }}
</option>
</b-select>
<p class="is-size-4 mb-4">Institución: {{ selected.institucion }}</p>
<p class="is-size-4 mb-4">Dependencia: {{ selected.dependencia }}</p>
<p class="is-size-4 mb-4">Clave: {{ selected.clavePrograma }}</p>
<p class="is-size-2 mb-4"> Información del responsable</p>
<p class="is-size-4 mb-4"> <strong>Nombre: </strong> {{ nombre }}</p>
<p class="is-size-4 mb-4"> <strong>Correo: </strong> {{ correo }}</p>
<div class="columns">
<p class="is-size-4 column is-narrow" style="width: 125px;"> <strong>Programa: </strong></p>
<b-select class="column" v-model="selected" placeholder="Elija un programa">
<option
v-for="programa in programas"
v-bind:key="programa.id"
:value="programa"
>
{{ programa.programa }}
</option>
</b-select>
</div>
<p class="is-size-4 mb-4"> <strong>Institución: </strong> {{ selected.institucion }}</p>
<p class="is-size-4 mb-4"> <strong>Dependencia: </strong> {{ selected.dependencia }}</p>
<p class="is-size-4 mb-4"> <strong>Clave: </strong> {{ selected.clavePrograma }}</p>
<div class="">
<b-button
class="boton is-info my-5"
@@ -81,3 +83,11 @@ export default {
}
};
</script>
<style scoped>
.programa{
margin-right: 20px;
padding-right: 20px;
}
</style>