#7896 - 24.36 Dev To Test #2884
|
|
@ -22,7 +22,7 @@ labels AS (
|
|||
b.id,
|
||||
b.itemFk,
|
||||
p.name producer,
|
||||
IF(i2.id, i2.comment, i.comment) comment
|
||||
IFNULL(i2.comment, i.comment) comment
|
||||
FROM buy b
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
LEFT JOIN producer p ON p.id = i.producerFk
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
|
||||
|
||||
h3 {
|
||||
font-weight: 100;
|
||||
color: #555
|
||||
}
|
||||
|
||||
.report-info {
|
||||
font-size: 20px
|
||||
}
|
||||
|
||||
.description strong {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.nowrap {
|
||||
white-space: nowrap;
|
||||
}
|
||||
.padding {
|
||||
padding: 16px;
|
||||
}
|
||||
.tags {
|
||||
font-size: 10px;
|
||||
margin: 0;
|
||||
}
|
||||
|
|
@ -4,23 +4,23 @@
|
|||
</template>
|
||||
<div class="grid-row">
|
||||
<div class="grid-block">
|
||||
<div class="columns">
|
||||
<h1 class="title uppercase">{{$t('title')}}</h1>
|
||||
<div class="columns header-tables">
|
||||
<div class="size50">
|
||||
<div class="body">
|
||||
<h1 class="title uppercase">{{$t('title')}}</h1>
|
||||
<table class="row-oriented report-info">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="font gray uppercase">{{$t('entryId')}}</td>
|
||||
<td class="font gray uppercase padding nowrap">{{$t('entryId')}}</td>
|
||||
<th>{{entry.id}}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font gray uppercase">{{$t('date')}}</td>
|
||||
<td class="font gray uppercase padding nowrap">{{$t('date')}}</td>
|
||||
<th>{{formatDate(entry.landed,'%d-%m-%Y')}}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font gray uppercase">{{$t('ref')}}</td>
|
||||
<th>{{entry.invoiceNumber}}</th>
|
||||
<td class="font gray uppercase padding nowrap">{{$t('ref')}}</td>
|
||||
<th>{{entry.invoiceNumber | dashIfEmpty}}</th>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -38,42 +38,56 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<table class="column-oriented vn-mt-ml">
|
||||
<table class="column-oriented vn-mt-ml border-collapse">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="number">{{$t('boxes')}}</th>
|
||||
<th width="5%" class="number"></th>
|
||||
<th class="number">{{$t('packing')}}</th>
|
||||
<th width="50%">{{$t('concept')}}</th>
|
||||
<th width="40%">{{$t('concept')}}</th>
|
||||
<th width="10%">{{$t('reference')}}</th>
|
||||
<th width="10%">{{$t('tags')}}</th>
|
||||
<th width="10%" class="number">{{$t('quantity')}}</th>
|
||||
<th width="5%" class="number"></th>
|
||||
<th width="15%" class="number">{{$t('price')}}</th>
|
||||
<th width="5%" class="number"></th>
|
||||
<th width="15%" class="number">{{$t('amount')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody v-for="buy in buys">
|
||||
<tr>
|
||||
<td class="number">{{buy.box}}</td>
|
||||
<td class="number">{{buy.stickers}}</td>
|
||||
<td width="5%" class="number">x</td>
|
||||
<td class="number">{{buy.packing}}</td>
|
||||
<td width="50%">{{buy.itemName}}</td>
|
||||
<td width="40%" class="nowrap">{{buy.name}}</td>
|
||||
<td width="10%">{{buy.comment}}</td>
|
||||
<td width="10%" class="font light-gray tags">
|
||||
<span v-if="buy.value5" class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}} </span>
|
||||
<span v-if="buy.value6" class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}} </span>
|
||||
<span v-if="buy.value7" class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}} </span>
|
||||
</td>
|
||||
<td width="10%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
|
||||
<td width="5%" class="number">x</td>
|
||||
<td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
|
||||
<td width="5%" class="number">=</td>
|
||||
<td width="15%" class="number">
|
||||
{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="description font light-gray">
|
||||
<td colspan="7">
|
||||
<span v-if="buy.value5"> <strong>{{buy.tag5}}</strong> {{buy.value5}} </span>
|
||||
<span v-if="buy.value6"> <strong>{{buy.tag6}}</strong> {{buy.value6}} </span>
|
||||
<span v-if="buy.value7"> <strong>{{buy.tag7}}</strong> {{buy.value7}} </span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="5" class="font bold">
|
||||
<span class="pull-right">{{$t('total')}}</span>
|
||||
</td>
|
||||
<td class="number">{{getTotal() | currency('EUR', $i18n.locale)}}</td>
|
||||
<tr class="font bold">
|
||||
<td class="number">{{getTotalBy('stickers')}}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td class="number">{{getTotalBy('quantity') | number($i18n.locale)}}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td class="number">{{getTotalBy('amount') | currency('EUR', $i18n.locale)}}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -13,13 +13,17 @@ module.exports = {
|
|||
return {totalBalance: 0.00};
|
||||
},
|
||||
methods: {
|
||||
getTotal() {
|
||||
let total = 0.00;
|
||||
this.buys.forEach(buy => {
|
||||
total += buy.quantity * buy.buyingValue;
|
||||
});
|
||||
|
||||
return total;
|
||||
getTotalBy(property) {
|
||||
return this.buys.reduce((total, buy) => {
|
||||
switch (property) {
|
||||
case 'amount':
|
||||
return total + buy.quantity * buy.buyingValue;
|
||||
case 'quantity':
|
||||
return total + buy.quantity;
|
||||
case 'stickers':
|
||||
return total + buy.stickers;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
},
|
||||
props: {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ reportName: pedido-de-entrada
|
|||
title: Pedido
|
||||
supplierName: Proveedor
|
||||
supplierStreet: Dirección
|
||||
entryId: Referencia interna
|
||||
entryId: Nº Entrada
|
||||
date: Fecha
|
||||
ref: Nº Factura
|
||||
boxes: Cajas
|
||||
|
|
@ -15,3 +15,5 @@ total: Total
|
|||
entry: Entrada {0}
|
||||
supplierData: Datos del proveedor
|
||||
notes: Notas
|
||||
reference: Referencia
|
||||
tags: Tags
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
SELECT
|
||||
b.itemFk,
|
||||
b.quantity,
|
||||
b.buyingValue,
|
||||
b.stickers box,
|
||||
b.packing,
|
||||
i.name itemName,
|
||||
i.tag5,
|
||||
i.value5,
|
||||
i.tag6,
|
||||
i.value6,
|
||||
i.tag7,
|
||||
i.value7
|
||||
FROM buy b
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
WHERE b.entryFk = ?
|
||||
SELECT b.itemFk,
|
||||
b.quantity,
|
||||
b.buyingValue,
|
||||
b.stickers,
|
||||
b.packing,
|
||||
i.name,
|
||||
IFNULL(i2.comment, i.comment) comment,
|
||||
i.tag5,
|
||||
i.value5,
|
||||
i.tag6,
|
||||
i.value6,
|
||||
i.tag7,
|
||||
i.value7
|
||||
FROM buy b
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
LEFT JOIN item i2 ON i2.id = b.itemOriginalFk
|
||||
WHERE b.entryFk = ?
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
SELECT
|
||||
e.id,
|
||||
e.invoiceNumber,
|
||||
c.code companyCode,
|
||||
t.landed
|
||||
FROM entry e
|
||||
JOIN travel t ON t.id = e.travelFk
|
||||
JOIN company c ON c.id = e.companyFk
|
||||
WHERE e.id = ?
|
||||
SELECT e.id,
|
||||
e.invoiceNumber,
|
||||
c.code companyCode,
|
||||
t.landed
|
||||
FROM entry e
|
||||
JOIN travel t ON t.id = e.travelFk
|
||||
JOIN company c ON c.id = e.companyFk
|
||||
WHERE e.id = ?
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
SELECT
|
||||
s.name,
|
||||
s.street,
|
||||
s.nif,
|
||||
s.postCode,
|
||||
s.city,
|
||||
p.name province
|
||||
FROM supplier s
|
||||
JOIN entry e ON e.supplierFk = s.id
|
||||
LEFT JOIN province p ON p.id = s.provinceFk
|
||||
WHERE e.id = ?
|
||||
SELECT s.name,
|
||||
s.street,
|
||||
s.nif,
|
||||
s.postCode,
|
||||
s.city,
|
||||
p.name province
|
||||
FROM supplier s
|
||||
JOIN entry e ON e.supplierFk = s.id
|
||||
LEFT JOIN province p ON p.id = s.provinceFk
|
||||
WHERE e.id = ?
|
||||
|
|
|
|||
Loading…
Reference in New Issue