diff --git a/src/app/components/quotation-table/quotation-table.html b/src/app/components/quotation-table/quotation-table.html index 17ff897..3ddfe1e 100644 --- a/src/app/components/quotation-table/quotation-table.html +++ b/src/app/components/quotation-table/quotation-table.html @@ -17,7 +17,6 @@ {{data.quotationConditionsSale}} {{data.Supplier}} -
@@ -27,14 +26,27 @@ Réference Nom Quantité + Action - - {{data.quotationProductReference}} - {{data.quotationProductName}} - {{data.quotationProductQuantity}} - + + + {{data.quotationProductReference}} + {{data.quotationProductName}} + {{data.quotationProductQuantity}} + +
+ + + + +
+ +
+
+ + diff --git a/src/app/components/quotation-table/quotation-table.ts b/src/app/components/quotation-table/quotation-table.ts index 1e9a96e..6dcbfca 100644 --- a/src/app/components/quotation-table/quotation-table.ts +++ b/src/app/components/quotation-table/quotation-table.ts @@ -5,11 +5,17 @@ import {ModalNav} from "../modal-nav/modal-nav"; import {NzDividerComponent} from "ng-zorro-antd/divider"; import {NzIconDirective} from "ng-zorro-antd/icon"; import {QuotationForm} from "../quotation-form/quotation-form"; +import {ProductTable} from "../product-table/product-table"; interface QuotationInfo { quotationId: number; quotationMessage?: string; quotationConditionsSale?: string; + quotationProduct: [ + { quotationProductReference: string; }, + { quotationProductName: string; }, + { quotationProductQuantity?: number; }, + ], quotationProductReference: string; quotationProductName: string; quotationProductQuantity?: number; @@ -36,28 +42,43 @@ export class QuotationTable { quotationId: 101, quotationMessage: 'Livraison urgente demandée', quotationConditionsSale: 'Paiement à 30 jours', + quotationProduct: [ + { quotationProductReference: 'DLV-1000' }, + { quotationProductName: 'Produit1'}, + { quotationProductQuantity: 5 }, + ], quotationProductReference: 'DLV-1000', quotationProductName: 'Produit1', quotationProductQuantity: 5, - Supplier: 'fireworkssupplier&Co' + Supplier: 'Fireworkssupplier&Co' }, { quotationId: 102, quotationMessage: 'Livraison standard', quotationConditionsSale: 'Payé d\'avance', + quotationProduct: [ + { quotationProductReference: 'DLV-1001' }, + { quotationProductName: 'Produit2'}, + { quotationProductQuantity: 6 }, + ], quotationProductReference: 'DLV-1001', quotationProductName: 'Produit2', quotationProductQuantity: 6, - Supplier: 'fireworkssupplier&Co' + Supplier: 'Fireworkssupplier&Co' }, { quotationId: 103, quotationMessage: 'Livraison rapide', quotationConditionsSale: 'Paiement à 15 jours', + quotationProduct: [ + { quotationProductReference: 'DLV-1003' }, + { quotationProductName: 'Produit3'}, + { quotationProductQuantity: 7 }, + ], quotationProductReference: 'DLV-1002', quotationProductName: 'Produit3', quotationProductQuantity: 7, - Supplier: 'fireworkssupplier&Co' + Supplier: 'Fireworkssupplier&Co' } ]; } diff --git a/src/app/pages/quotation/quotation.html b/src/app/pages/quotation/quotation.html index 2edf3b6..307e87f 100644 --- a/src/app/pages/quotation/quotation.html +++ b/src/app/pages/quotation/quotation.html @@ -7,7 +7,7 @@
- +voir prix dans les produits + suppr id devis dans form et dans bon de livraison form