From 68c1c95ff4ae46eca1a693f2e686711e703c89df Mon Sep 17 00:00:00 2001 From: Lemuel Marquez Date: Wed, 4 Aug 2021 17:03:13 -0500 Subject: [PATCH] responsable funiones imprimir --- components/admin/registros/reporte.vue | 1 - components/admin/responsables/cargaMasiva.vue | 65 +++++++------------ .../modificar/updateResponsable.vue | 46 ++++--------- .../infoResponsable/responsable.vue | 44 ++++--------- .../admin/responsables/tablaResponsables.vue | 48 ++++---------- pages/admin/responsables/index.vue | 7 -- .../responsables/infoResponsable/index.vue | 12 +--- .../infoResponsable/modificar/index.vue | 12 +--- 8 files changed, 65 insertions(+), 170 deletions(-) diff --git a/components/admin/registros/reporte.vue b/components/admin/registros/reporte.vue index d833b70..b602f77 100644 --- a/components/admin/registros/reporte.vue +++ b/components/admin/registros/reporte.vue @@ -57,7 +57,6 @@ export default { imprimirWarning: { type: Function, required: true }, imprimirError: { type: Function, required: true }, }, - methods: { validarFechas() { const fechaInicio = moment(new Date(this.selectedInicio)) diff --git a/components/admin/responsables/cargaMasiva.vue b/components/admin/responsables/cargaMasiva.vue index 4ffffde..be93d25 100644 --- a/components/admin/responsables/cargaMasiva.vue +++ b/components/admin/responsables/cargaMasiva.vue @@ -11,7 +11,11 @@ expanded >

@@ -29,34 +33,38 @@

- Enviar archivo + + Enviar archivo + - Descargar plantilla + + Descargar plantilla +
- - +
diff --git a/components/admin/responsables/infoResponsable/modificar/updateResponsable.vue b/components/admin/responsables/infoResponsable/modificar/updateResponsable.vue index b15ac6b..c746831 100644 --- a/components/admin/responsables/infoResponsable/modificar/updateResponsable.vue +++ b/components/admin/responsables/infoResponsable/modificar/updateResponsable.vue @@ -53,14 +53,18 @@ import axios from 'axios' export default { data() { return { - admin: {}, responsable: {}, idResponsable: null, nuevo: {}, - token: {}, isLoading: false, } }, + props: { + admin: { type: Object, required: true }, + imprimirMensaje: { type: Function, required: true }, + imprimirWarning: { type: Function, required: true }, + imprimirError: { type: Function, required: true }, + }, methods: { mostrarBoton() { if (this.nuevo.correo) { @@ -106,7 +110,7 @@ export default { axios .get( `${process.env.api}/usuario/responsable?idUsuario=${this.idResponsable}`, - this.token + this.admin.token ) .then((res) => { this.responsable = res.data @@ -125,7 +129,11 @@ export default { if (this.nuevo.correo) data.correo = this.nuevo.correo if (this.nuevo.nombre) data.nombre = this.nuevo.nombre axios - .put(`${process.env.api}/usuario/responsable/update`, data, this.token) + .put( + `${process.env.api}/usuario/responsable/update`, + data, + this.admin.token + ) .then((res) => { this.isLoading = false this.toast() @@ -144,7 +152,7 @@ export default { .put( `${process.env.api}/usuario/new_password_responsable`, data, - this.token + this.admin.token ) .then((res) => { this.$buefy.toast.open({ @@ -159,35 +167,9 @@ export default { this.imprimirError(err.response.data) }) }, - imprimirError(err) { - this.$buefy.dialog.alert({ - title: 'Error', - message: err.message, - type: 'is-danger', - hasIcon: true, - icon: 'alert-circle', - ariaRole: 'alertdialog', - ariaModal: true, - }) - if (err.err === 'token error') { - localStorage.clear() - this.$router.push('/') - } - }, - getLocalhostInfo() { - this.admin.idUsuario = localStorage.getItem('idUsuario') - this.admin.idTipoUsuario = Number(localStorage.getItem('idTipoUsuario')) - this.admin.tipoUsuario = localStorage.getItem('tipoUsuario') - this.token = { - headers: { - token: localStorage.getItem('token'), - }, - } - this.idResponsable = localStorage.getItem('idResponsable') - }, }, created() { - this.getLocalhostInfo() + this.idResponsable = localStorage.getItem('idResponsable') if (this.admin.idTipoUsuario === 1) this.obtenerResponsable() }, } diff --git a/components/admin/responsables/infoResponsable/responsable.vue b/components/admin/responsables/infoResponsable/responsable.vue index 45d1136..90972a4 100644 --- a/components/admin/responsables/infoResponsable/responsable.vue +++ b/components/admin/responsables/infoResponsable/responsable.vue @@ -22,6 +22,7 @@

{{ programa.institucion }}

+

{{ programa.dependencia }}

@@ -41,8 +42,7 @@ - - + @@ -52,23 +52,27 @@ import axios from 'axios' export default { data() { return { - admin: {}, idResponsable: null, responsable: {}, programas: [], programa: {}, programaSeleccionado: '', - token: {}, isLoading: false, } }, + props: { + admin: { type: Object, required: true }, + imprimirMensaje: { type: Function, required: true }, + imprimirWarning: { type: Function, required: true }, + imprimirError: { type: Function, required: true }, + }, methods: { obtenerResponsable() { this.isLoading = true axios .get( `${process.env.api}/usuario/responsable?idUsuario=${this.idResponsable}`, - this.token + this.admin.token ) .then((res) => { this.responsable = res.data @@ -83,7 +87,7 @@ export default { axios .get( `${process.env.api}/programa/programas_admin?idUsuario=${this.idResponsable}`, - this.token + this.admin.token ) .then((res) => { this.programas = res.data @@ -92,32 +96,6 @@ export default { this.error(err.response.data.message) }) }, - imprimirError(err) { - this.$buefy.dialog.alert({ - title: 'Error', - message: err.message, - type: 'is-danger', - hasIcon: true, - icon: 'alert-circle', - ariaRole: 'alertdialog', - ariaModal: true, - }) - if (err.err === 'token error') { - localStorage.clear() - this.$router.push('/') - } - }, - getLocalhostInfo() { - this.admin.idUsuario = localStorage.getItem('idUsuario') - this.admin.idTipoUsuario = Number(localStorage.getItem('idTipoUsuario')) - this.admin.tipoUsuario = localStorage.getItem('tipoUsuario') - this.token = { - headers: { - token: localStorage.getItem('token'), - }, - } - this.idResponsable = localStorage.getItem('idResponsable') - }, }, watch: { programaSeleccionado() { @@ -125,7 +103,7 @@ export default { }, }, created() { - this.getLocalhostInfo() + this.idResponsable = localStorage.getItem('idResponsable') if (this.admin.idTipoUsuario === 1) { this.obtenerResponsable() this.obtenerProgramas() diff --git a/components/admin/responsables/tablaResponsables.vue b/components/admin/responsables/tablaResponsables.vue index f30d0b5..8df7307 100644 --- a/components/admin/responsables/tablaResponsables.vue +++ b/components/admin/responsables/tablaResponsables.vue @@ -11,7 +11,7 @@ v-model="busqueda.correo" @keyup.enter.native="obtenerResponsables()" rounded - > + /> @@ -22,7 +22,7 @@ v-model="busqueda.nombre" @keyup.enter.native="obtenerResponsables()" rounded - > + />
@@ -65,8 +65,8 @@ - {{ props.row.activo ? 'Activo' : 'Desactivado' }} + + {{ props.row.activo ? 'Activo' : 'Desactivado' }} @@ -79,7 +79,6 @@ import axios from 'axios' export default { data() { return { - admin: {}, data: [], page: 1, perPage: 25, @@ -87,10 +86,15 @@ export default { isLoading: false, busqueda: {}, busquedaAnterior: {}, - token: {}, responsableSeleccionado: {}, } }, + props: { + admin: { type: Object, required: true }, + imprimirMensaje: { type: Function, required: true }, + imprimirWarning: { type: Function, required: true }, + imprimirError: { type: Function, required: true }, + }, methods: { style(activo) { let style = 'tag' @@ -120,7 +124,7 @@ export default { axios .get( `${process.env.api}/usuario/responsables?&pagina=${this.page}${data}`, - this.token + this.admin.token ) .then((res) => { this.data = res.data.responsables @@ -132,31 +136,6 @@ export default { this.imprimirError(err.response.data) }) }, - imprimirError(err) { - this.$buefy.dialog.alert({ - title: 'Error', - message: err.message, - type: 'is-danger', - hasIcon: true, - icon: 'alert-circle', - ariaRole: 'alertdialog', - ariaModal: true, - }) - if (err.err === 'token error') { - localStorage.clear() - this.$router.push('/') - } - }, - getLocalhostInfo() { - this.admin.idUsuario = localStorage.getItem('idUsuario') - this.admin.idTipoUsuario = Number(localStorage.getItem('idTipoUsuario')) - this.admin.tipoUsuario = localStorage.getItem('tipoUsuario') - this.token = { - headers: { - token: localStorage.getItem('token'), - }, - } - }, }, watch: { responsableSeleccionado() { @@ -168,10 +147,7 @@ export default { }, }, created() { - this.getLocalhostInfo() - if (this.admin.idTipoUsuario === 1) { - this.obtenerResponsables() - } + if (this.admin.idTipoUsuario === 1) this.obtenerResponsables() }, } diff --git a/pages/admin/responsables/index.vue b/pages/admin/responsables/index.vue index e4d0543..2dbfce3 100644 --- a/pages/admin/responsables/index.vue +++ b/pages/admin/responsables/index.vue @@ -29,13 +29,6 @@ export default { CargaMasiva, BotonRegresar, }, - beforeCreate() { - const idTipoUsuario = Number(localStorage.getItem('idTipoUsuario')) - - if (idTipoUsuario === 2) this.$router.push('/responsable') - if (idTipoUsuario === 3) this.$router.push('/alumno') - if (idTipoUsuario === 4) this.$router.push('/casoEspecial') - }, data() { return { admin: {}, diff --git a/pages/admin/responsables/infoResponsable/index.vue b/pages/admin/responsables/infoResponsable/index.vue index 7b0f0ea..b273c2c 100644 --- a/pages/admin/responsables/infoResponsable/index.vue +++ b/pages/admin/responsables/infoResponsable/index.vue @@ -28,16 +28,6 @@ export default { BotonRegresar, Responsable, }, - beforeCreate() { - const idTipoUsuario = Number(localStorage.getItem('idTipoUsuario')) - - if (idTipoUsuario === 2) this.$router.push('/responsable') - if (idTipoUsuario === 3) this.$router.push('/alumno') - if (idTipoUsuario === 4) this.$router.push('/casoEspecial') - - if (!localStorage.getItem('idResponsable')) - this.$router.push('/admin/responsables') - }, data() { return { admin: {}, @@ -114,6 +104,8 @@ export default { if (this.admin.idTipoUsuario === 2) this.$router.push('/responsable') if (this.admin.idTipoUsuario === 3) this.$router.push('/alumno') if (this.admin.idTipoUsuario === 4) this.$router.push('/casoEspecial') + if (!localStorage.getItem('idResponsable')) + this.$router.push('/admin/responsables') }, } diff --git a/pages/admin/responsables/infoResponsable/modificar/index.vue b/pages/admin/responsables/infoResponsable/modificar/index.vue index 0843c9a..2309a19 100644 --- a/pages/admin/responsables/infoResponsable/modificar/index.vue +++ b/pages/admin/responsables/infoResponsable/modificar/index.vue @@ -20,16 +20,6 @@ export default { BotonRegresar, UpdateResponsable, }, - beforeCreate() { - const idTipoUsuario = Number(localStorage.getItem('idTipoUsuario')) - - if (idTipoUsuario === 2) this.$router.push('/responsable') - if (idTipoUsuario === 3) this.$router.push('/alumno') - if (idTipoUsuario === 4) this.$router.push('/casoEspecial') - - if (!localStorage.getItem('idResponsable')) - this.$router.push('/admin/responsables') - }, data() { return { admin: {}, @@ -106,6 +96,8 @@ export default { if (this.admin.idTipoUsuario === 2) this.$router.push('/responsable') if (this.admin.idTipoUsuario === 3) this.$router.push('/alumno') if (this.admin.idTipoUsuario === 4) this.$router.push('/casoEspecial') + if (!localStorage.getItem('idResponsable')) + this.$router.push('/admin/responsables') }, }