vnAutocomplete fixes

This commit is contained in:
Juan 2018-03-13 13:41:54 +01:00
parent 06e9c97b3e
commit 75c1dd886d
5 changed files with 12 additions and 20 deletions

View File

@ -59,9 +59,7 @@
field="observation.observationTypeFk" field="observation.observationTypeFk"
data="observationsTypes.model" data="observationsTypes.model"
show-field="description" show-field="description"
label="Observation type" label="Observation type">
order="description ASC"
filter-search="{where: {description: {regexp: 'search'}}}">
<tpl-item>{{$parent.$parent.item.description}}</tpl-item> <tpl-item>{{$parent.$parent.item.description}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>
<vn-textfield <vn-textfield

View File

@ -23,12 +23,9 @@
<vn-autocomplete vn-one <vn-autocomplete vn-one
url="/item/api/Intrastats" url="/item/api/Intrastats"
label="Intrastat" label="Intrastat"
show-field="description"
value-field="id" value-field="id"
field="$ctrl.item.intrastatFk" show-field="description"
order="description ASC" field="$ctrl.item.intrastatFk">
filter-search="{where: {description: {regexp: 'search'}} }">
<tpl-item>{{$parent.$parent.item.description}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

View File

@ -30,10 +30,9 @@
show-field="description" show-field="description"
value-field="id" value-field="id"
field="$ctrl.item.intrastatFk" field="$ctrl.item.intrastatFk"
order="description ASC"
filter-search= "{where: {or: [{id: {regexp: 'search'}}, {description: {regexp: 'search'}}]}}" filter-search= "{where: {or: [{id: {regexp: 'search'}}, {description: {regexp: 'search'}}]}}"
initial-data="$ctrl.item.intrastat"> initial-data="$ctrl.item.intrastat">
<tpl-item>{{$parent.$parent.item.id}} : {{$parent.$parent.item.description}}</tpl-item> <tpl-item>{{id}} : {{description}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>
<vn-textfield vn-one label="Relevancy" field="$ctrl.item.relevancy" type="number"></vn-textfield> <vn-textfield vn-one label="Relevancy" field="$ctrl.item.relevancy" type="number"></vn-textfield>
</vn-horizontal> </vn-horizontal>

View File

@ -1,7 +1,7 @@
<vn-watcher <vn-watcher
vn-id="watcher" vn-id="watcher"
data="$ctrl.item" data="$ctrl.item"
form = "form"> form="form">
</vn-watcher> </vn-watcher>
<form name="form" ng-submit="$ctrl.submit()"> <form name="form" ng-submit="$ctrl.submit()">
<vn-card pad-large> <vn-card pad-large>
@ -9,13 +9,12 @@
<vn-horizontal ng-repeat="itemNiche in $ctrl.niches track by $index"> <vn-horizontal ng-repeat="itemNiche in $ctrl.niches track by $index">
<vn-autocomplete <vn-autocomplete
vn-three vn-three
initial-data = "itemNiche.warehouse" data="$ctrl.warehouses"
field = "itemNiche.warehouseFk" show-field="name"
data = "$ctrl.warehouses" value-field="id"
show-field = "name" initial-data="itemNiche.warehouse"
value-field = "id" field="itemNiche.warehouseFk"
label = "Warehouse" label="Warehouse"
order = "name ASC"
vn-acl="buyer,replenisher"> vn-acl="buyer,replenisher">
</vn-autocomplete> </vn-autocomplete>
<vn-textfield <vn-textfield
@ -39,7 +38,7 @@
margin-medium-left margin-medium-left
orange orange
icon="add_circle" icon="add_circle"
ng-if = "itemNiche.showAddIcon" ng-if="itemNiche.showAddIcon"
ng-click="$ctrl.addNiche()"> ng-click="$ctrl.addNiche()">
</vn-icon> </vn-icon>
</vn-one> </vn-one>

View File

@ -14,7 +14,6 @@
data="tags.model" data="tags.model"
show-field="name" show-field="name"
label="Tag" label="Tag"
order="name ASC"
vn-acl="buyer"> vn-acl="buyer">
</vn-autocomplete> </vn-autocomplete>
<vn-textfield <vn-textfield