MALIO-DEV/Ferme
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases 80 Wiki Activity

Finalisation réception marchandise, ajout de composant UI et ajout de fixtures #7

Merged
tristan merged 10 commits from feat/finalisation-reception-marchandise into develop 2026-01-30 14:10:41 +00:00
Conversation 0 Commits 10 Files Changed 90 +5 -4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89e4bc5087 - Show all commits

5
frontend/components/reception/reception-form.vue
View File

@@ -421,14 +421,15 @@ watch(
if (!isLiotCarrier.value) { if (!isLiotCarrier.value) {
return return
} }
if (isHydrating.value) {
return
}
const selected = filteredVehicles.value.find( const selected = filteredVehicles.value.find(
(vehicle) => String(vehicle.id) === form.vehicleId (vehicle) => String(vehicle.id) === form.vehicleId
) )
if (selected) { if (selected) {
form.licensePlate = selected.plate form.licensePlate = selected.plate
allowAnyLicensePlate.value = false allowAnyLicensePlate.value = false
} else if (form.vehicleId === '') {
form.licensePlate = ''
} }
} }
) )

4
frontend/components/reception/reception-product-received.vue
View File

@@ -3,7 +3,7 @@
<!-- @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins --> <!-- @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins -->
<div <div
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES" v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
class="flex flex-col gap-8 items-center w-full"> class="flex flex-col gap-16 items-center w-full">
<h1 class="text-4xl uppercase font-bold">Sélectionner des marchandises réceptionnnées</h1> <h1 class="text-4xl uppercase font-bold">Sélectionner des marchandises réceptionnnées</h1>
<UiSelect <UiSelect
id="merchandise-type" id="merchandise-type"
@@ -45,7 +45,7 @@
<div <div
v-if="selectedMerchandiseTypeId && isGranule" v-if="selectedMerchandiseTypeId && isGranule"
class="flex flex-col gap-10 w-full max-w-[900px]" class="flex flex-col gap-10 w-full max-w-[1100px]"
> >
<div class="grid grid-cols-1 gap-10 md:grid-cols-4"> <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
<div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4"> <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">