From 1bc3103d9f73a7d5376d9537eb11915a5931e40d Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 21 Mar 2023 08:44:28 +0100 Subject: [PATCH] refs #5439 filtro comercial --- back/methods/user-config/getUserConfig.js | 2 -- .../front/request-search-panel/index.html | 21 ++++++++++++------- .../front/index/search-panel/index.html | 21 ++++++++++++------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/back/methods/user-config/getUserConfig.js b/back/methods/user-config/getUserConfig.js index 1ea723f52..c8aef963d 100644 --- a/back/methods/user-config/getUserConfig.js +++ b/back/methods/user-config/getUserConfig.js @@ -34,8 +34,6 @@ module.exports = function(Self) { warehouseFk: warehouse.id, companyFk: company.id, userFk: ctx.req.accessToken.userId, - buyed: ticketResquest.buyed, - salesPersonCode: salesPersonNickname }; userConfig = await models.UserConfig.create(newConfig, myOptions); diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html index 1572c6213..f26c05a0b 100644 --- a/modules/item/front/request-search-panel/index.html +++ b/modules/item/front/request-search-panel/index.html @@ -39,17 +39,24 @@ - + ng-model="filter.salesPersonFk" + url="Workers/activeWithInheritedRole" + search-function="{firstName: $search}" + value-field="id" + where="{role: 'logistic'}" + label="Comercial"> + {{firstName}} {{name}} + ng-model="filter.saleFk" + url="Sales/created" + search-function="{id: $search}" + value-field="created" + label="Fecha"> + {{created}}
diff --git a/modules/monitor/front/index/search-panel/index.html b/modules/monitor/front/index/search-panel/index.html index 5d4f97140..e2dbc2e87 100644 --- a/modules/monitor/front/index/search-panel/index.html +++ b/modules/monitor/front/index/search-panel/index.html @@ -93,16 +93,23 @@ + url="Workers/activeWithInheritedRole" + search-function="{firstName: $search}" + value-field="id" + where="{role: 'logistic'}" + label="Comercial"> + {{firstName}} {{name}} - + vn-one + ng-model="filter.saleFk" + url="Sales/created" + search-function="{id: $search}" + value-field="created" + label="Fecha"> + {{created}} +