231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
3 changed files with 28 additions and 16 deletions
Showing only changes of commit 1bc3103d9f - Show all commits

View File

@ -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);

View File

@ -39,17 +39,24 @@
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal class="vn-px-lg">
<vn-autocomplete
<vn-autocomplete
vn-one
label="Comercial"
ng-model="filter.ticketRequest"
data="salesPersonCode">
ng-model="filter.salesPersonFk"
url="Workers/activeWithInheritedRole"
search-function="{firstName: $search}"
value-field="id"
where="{role: 'logistic'}"
label="Comercial">
<tpl-item>{{firstName}} {{name}}</tpl-item>
</vn-autocomplete>
<vn-autocomplete
vn-one
label="Fecha"
ng-model="filter.buyed"
data="buyed">
ng-model="filter.saleFk"
url="Sales/created"
search-function="{id: $search}"
value-field="created"
label="Fecha">
<tpl-item>{{created}}</tpl-item>
</vn-autocomplete>
</vn-horizontal>
<section class="vn-px-md">

View File

@ -93,16 +93,23 @@
</vn-autocomplete>
<vn-autocomplete
vn-one
label="Comercial"
ng-model="filter.salesPersonFk"
data="Workers">
url="Workers/activeWithInheritedRole"
search-function="{firstName: $search}"
value-field="id"
where="{role: 'logistic'}"
label="Comercial">
<tpl-item>{{firstName}} {{name}}</tpl-item>
</vn-autocomplete>
<vn-autocomplete
vn-one
label="Fecha"
ng-model="filter.buyed"
data="buyed">
</vn-autocomplete>
vn-one
ng-model="filter.saleFk"
url="Sales/created"
search-function="{id: $search}"
value-field="created"
label="Fecha">
<tpl-item>{{created}}</tpl-item>
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal class="vn-px-lg">
<vn-check