This commit is contained in:
parent
2505adf87f
commit
b876d1c278
|
@ -29,7 +29,7 @@ module.exports = Self => {
|
|||
SELECT COUNT(*) > 0 isCustomer
|
||||
FROM salix.Account A
|
||||
JOIN salix.Role r ON r.id = A.roleFK
|
||||
WHERE r.name = 'customer'
|
||||
WHERE r.name IN ('customer', 'supplier')
|
||||
AND A.id IN (?)`;
|
||||
const [result] = await Self.rawSql(query, [id], myOptions);
|
||||
const {isCustomer} = result;
|
||||
|
|
|
@ -33,9 +33,6 @@ span {
|
|||
.barcode {
|
||||
text-align: center;
|
||||
}
|
||||
#variant {
|
||||
.one-third {
|
||||
width: 314px;
|
||||
}
|
||||
#producer {
|
||||
width: 471px;
|
||||
}
|
|
@ -4,7 +4,7 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<div id="variant" class="cell">
|
||||
<div class="cell one-third">
|
||||
<span class="lbl">{{$t('variety')}}</span>
|
||||
{{buy.name}}
|
||||
</div>
|
||||
|
@ -63,18 +63,24 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<div id="producer" class="cell">
|
||||
<td colspan="2">
|
||||
<div class="cell one-third">
|
||||
<span class="lbl">{{$t('producer')}}</span>
|
||||
{{buy.producer}}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="cell">
|
||||
<span class="lbl">{{$t('control')}}</span>
|
||||
{{`${weekNum} / ${dayNum}`}}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<div class="cell">
|
||||
<span class="lbl">{{$t('control')}}</span>
|
||||
{{`${weekNum} / ${dayNum}`}}
|
||||
<div class="cell one-third">
|
||||
<span class="lbl">{{$t('reference')}}</span>
|
||||
{{buy.comment}}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
@ -9,4 +9,5 @@ grouping: Grouping
|
|||
unitSale: Un. sale
|
||||
producer: Producer
|
||||
control: Control
|
||||
boxNum: Box no.
|
||||
boxNum: Box no.
|
||||
reference: Reference
|
|
@ -9,4 +9,5 @@ grouping: Grouping
|
|||
saleUnit: Sale un.
|
||||
producer: Productor
|
||||
control: Control
|
||||
boxNum: Caja nº
|
||||
boxNum: Caja nº
|
||||
reference: Referencia
|
|
@ -20,7 +20,8 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
|
|||
i.stems,
|
||||
b.id,
|
||||
b.itemFk,
|
||||
p.name producer
|
||||
p.name producer,
|
||||
i.comment
|
||||
FROM buy b
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
LEFT JOIN producer p ON p.id = i.producerFk
|
||||
|
|
Loading…
Reference in New Issue