diff --git a/src/components/pages/PanelAdministrator.vue b/src/components/pages/PanelAdministrator.vue index 89e792b0612c8da04dbb432308d87affd4c832af..3553636ba8c01a87f07576e68f0d22c9d0198fc8 100644 --- a/src/components/pages/PanelAdministrator.vue +++ b/src/components/pages/PanelAdministrator.vue @@ -100,7 +100,7 @@ export default { options: [ ], dataTable : { - perPage: 5, + perPage: 10, currentPage: 1, fields : { activity_name : { @@ -190,7 +190,6 @@ export default { updateActivity: function(event) { this.fillDataTable(event.$oid) - }, fillAdmin : function() { let fetchData = { @@ -215,7 +214,6 @@ export default { }, fillDataTable : function(idPage) { if (idPage === 'top') { - this.dataTable.items = [] let fetchData = { method: 'POST', body: JSON.stringify({ year: 2019, return_admin : true }), @@ -226,6 +224,7 @@ export default { .then(response => response.json()) .then(response => { if(response.status === 200) { + this.dataTable.items = [] for ( let i =0 ; i < response.subdata.length; i++) { let admin = '--' if (response.admin_subdata[i] !== null) { @@ -233,7 +232,6 @@ export default { } this.dataTable.items.push({id:response.subdata[i]._id, activity_name:response.subdata[i].name, admin_name : admin}) } - this.dataTable.current_item.id = response.data._id.$oid this.dataTable.current_item.admin_name = response.admin.name this.dataTable.current_item.activity_name = response.data.name @@ -261,11 +259,14 @@ export default { } this.dataTable.items.push({id:response.subdata[i]._id, activity_name:response.subdata[i].name, admin_name : admin}) } - this.dataTable.current_item.id = response.data._id.$oid - this.dataTable.current_item.admin_name = response.admin.name + if( response.admin !== null ) + this.dataTable.current_item.admin_name = response.admin.name + else + this.dataTable.current_item.admin_name = '--' this.dataTable.current_item.activity_name = response.data.name - this.dataStack.push(idPage); + this.dataStack.push(idPage); + } }) @@ -274,10 +275,8 @@ export default { }, backState : function() { - alert("back") this.dataStack.pop() let current= this.dataStack.pop() - console.log(current) this.fillDataTable(current) } diff --git a/src/components/partials/TableBudget.vue b/src/components/partials/TableBudget.vue index de4fecc279ac545bb1a0f59bbd4e074b255a04ea..94704fad5404a38c4757b2eef5f6d58535a8f5fe 100644 --- a/src/components/partials/TableBudget.vue +++ b/src/components/partials/TableBudget.vue @@ -224,6 +224,8 @@ export default { }, seeDetail : function(row) { // this.isBusy = true + console.log('row : ') + console.log(row.item.id) this.$emit('changeActivity',row.item.id); }, showModal : function() {