Merge branch 'develop' into feat/266-creation-composant-datatable

# Conflicts:
#	frontend/pages/reception/finish-reception.vue
#	frontend/pages/shipment/finish-shipment.vue
This commit is contained in:
2026-02-17 08:11:41 +01:00
47 changed files with 385 additions and 327 deletions

View File

@@ -1,5 +1,5 @@
<template>
<div class="flex justify-between h-[52px] mt-16 mb-[80px]">
<div class="flex justify-between h-[52px] mb-[80px]">
<div class="flex flex-1 mr-16">
<UiStepper
:labels="RECEPTION_STEP_LABELS"
@@ -7,12 +7,12 @@
@select="handleStepSelect"
/>
</div>
<button
<UiButton
type="button"
class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
@click="saveAndHold"
>Mettre en attente
</button>
</UiButton>
</div>
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
<ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>

View File

@@ -1,7 +1,7 @@
<template>
<div class="flex items-center justify-start gap-10 mt-16">
<Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
<h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
<div class="flex items-center justify-start gap-10">
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
</div>
<UiDataTable
@@ -31,4 +31,8 @@ const goToReception = (row: ReceptionRow) => {
if (!Number.isFinite(id)) return
router.push(`/reception/update/${id}`)
}
onMounted(async () => {
receptionList.value = await getReceptionList(true)
})
</script>

View File

@@ -115,14 +115,14 @@
/>
</div>
<div class="flex justify-center mb-2">
<button
<UiButton
v-if="auth.isAdmin"
type="submit"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
>
Enregistrer
</button>
</UiButton>
</div>
<div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">
<h1

View File

@@ -1,13 +1,13 @@
<template>
<div class="flex items-center justify-between mt-16">
<div class="flex items-center justify-between">
<div class="flex items-center gap-10">
<Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
<h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
</div>
</div>
<div class="px-[86px]">
<div class="mt-6 border border-slate-200 mb-16 ">
<div class="mt-6 border border-slate-200 mb-16">
<div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
<div>Fournisseur</div>
<div>Adresse</div>