verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

#1171 item.index mostrar campos medida y nicho
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-03-05 12:03:34 +01:00
parent 7f10a509e0
commit 00f9754c1e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/item/back/methods/item/filter.js
View File

@ -99,7 +99,7 @@ module.exports = Self => {
intr.description AS intrastat, i.stems, intr.description AS intrastat, i.stems,
ori.code AS origin, t.name AS type, ori.code AS origin, t.name AS type,
ic.name AS category, i.density, tc.description AS taxClass, ic.name AS category, i.density, tc.description AS taxClass,
b.grouping, b.packing b.grouping, b.packing, itn.code AS niche
FROM item i FROM item i
LEFT JOIN itemType t ON t.id = i.typeFk LEFT JOIN itemType t ON t.id = i.typeFk
LEFT JOIN itemCategory ic ON ic.id = t.categoryFk LEFT JOIN itemCategory ic ON ic.id = t.categoryFk
@ -110,7 +110,8 @@ module.exports = Self => {
LEFT JOIN origin ori ON ori.id = i.originFk LEFT JOIN origin ori ON ori.id = i.originFk
LEFT JOIN taxClass tc ON tc.id = i.taxClassFk LEFT JOIN taxClass tc ON tc.id = i.taxClassFk
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk
LEFT JOIN vn.buy b ON b.id = lb.buy_id` LEFT JOIN vn.buy b ON b.id = lb.buy_id
LEFT JOIN itemPlacement itn ON itn.itemFk = i.id AND itn.warehouseFk = t.warehouseFk`
); );
if (ctx.args.hasVisible === true) { if (ctx.args.hasVisible === true) {

4
modules/item/front/index/index.html
View File

@ -26,6 +26,8 @@
<vn-th th-id="packing" number>Packing</vn-th> <vn-th th-id="packing" number>Packing</vn-th>
<vn-th th-id="description" style="text-align: center">Description</vn-th> <vn-th th-id="description" style="text-align: center">Description</vn-th>
<vn-th th-id="stems" number>Stems</vn-th> <vn-th th-id="stems" number>Stems</vn-th>
<vn-th th-id="size"number>Size</vn-th>
<vn-th th-id="niche"number>Niche</vn-th>
<vn-th th-id="type">Type</vn-th> <vn-th th-id="type">Type</vn-th>
<vn-th th-id="category">Category</vn-th> <vn-th th-id="category">Category</vn-th>
<vn-th th-id="intrastat">Intrastat</vn-th> <vn-th th-id="intrastat">Intrastat</vn-th>
@ -65,6 +67,8 @@
</vn-fetched-tags> </vn-fetched-tags>
</vn-td> </vn-td>
<vn-td number>{{::item.stems}}</vn-td> <vn-td number>{{::item.stems}}</vn-td>
<vn-td number>{{::item.size}}</vn-td>
<vn-td number>{{::item.niche}}</vn-td>
<vn-td>{{::item.type}}</vn-td> <vn-td>{{::item.type}}</vn-td>
<vn-td>{{::item.category}}</vn-td> <vn-td>{{::item.category}}</vn-td>
<vn-td>{{::item.intrastat}}</vn-td> <vn-td>{{::item.intrastat}}</vn-td>