Merge pull request '3563-feat(item_index): add column producer' (#866) from 3563-item_index_producer into dev
gitea/salix/pipeline/head There was a failure building this commit Details

Reviewed-on: #866
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2022-02-03 09:37:23 +00:00
commit 3c13bbbf5f
4 changed files with 10 additions and 0 deletions

View File

@ -0,0 +1,3 @@
UPDATE salix.defaultViewConfig
SET `columns`='{"intrastat":false,"stemMultiplier":false,"landed":false,"producer":false}'
WHERE tableCode ='itemsIndex';

View File

@ -161,6 +161,7 @@ module.exports = Self => {
i.stemMultiplier, i.stemMultiplier,
i.typeFk, i.typeFk,
i.isFloramondo, i.isFloramondo,
pr.name AS producer,
it.name AS typeName, it.name AS typeName,
it.workerFk AS buyerFk, it.workerFk AS buyerFk,
u.name AS userName, u.name AS userName,

View File

@ -54,6 +54,9 @@
<th field="active"> <th field="active">
<span translate>Active</span> <span translate>Active</span>
</th> </th>
<th field="producer">
<span translate>Producer</span>
</th>
<th field="landed"> <th field="landed">
<span translate>Landed</span> <span translate>Landed</span>
</th> </th>
@ -122,6 +125,7 @@
ng-model="::item.isActive"> ng-model="::item.isActive">
</vn-check> </vn-check>
</td> </td>
<td>{{::item.producer | dashIfEmpty}}</td>
<td shrink-date>{{::item.landed | date:'dd/MM/yyyy'}}</td> <td shrink-date>{{::item.landed | date:'dd/MM/yyyy'}}</td>
<td> <td>
<vn-horizontal class="buttons"> <vn-horizontal class="buttons">

View File

@ -81,6 +81,8 @@ class Controller extends Section {
return {'intr.description': value}; return {'intr.description': value};
case 'name': case 'name':
return {'i.name': {like: `%${value}%`}}; return {'i.name': {like: `%${value}%`}};
case 'producer':
return {'pr.name': {like: `%${value}%`}};
case 'id': case 'id':
case 'size': case 'size':
case 'subname': case 'subname':