From b6f0ce1ec1b249c29ef615405cd095aa944dc6e7 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Fri, 4 Dec 2020 17:22:54 -0600 Subject: [PATCH 1/5] faltanFormas --- components/responsable/cartaTermino.vue | 32 ++++++ components/responsable/cuestionario.vue | 128 +++++++++++++++++++++++ components/responsable/inputTable.vue | 25 ++++- pages/responsable/cartaTermino/index.vue | 14 +++ pages/responsable/cuestionario/index.vue | 9 +- 5 files changed, 201 insertions(+), 7 deletions(-) create mode 100644 components/responsable/cartaTermino.vue create mode 100644 components/responsable/cuestionario.vue create mode 100644 pages/responsable/cartaTermino/index.vue diff --git a/components/responsable/cartaTermino.vue b/components/responsable/cartaTermino.vue new file mode 100644 index 0000000..891bf5e --- /dev/null +++ b/components/responsable/cartaTermino.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/components/responsable/cuestionario.vue b/components/responsable/cuestionario.vue new file mode 100644 index 0000000..27a79fc --- /dev/null +++ b/components/responsable/cuestionario.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/components/responsable/inputTable.vue b/components/responsable/inputTable.vue index 10451c1..0f89b5f 100644 --- a/components/responsable/inputTable.vue +++ b/components/responsable/inputTable.vue @@ -67,21 +67,27 @@ @page-change="onPageChange" > - {{ props.row.nombre}} + {{ props.row.nombre}} + {{ props.row.nombre}} - {{ props.row.numeroCuenta}} + {{ props.row.numeroCuenta}} + {{ props.row.numeroCuenta}} - {{ props.row.carrera}} + {{ props.row.carrera}} + {{ props.row.carrera}} - {{ fecha(props.row.fechaInicio) }} + {{ fecha(props.row.fechaInicio) }} + {{ fecha(props.row.fechaInicio) }} - {{ fecha(props.row.fechaFin) }} + {{ fecha(props.row.fechaFin) }} + {{ fecha(props.row.fechaFin) }} + {{ fecha(props.row.fechaFin) }} {{ props.row.status}} @@ -177,6 +183,7 @@ export default { } }, botonCarta (cartaTermino) { + this.$router.push('/responsable/cartaTermino') if (cartaTermino === 1) { return 'is-success' } else { @@ -184,6 +191,7 @@ export default { } }, botonCuestionario (cuestionario) { + this.$router.push('/responsable/cuestionario') if (cuestionario === 1) { return 'is-success' } else { @@ -246,6 +254,10 @@ export default { this.loading = false }) }, + Servicio (idServicio) { + window.localStorage.setItem('idServicio', idServicio) + this.$router.push('/responsable/cartaTermino') + }, admRes () { this.idUsuario = localStorage.getItem('idUsuario') console.log(this.idUsuario) @@ -274,4 +286,7 @@ export default { background-color: #1b3d70; border-color: #1b3d70; } +.cursor{ + cursor: pointer; +} diff --git a/pages/responsable/cartaTermino/index.vue b/pages/responsable/cartaTermino/index.vue new file mode 100644 index 0000000..1f2433a --- /dev/null +++ b/pages/responsable/cartaTermino/index.vue @@ -0,0 +1,14 @@ + + + diff --git a/pages/responsable/cuestionario/index.vue b/pages/responsable/cuestionario/index.vue index 014129f..2081068 100644 --- a/pages/responsable/cuestionario/index.vue +++ b/pages/responsable/cuestionario/index.vue @@ -1,9 +1,14 @@ From a2cc9cf7133c29bddbd582bf7660999fa371d194 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Fri, 4 Dec 2020 17:55:45 -0600 Subject: [PATCH 2/5] cartaCuestionario --- components/responsable/cartaTermino.vue | 6 ++++++ components/responsable/cuestionario.vue | 9 ++++++++- pages/responsable/cartaTermino/index.vue | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/components/responsable/cartaTermino.vue b/components/responsable/cartaTermino.vue index 891bf5e..b638a90 100644 --- a/components/responsable/cartaTermino.vue +++ b/components/responsable/cartaTermino.vue @@ -14,6 +14,12 @@ + + Enviar diff --git a/components/responsable/cuestionario.vue b/components/responsable/cuestionario.vue index 27a79fc..a78cbe1 100644 --- a/components/responsable/cuestionario.vue +++ b/components/responsable/cuestionario.vue @@ -98,7 +98,14 @@ type="is-info" tag="router-link" to="/responsable" - icon-left="arrow-left-box">Regresar + >Regresar + + Enviar diff --git a/pages/responsable/cartaTermino/index.vue b/pages/responsable/cartaTermino/index.vue index 1f2433a..aeca078 100644 --- a/pages/responsable/cartaTermino/index.vue +++ b/pages/responsable/cartaTermino/index.vue @@ -1,6 +1,6 @@ From c646387447a69d5471af88fe9d4de77f723c2e19 Mon Sep 17 00:00:00 2001 From: Lemuel Marquez Date: Fri, 4 Dec 2020 18:08:02 -0600 Subject: [PATCH 3/5] menu mejorado --- components/alumno/ejemplo.vue | 9 --------- components/layouts/Logout.vue | 29 ++++++++++++++++++++++------- 2 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 components/alumno/ejemplo.vue diff --git a/components/alumno/ejemplo.vue b/components/alumno/ejemplo.vue deleted file mode 100644 index be22198..0000000 --- a/components/alumno/ejemplo.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/components/layouts/Logout.vue b/components/layouts/Logout.vue index 6ccfeaf..88dff85 100644 --- a/components/layouts/Logout.vue +++ b/components/layouts/Logout.vue @@ -1,27 +1,42 @@ From 81e14523f3aad4b93acf2d3d7d79d3737d41a22c Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Mon, 7 Dec 2020 14:11:29 -0600 Subject: [PATCH 4/5] V-2.2-StatusTable --- components/admin/servicio/inputTableA.vue | 19 +++++--------- components/responsable/inputTable.vue | 32 +++++++++++------------ pages/admin/index.vue | 7 +++++ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/components/admin/servicio/inputTableA.vue b/components/admin/servicio/inputTableA.vue index d67ec8f..69d3147 100644 --- a/components/admin/servicio/inputTableA.vue +++ b/components/admin/servicio/inputTableA.vue @@ -46,19 +46,13 @@
- + Buscar
-
- - Ver programas - -
-
{ const servicios = res.data.servicios @@ -218,14 +212,13 @@ export default { window.localStorage.setItem('idServicio', idServicio) this.$router.push('/admin/servicio') }, - admRes () { + insertIdLocal () { this.idUsuario = localStorage.getItem('idUsuario') - console.log(this.idUsuario) } }, created () { - this.admRes() - this.obtenerDatos() + this.insertIdLocal() + this.obtenerDatos(0) } } diff --git a/components/responsable/inputTable.vue b/components/responsable/inputTable.vue index 0f89b5f..19c9a7a 100644 --- a/components/responsable/inputTable.vue +++ b/components/responsable/inputTable.vue @@ -45,7 +45,7 @@
- + Buscar
@@ -67,32 +67,33 @@ @page-change="onPageChange" > - {{ props.row.nombre}} + {{ props.row.nombre}} {{ props.row.nombre}} - {{ props.row.numeroCuenta}} + {{ props.row.numeroCuenta}} {{ props.row.numeroCuenta}} - {{ props.row.carrera}} + {{ props.row.carrera}} {{ props.row.carrera}} - {{ fecha(props.row.fechaInicio) }} + {{ fecha(props.row.fechaInicio) }} {{ fecha(props.row.fechaInicio) }} - {{ fecha(props.row.fechaFin) }} + {{ fecha(props.row.fechaFin) }} {{ fecha(props.row.fechaFin) }} - {{ fecha(props.row.fechaFin) }} + {{ fecha(props.row.fechaFin) }} {{ props.row.status}} -
+ ----- +
@@ -111,7 +112,8 @@ -
+ ----- +
@@ -216,11 +218,10 @@ export default { const fecha = moment(date.substr(0, 10)) return `${fecha.date()}/${fecha.month() + 1}/${fecha.year()}` }, - obtenerDatos () { + obtenerDatos (idStatus) { this.loading = true this.data = [] - - axios.get(`${process.env.api}/servicio/servicios_responsable?idUsuario=${this.idUsuario}&pagina=${this.page}&idStatus=${this.idStatus}&nombre=${this.nombre}&numeroCuenta=${this.numeroCuenta}`) + axios.get(`${process.env.api}/servicio/servicios_responsable?idUsuario=${this.idUsuario}&pagina=${this.page}&idStatus=${idStatus}&nombre=${this.nombre}&numeroCuenta=${this.numeroCuenta}`) .then(res => { const servicios = res.data.servicios @@ -258,14 +259,13 @@ export default { window.localStorage.setItem('idServicio', idServicio) this.$router.push('/responsable/cartaTermino') }, - admRes () { + insertIdLocal () { this.idUsuario = localStorage.getItem('idUsuario') - console.log(this.idUsuario) } }, created () { - this.admRes() - this.obtenerDatos() + this.insertIdLocal() + this.obtenerDatos(0) } } diff --git a/pages/admin/index.vue b/pages/admin/index.vue index 59750ba..cfbcd92 100644 --- a/pages/admin/index.vue +++ b/pages/admin/index.vue @@ -1,6 +1,13 @@