diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js index d1d8a57f3b..287db07757 100644 --- a/front/core/components/searchbar/searchbar.js +++ b/front/core/components/searchbar/searchbar.js @@ -78,7 +78,7 @@ export default class Searchbar extends Component { } fetchStateFilter(autoLoad) { - let filter = null; + let filter = this.filter ? this.filter : null; if (this.$state.is(this.searchState)) { if (this.$params.q) { diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html index 4f95abf772..453f3105b5 100644 --- a/modules/item/front/request-search-panel/index.html +++ b/modules/item/front/request-search-panel/index.html @@ -51,8 +51,11 @@ - - + + - + Ticket ID - Shipped - Description + Shipped + Description Requested Price Atender @@ -40,7 +42,7 @@ {{request.ticketFk}} - + {{::request.shipped | date: 'dd/MM/yyyy'}} @@ -53,7 +55,7 @@ - {{::request.atenderNickname}} + {{::request.attenderName}} diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js index 8383343de0..a5f030e78e 100644 --- a/modules/item/front/request/index.js +++ b/modules/item/front/request/index.js @@ -8,19 +8,16 @@ export default class Controller extends Section { if (!this.$state.q) { const today = new Date(); - today.setHours(23, 59, 59, 59); + today.setHours(0, 0, 0, 0); - const lastWeek = new Date(); - lastWeek.setHours(0, 0, 0, 0); - lastWeek.setDate(lastWeek.getDate() - 7); + const nextWeek = new Date(); + nextWeek.setHours(23, 59, 59, 59); + nextWeek.setDate(nextWeek.getDate() + 7); - this.filter = { - where: { - isOk: false, - mine: true, - from: lastWeek, - to: today - } + this.filterParams = { + mine: true, + from: today, + to: nextWeek }; } } diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js index 8f1f837d2a..ecd88caeb4 100644 --- a/modules/ticket/back/methods/ticket-request/filter.js +++ b/modules/ticket/back/methods/ticket-request/filter.js @@ -115,12 +115,13 @@ module.exports = Self => { s.itemFk, i.name AS itemDescription, t.shipped, + DATE(t.shipped) AS shippedDate, t.nickname, t.warehouseFk, t.clientFk, w.name AS warehouse, u.nickname AS salesPersonNickname, - ua.nickname AS atenderNickname, + ua.name AS attenderName, c.salesPersonFk FROM ticketRequest tr LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk