mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-22 14:38:19 +02:00
Merge pull request #68 from R0m1k3/1.1
Improve user interface consistency across reconciliation pages
This commit is contained in:
2 files changed
+210
-206
No files matched your search
@@ -25,8 +25,8 @@ export default function BLReconciliation() {
|
|||||||
// Redirection pour les employés
|
// Redirection pour les employés
|
||||||
if (user?.role === 'employee') {
|
if (user?.role === 'employee') {
|
||||||
return (
|
return (
|
||||||
<div className="p-6">
|
<div className="p-4 sm:p-6">
|
||||||
<div className="bg-orange-50 border-l-4 border-orange-400 p-4">
|
<div className="bg-orange-50 border-l-4 border-orange-400 p-4 rounded-r-lg">
|
||||||
<div className="flex">
|
<div className="flex">
|
||||||
<div className="flex-shrink-0">
|
<div className="flex-shrink-0">
|
||||||
<FileText className="h-5 w-5 text-orange-400" />
|
<FileText className="h-5 w-5 text-orange-400" />
|
||||||
@@ -253,25 +253,25 @@ export default function BLReconciliation() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="p-6 space-y-6">
|
<div className="p-4 sm:p-6 space-y-4 sm:space-y-6">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div className="bg-white border-b border-gray-200 p-6 shadow-sm -m-6 mb-6">
|
<div className="bg-white border-b border-gray-200 p-4 sm:p-6 shadow-sm -m-4 sm:-m-6 mb-4 sm:mb-6">
|
||||||
<div className="flex items-center justify-between mb-4">
|
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4 mb-4">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-2xl font-semibold text-gray-900 flex items-center">
|
<h2 className="text-xl sm:text-2xl font-semibold text-gray-900 flex items-center">
|
||||||
<FileText className="w-6 h-6 mr-3 text-blue-600" />
|
<FileText className="w-5 h-5 sm:w-6 sm:h-6 mr-2 sm:mr-3 text-blue-600" />
|
||||||
Rapprochement BL/Factures
|
Rapprochement BL/Factures
|
||||||
</h2>
|
</h2>
|
||||||
<p className="text-gray-600 mt-1">
|
<p className="text-gray-600 mt-1 text-sm sm:text-base">
|
||||||
Gestion des rapprochements manuels et automatiques
|
Gestion des rapprochements manuels et automatiques
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center space-x-4">
|
<div className="flex flex-wrap items-center gap-2 sm:gap-4">
|
||||||
<Badge variant="outline" className="text-sm border border-gray-300">
|
<Badge variant="outline" className="text-xs sm:text-sm border border-gray-300">
|
||||||
{manualReconciliationDeliveries.length} rapprochements manuels
|
{manualReconciliationDeliveries.length} manuels
|
||||||
</Badge>
|
</Badge>
|
||||||
<Badge variant="outline" className="text-sm border border-gray-300 bg-blue-50">
|
<Badge variant="outline" className="text-xs sm:text-sm border border-gray-300 bg-blue-50">
|
||||||
{automaticReconciliationDeliveries.length} rapprochements automatiques
|
{automaticReconciliationDeliveries.length} automatiques
|
||||||
</Badge>
|
</Badge>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -297,20 +297,22 @@ export default function BLReconciliation() {
|
|||||||
</Tabs>
|
</Tabs>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Filtre de recherche */}
|
{/* Filters */}
|
||||||
<Card>
|
<div className="bg-gray-50 border border-gray-200 p-4 rounded-lg">
|
||||||
<CardContent className="p-4">
|
<div className="flex flex-col sm:flex-row items-stretch sm:items-center gap-4">
|
||||||
<div className="relative max-w-md">
|
<div className="flex-1 min-w-0">
|
||||||
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-gray-400" />
|
<div className="relative">
|
||||||
<Input
|
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4" />
|
||||||
placeholder="Rechercher par fournisseur, BL ou facture..."
|
<Input
|
||||||
value={searchTerm}
|
placeholder="Rechercher par fournisseur, BL ou facture..."
|
||||||
onChange={(e) => setSearchTerm(e.target.value)}
|
value={searchTerm}
|
||||||
className="pl-10 border border-gray-300 shadow-sm"
|
onChange={(e) => setSearchTerm(e.target.value)}
|
||||||
/>
|
className="pl-10 border border-gray-300 shadow-sm w-full"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
|
|
||||||
{/* Contenu des onglets */}
|
{/* Contenu des onglets */}
|
||||||
<Tabs value={activeTab} onValueChange={setActiveTab} className="w-full">
|
<Tabs value={activeTab} onValueChange={setActiveTab} className="w-full">
|
||||||
@@ -326,64 +328,64 @@ export default function BLReconciliation() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<Card>
|
<div className="flex-1 overflow-y-auto">
|
||||||
<CardContent className="pt-6">
|
<div className="bg-white border border-gray-200 shadow-lg overflow-hidden">
|
||||||
{/* Pagination du haut */}
|
{/* Pagination du haut */}
|
||||||
<Pagination
|
<div className="p-4 border-b border-gray-200">
|
||||||
currentPage={manualCurrentPage}
|
<Pagination
|
||||||
totalPages={manualTotalPages}
|
currentPage={manualCurrentPage}
|
||||||
totalItems={manualTotalItems}
|
totalPages={manualTotalPages}
|
||||||
itemsPerPage={manualItemsPerPage}
|
totalItems={manualTotalItems}
|
||||||
onPageChange={setManualCurrentPage}
|
itemsPerPage={manualItemsPerPage}
|
||||||
onItemsPerPageChange={setManualItemsPerPage}
|
onPageChange={setManualCurrentPage}
|
||||||
className="mb-4"
|
onItemsPerPageChange={setManualItemsPerPage}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="border border-gray-200 rounded-lg overflow-hidden">
|
<div className="overflow-x-auto">
|
||||||
<div className="overflow-x-auto">
|
<table className="w-full min-w-[900px]">
|
||||||
<table className="min-w-full divide-y divide-gray-200">
|
<thead className="bg-gray-50 border-b border-gray-200">
|
||||||
<thead className="bg-gray-50">
|
<tr>
|
||||||
<tr>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Fournisseur
|
||||||
Fournisseur
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
N° BL
|
||||||
N° BL
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Date Livr.
|
||||||
Date Livr.
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Montant BL
|
||||||
Montant BL
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Ref. Facture
|
||||||
Ref. Facture
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Montant Fact.
|
||||||
Montant Fact.
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Écart
|
||||||
Écart
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Magasin
|
||||||
Magasin
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Actions
|
||||||
Actions
|
</th>
|
||||||
</th>
|
</tr>
|
||||||
</tr>
|
</thead>
|
||||||
</thead>
|
<tbody className="bg-white divide-y divide-gray-200">
|
||||||
<tbody className="bg-white divide-y divide-gray-200">
|
{paginatedManualDeliveries.map((delivery: any) => (
|
||||||
{paginatedManualDeliveries.map((delivery: any) => (
|
<tr
|
||||||
<tr
|
key={delivery.id}
|
||||||
key={delivery.id}
|
className={`hover:bg-gray-50 ${
|
||||||
className={`hover:bg-gray-50 ${
|
delivery.reconciled === true
|
||||||
delivery.reconciled === true
|
? 'bg-gray-100 opacity-60 text-gray-500'
|
||||||
? 'bg-gray-100 opacity-60 text-gray-500'
|
: 'bg-white'
|
||||||
: 'bg-white'
|
}`}
|
||||||
}`}
|
>
|
||||||
>
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<td className="px-3 py-2 text-sm">
|
|
||||||
<div className={`truncate max-w-32 ${
|
<div className={`truncate max-w-32 ${
|
||||||
delivery.reconciled !== true
|
delivery.reconciled !== true
|
||||||
? 'font-bold text-gray-900'
|
? 'font-bold text-gray-900'
|
||||||
@@ -403,35 +405,35 @@ export default function BLReconciliation() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<div className="text-gray-900">
|
<div className="text-sm text-gray-900">
|
||||||
{safeFormat(delivery.scheduledDate, 'dd/MM/yy')}
|
{safeFormat(delivery.scheduledDate, 'dd/MM/yy')}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<div className={delivery.reconciled !== true ? 'font-bold text-gray-900' : 'font-medium text-gray-900'}>
|
<div className={`text-sm ${delivery.reconciled !== true ? 'font-medium text-gray-900' : 'text-gray-600'}`}>
|
||||||
{delivery.blAmount ?
|
{delivery.blAmount ?
|
||||||
`${parseFloat(delivery.blAmount).toFixed(2)}€` :
|
`${parseFloat(delivery.blAmount).toFixed(2)}€` :
|
||||||
<span className="text-gray-400 italic text-xs">Non renseigné</span>
|
<span className="text-gray-400 italic">Non renseigné</span>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<div className={delivery.reconciled !== true ? 'font-bold text-gray-900' : 'text-gray-900'}>
|
<div className={`text-sm ${delivery.reconciled !== true ? 'font-medium text-gray-900' : 'text-gray-600'}`}>
|
||||||
{delivery.invoiceReference || (
|
{delivery.invoiceReference || (
|
||||||
<span className="text-gray-400 italic text-xs">Non renseigné</span>
|
<span className="text-gray-400 italic">Non renseigné</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<div className={delivery.reconciled !== true ? 'font-bold text-gray-900' : 'text-gray-900'}>
|
<div className={`text-sm ${delivery.reconciled !== true ? 'font-medium text-gray-900' : 'text-gray-600'}`}>
|
||||||
{delivery.invoiceAmount ?
|
{delivery.invoiceAmount ?
|
||||||
`${parseFloat(delivery.invoiceAmount).toFixed(2)}€` :
|
`${parseFloat(delivery.invoiceAmount).toFixed(2)}€` :
|
||||||
<span className="text-gray-400 italic text-xs">Non renseigné</span>
|
<span className="text-gray-400 italic">Non renseigné</span>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm text-right">
|
<td className="px-6 py-4 whitespace-nowrap text-center">
|
||||||
{(() => {
|
{(() => {
|
||||||
const blAmount = delivery.blAmount ? parseFloat(delivery.blAmount) : 0;
|
const blAmount = delivery.blAmount ? parseFloat(delivery.blAmount) : 0;
|
||||||
const invoiceAmount = delivery.invoiceAmount ? parseFloat(delivery.invoiceAmount) : 0;
|
const invoiceAmount = delivery.invoiceAmount ? parseFloat(delivery.invoiceAmount) : 0;
|
||||||
@@ -450,65 +452,73 @@ export default function BLReconciliation() {
|
|||||||
return <span className="text-gray-400 italic text-xs">-</span>;
|
return <span className="text-gray-400 italic text-xs">-</span>;
|
||||||
})()}
|
})()}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<div className="text-gray-900">
|
<div className="text-sm text-gray-900">
|
||||||
{delivery.group?.name}
|
{delivery.group?.name}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-sm">
|
<td className="px-6 py-4 whitespace-nowrap text-right">
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center justify-end space-x-2">
|
||||||
{!delivery.reconciled ? (
|
{!delivery.reconciled ? (
|
||||||
<>
|
<>
|
||||||
{permissions.canValidate('reconciliation') && (
|
{permissions.canValidate('reconciliation') && (
|
||||||
<button
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
onClick={() => handleQuickValidate(delivery)}
|
onClick={() => handleQuickValidate(delivery)}
|
||||||
className="text-gray-600 hover:text-green-600 transition-colors duration-200 p-1 hover:bg-green-50 rounded"
|
className="h-8 w-8 p-0"
|
||||||
title="Valider le rapprochement"
|
title="Valider le rapprochement"
|
||||||
>
|
>
|
||||||
<Check className="w-4 h-4 border border-gray-300 rounded p-0.5" />
|
<Check className="w-4 h-4" />
|
||||||
</button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleOpenModal(delivery)}
|
||||||
|
className="h-8 w-8 p-0"
|
||||||
|
title="Modifier les données"
|
||||||
|
>
|
||||||
|
<Edit className="w-4 h-4" />
|
||||||
|
</Button>
|
||||||
{permissions.canDelete('reconciliation') && (
|
{permissions.canDelete('reconciliation') && (
|
||||||
<button
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
onClick={() => handleDeleteDelivery(delivery.id)}
|
onClick={() => handleDeleteDelivery(delivery.id)}
|
||||||
className="text-gray-600 hover:text-red-600 transition-colors duration-200 p-1 hover:bg-red-50 rounded"
|
className="h-8 w-8 p-0 text-red-600 hover:text-red-700"
|
||||||
title="Supprimer la livraison"
|
title="Supprimer la livraison"
|
||||||
>
|
>
|
||||||
<Trash2 className="w-4 h-4" />
|
<Trash2 className="w-4 h-4" />
|
||||||
</button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{user?.role === 'admin' && (
|
{user?.role === 'admin' && (
|
||||||
<button
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
onClick={() => handleDevalidateReconciliation(delivery.id)}
|
onClick={() => handleDevalidateReconciliation(delivery.id)}
|
||||||
className="text-gray-600 hover:text-orange-600 transition-colors duration-200 p-1 hover:bg-orange-50 rounded"
|
className="h-8 w-8 p-0 text-orange-600 hover:text-orange-700"
|
||||||
title="Dévalider le rapprochement"
|
title="Dévalider le rapprochement"
|
||||||
>
|
>
|
||||||
<Ban className="w-4 h-4" />
|
<Ban className="w-4 h-4" />
|
||||||
</button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{permissions.canDelete('reconciliation') && (
|
{permissions.canDelete('reconciliation') && (
|
||||||
<button
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
onClick={() => handleDeleteDelivery(delivery.id)}
|
onClick={() => handleDeleteDelivery(delivery.id)}
|
||||||
className="text-gray-600 hover:text-red-600 transition-colors duration-200 p-1 hover:bg-red-50 rounded"
|
className="h-8 w-8 p-0 text-red-600 hover:text-red-700"
|
||||||
title="Supprimer la livraison"
|
title="Supprimer la livraison"
|
||||||
>
|
>
|
||||||
<Trash2 className="w-4 h-4" />
|
<Trash2 className="w-4 h-4" />
|
||||||
</button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{!delivery.reconciled && (
|
|
||||||
<button
|
|
||||||
onClick={() => handleOpenModal(delivery)}
|
|
||||||
className="text-gray-600 hover:text-blue-600 transition-colors duration-200 p-1 hover:bg-blue-50 rounded"
|
|
||||||
title="Modifier les données de rapprochement"
|
|
||||||
>
|
|
||||||
<Settings className="w-4 h-4" />
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -516,20 +526,20 @@ export default function BLReconciliation() {
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Pagination du bas */}
|
{/* Pagination du bas */}
|
||||||
<Pagination
|
<div className="p-4 border-t border-gray-200">
|
||||||
currentPage={manualCurrentPage}
|
<Pagination
|
||||||
totalPages={manualTotalPages}
|
currentPage={manualCurrentPage}
|
||||||
totalItems={manualTotalItems}
|
totalPages={manualTotalPages}
|
||||||
itemsPerPage={manualItemsPerPage}
|
totalItems={manualTotalItems}
|
||||||
onPageChange={setManualCurrentPage}
|
itemsPerPage={manualItemsPerPage}
|
||||||
onItemsPerPageChange={setManualItemsPerPage}
|
onPageChange={setManualCurrentPage}
|
||||||
className="mt-4"
|
onItemsPerPageChange={setManualItemsPerPage}
|
||||||
/>
|
/>
|
||||||
</CardContent>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
@@ -563,51 +573,45 @@ export default function BLReconciliation() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<Card>
|
<div className="flex-1 overflow-y-auto">
|
||||||
<CardHeader>
|
<div className="bg-white border border-gray-200 shadow-lg overflow-hidden">
|
||||||
<CardTitle className="flex items-center gap-2">
|
|
||||||
<Settings className="w-5 h-5" />
|
|
||||||
Rapprochements Automatiques
|
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent>
|
|
||||||
{/* Pagination du haut */}
|
{/* Pagination du haut */}
|
||||||
<Pagination
|
<div className="p-4 border-b border-gray-200">
|
||||||
currentPage={autoCurrentPage}
|
<Pagination
|
||||||
totalPages={autoTotalPages}
|
currentPage={autoCurrentPage}
|
||||||
totalItems={autoTotalItems}
|
totalPages={autoTotalPages}
|
||||||
itemsPerPage={autoItemsPerPage}
|
totalItems={autoTotalItems}
|
||||||
onPageChange={setAutoCurrentPage}
|
itemsPerPage={autoItemsPerPage}
|
||||||
onItemsPerPageChange={setAutoItemsPerPage}
|
onPageChange={setAutoCurrentPage}
|
||||||
className="mb-4"
|
onItemsPerPageChange={setAutoItemsPerPage}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="border border-gray-200 rounded-lg overflow-hidden">
|
<div className="overflow-x-auto">
|
||||||
<div className="overflow-x-auto">
|
<table className="w-full min-w-[700px]">
|
||||||
<table className="min-w-full divide-y divide-gray-200">
|
<thead className="bg-gray-50 border-b border-gray-200">
|
||||||
<thead className="bg-gray-50">
|
<tr>
|
||||||
<tr>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Fournisseur
|
||||||
Fournisseur
|
<Badge variant="secondary" className="ml-2 text-xs">AUTO</Badge>
|
||||||
<Badge variant="secondary" className="ml-2 text-xs">AUTO</Badge>
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
N° BL
|
||||||
N° BL
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Date Livr.
|
||||||
Date Livr.
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Date Valid.
|
||||||
Date Valid.
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Magasin
|
||||||
Magasin
|
</th>
|
||||||
</th>
|
<th className="px-6 py-3 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
Actions
|
||||||
Actions
|
</th>
|
||||||
</th>
|
</tr>
|
||||||
</tr>
|
</thead>
|
||||||
</thead>
|
|
||||||
<tbody className="bg-white divide-y divide-gray-200">
|
<tbody className="bg-white divide-y divide-gray-200">
|
||||||
{paginatedAutoDeliveries.map((delivery: any) => (
|
{paginatedAutoDeliveries.map((delivery: any) => (
|
||||||
<tr key={delivery.id} className="hover:bg-gray-50 bg-green-50">
|
<tr key={delivery.id} className="hover:bg-gray-50 bg-green-50">
|
||||||
@@ -675,20 +679,20 @@ export default function BLReconciliation() {
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Pagination du bas */}
|
{/* Pagination du bas */}
|
||||||
<Pagination
|
<div className="p-4 border-t border-gray-200">
|
||||||
currentPage={autoCurrentPage}
|
<Pagination
|
||||||
totalPages={autoTotalPages}
|
currentPage={autoCurrentPage}
|
||||||
totalItems={autoTotalItems}
|
totalPages={autoTotalPages}
|
||||||
itemsPerPage={autoItemsPerPage}
|
totalItems={autoTotalItems}
|
||||||
onPageChange={setAutoCurrentPage}
|
itemsPerPage={autoItemsPerPage}
|
||||||
onItemsPerPageChange={setAutoItemsPerPage}
|
onPageChange={setAutoCurrentPage}
|
||||||
className="mt-4"
|
onItemsPerPageChange={setAutoItemsPerPage}
|
||||||
/>
|
/>
|
||||||
</CardContent>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
@@ -698,7 +702,7 @@ export default function BLReconciliation() {
|
|||||||
<ReconciliationModal
|
<ReconciliationModal
|
||||||
isOpen={isModalOpen}
|
isOpen={isModalOpen}
|
||||||
delivery={selectedDelivery}
|
delivery={selectedDelivery}
|
||||||
onSave={() => handleSaveReconciliation(selectedDelivery)}
|
onSave={handleSaveReconciliation}
|
||||||
onClose={handleCloseModal}
|
onClose={handleCloseModal}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -19,25 +19,25 @@ La plateforme fournit une gestion robuste des flux de travail de livraison avec
|
|||||||
|
|
||||||
## Recent Changes
|
## Recent Changes
|
||||||
|
|
||||||
|
### 2025-08-13 - Uniformisation complète des interfaces utilisateur
|
||||||
|
✅ **Harmonisation du design des tableaux** terminée pour une expérience utilisateur cohérente :
|
||||||
|
|
||||||
|
**Pages uniformisées :**
|
||||||
|
- `Orders.tsx` - Page des commandes avec design responsive optimisé
|
||||||
|
- `Deliveries.tsx` - Page des livraisons avec structure identique
|
||||||
|
- `BLReconciliation.tsx` - Page de rapprochement BL/Factures harmonisée
|
||||||
|
- `Dashboard.tsx` - Tableau de bord avec erreurs TypeScript corrigées
|
||||||
|
|
||||||
|
**Améliorations appliquées :**
|
||||||
|
- Headers responsifs adaptés mobile/tablette
|
||||||
|
- Filtres restructurés avec style cohérent
|
||||||
|
- Tableaux standardisés : `px-6 py-4` et `whitespace-nowrap`
|
||||||
|
- Boutons d'actions modernisés avec composants Button shadcn/ui
|
||||||
|
- Pagination repositionnée avec bordures uniformisées
|
||||||
|
- Espacement et typographie harmonisés
|
||||||
|
|
||||||
### 2025-08-12 - Nettoyage des fichiers inutiles
|
### 2025-08-12 - Nettoyage des fichiers inutiles
|
||||||
✅ **Suppression complète des fichiers inutiles** effectuée pour optimiser le projet :
|
✅ **Suppression complète des fichiers inutiles** effectuée pour optimiser le projet
|
||||||
|
|
||||||
**Fichiers supprimés :**
|
|
||||||
- Fichiers de sauvegarde/cassés : `*_broken.tsx`, `*_backup.tsx`, `*.backup.*`
|
|
||||||
- Dossier `attached_assets/` complet (captures d'écran et logs de débogage)
|
|
||||||
- Documentation de débogage : tous les fichiers `*.md` de correction temporaire
|
|
||||||
- Scripts de débogage : `debug-*.js`, `fix-*.sql`, `apply-production-fixes.js`
|
|
||||||
- Scripts de test temporaires : `test-*.js`, `reset-admin.js`
|
|
||||||
- Fichiers de production/debug : `production-*.txt`, `production-*.sh`, `production-*.patch`
|
|
||||||
- Fichiers de cookies de test : `cookies.txt`, `cookies_employee.txt`
|
|
||||||
|
|
||||||
**Fichiers conservés (essentiels) :**
|
|
||||||
- `client/` - Frontend React complet
|
|
||||||
- `server/` - Backend Express complet
|
|
||||||
- `shared/` - Schémas partagés
|
|
||||||
- `migrations/` - Migrations de base de données
|
|
||||||
- Configuration : `package.json`, `vite.config.ts`, `tailwind.config.ts`, etc.
|
|
||||||
- Déploiement : `Dockerfile`, `docker-compose.yml`
|
|
||||||
|
|
||||||
## Project Architecture
|
## Project Architecture
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user