fix : correction du retour sur la liste des réceptions + suppression de la redirection après enregistrement
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
<div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-[60px]">
|
<div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-[60px]">
|
||||||
<div class="flex items-center justify-between gap-10 relative">
|
<div class="flex items-center justify-between gap-10 relative">
|
||||||
<div class="flex flex-row absolute -left-[60px] justify-between">
|
<div class="flex flex-row absolute -left-[60px] justify-between">
|
||||||
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
<Icon @click="router.push('/reception/finish-reception')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
||||||
</div>
|
</div>
|
||||||
<h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Réception {{ form.identificationNumber }}</h1>
|
<h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Réception {{ form.identificationNumber }}</h1>
|
||||||
<Icon @click="printReceipt" name="mdi:printer-outline" size="44" class="cursor-pointer text-primary-500"/>
|
<Icon @click="printReceipt" name="mdi:printer-outline" size="44" class="cursor-pointer text-primary-500"/>
|
||||||
@@ -694,7 +694,6 @@ async function validate() {
|
|||||||
isValidBovin.value = false
|
isValidBovin.value = false
|
||||||
isValidMerchandise.value = false
|
isValidMerchandise.value = false
|
||||||
|
|
||||||
await router.push("/reception/finish-reception")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -220,9 +220,15 @@
|
|||||||
|
|
||||||
<tr class="border-bottom">
|
<tr class="border-bottom">
|
||||||
<td>
|
<td>
|
||||||
|
{% if reception.receptionType and reception.receptionType.code == 'BOVINS' %}
|
||||||
<strong>
|
<strong>
|
||||||
Type de bovins
|
Type de bovins
|
||||||
</strong>
|
</strong>
|
||||||
|
{% else %}
|
||||||
|
<strong>
|
||||||
|
Type de marchandises
|
||||||
|
</strong>
|
||||||
|
{% endif %}
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
<div class="bigtable-notes">
|
<div class="bigtable-notes">
|
||||||
@@ -263,6 +269,9 @@
|
|||||||
<p>Aucun dépôt de granulés renseigné.</p>
|
<p>Aucun dépôt de granulés renseigné.</p>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
{% if reception.merchandiseType %}
|
||||||
|
<p><strong>{{ reception.merchandiseType.label }}</strong></p>
|
||||||
|
{% endif %}
|
||||||
{% set buildingLabels = [] %}
|
{% set buildingLabels = [] %}
|
||||||
{% for building in reception.buildings|default([]) %}
|
{% for building in reception.buildings|default([]) %}
|
||||||
{% set buildingLabels = buildingLabels|merge([building.label]) %}
|
{% set buildingLabels = buildingLabels|merge([building.label]) %}
|
||||||
|
|||||||
Reference in New Issue
Block a user