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

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

Browse Source 
# Conflicts:
#	frontend/pages/reception/finish-reception.vue
#	frontend/pages/shipment/finish-shipment.vue
This commit is contained in:
Kevin Boudet
2026-02-17 08:11:41 +01:00
parent 316a20c43a 86c0e74074
commit dc69673a05
47 changed files with 385 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/pages/shipment/finish-shipment.vue
+3 -3
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 expéditions 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 expéditions finie</h1>
</div>
<UiDataTable