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

fix: cambiados de donde coge el item id
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2023-01-20 12:37:41 +01:00
parent b1be6addd1
commit ab1a9389cb
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/ticket/front/sale-tracking/index.html
View File

@ -30,12 +30,12 @@
<span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
</vn-td>
<vn-td number>
<span
ng-click="$ctrl.showItemDescriptor($event, sale)"
<span
ng-click="itemDescriptor.show($event, sale.item.id)"
class="link">
{{::sale.itemFk | zeroFill:6}}
{{::sale.item.id}}
</span>
</vn-td>
</vn-td>
<vn-td vn-fetched-tags>
<div>
<vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
@ -96,27 +96,23 @@
</vn-tr>
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="sale in saleTrackings">
<vn-td number>{{::sale.quantity}}</vn-td>
<vn-td number>{{::sale.originalQuantity}}</vn-td>
<vn-tr ng-repeat="saleTracking in saleTrackings">
<vn-td number>{{::saleTracking.quantity}}</vn-td>
<vn-td number>{{::saleTracking.originalQuantity}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="workerDescriptor.show($event, sale.workerFk)">
{{::sale.userNickname | dashIfEmpty}}
ng-click="itemDescriptor.show($event, sale.item.id)"
class="link">
{{::sale.item.id}}
</span>
</vn-td>
<vn-td shrink>{{::sale.state}}</vn-td>
<vn-td expand>{{::sale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
<vn-td shrink>{{::saleTracking.state}}</vn-td>
<vn-td expand>{{::saleTracking.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
</vn-tr>
</vn-tbody>
</vn-table>
</vn-card>
</vn-data-viewer>
<vn-item-descriptor-popover
vn-id="item-descriptor"
warehouse-fk="$ctrl.ticket.warehouseFk">
</vn-item-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="worker-descriptor">
</vn-worker-descriptor-popover>

4
modules/ticket/front/sale-tracking/index.js
View File

@ -45,14 +45,14 @@ class Controller extends Section {
btnThree: {
icon: 'icon-transaction',
state: `item.card.diary({
id: ${sale.itemFk},
id: ${sale.item.id},
warehouseFk: ${this.ticket.warehouseFk},
lineFk: ${sale.id}
})`,
tooltip: 'Item diary'
}
};
this.$.itemDescriptor.show(event.target, sale.itemFk);
this.$.itemDescriptor.show(event.target, sale.item.id);
}
chipHasSaleGroupDetail(hasSaleGroupDetail) {