diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs index 58e02c81..6221c2b4 100644 --- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs +++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs @@ -62,6 +62,7 @@ namespace BBWY.Client.ViewModels public ICommand FastCreateOrderCommand { get; set; } public ICommand PreviewOrderCommand { get; set; } public ICommand AddProductSkuCommand { get; set; } + public ICommand DeleteProductSkuWithSchemeCommand { get; set; } public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService, PurchaseService purchaseService, GlobalContext globalContext) { @@ -73,6 +74,7 @@ namespace BBWY.Client.ViewModels FastCreateOrderCommand = new RelayCommand(FastCreateOrder); PreviewOrderCommand = new RelayCommand(PreviewOrder); AddProductSkuCommand = new RelayCommand(AddProductSku); + DeleteProductSkuWithSchemeCommand = new RelayCommand(DeleteProductSkuWithScheme); this.delayTrigger = new DelayTrigger(); this.delayTrigger.OnExecute = OnDelayTriggerExecute; @@ -284,5 +286,11 @@ namespace BBWY.Client.ViewModels Console.WriteLine($"OnItemTotalChanged {DateTime.Now} {itemTotal}"); this.delayTrigger.SetKey(Guid.NewGuid().ToString()); } + + private void DeleteProductSkuWithScheme(ProductSkuWithScheme productSkuWithScheme) + { + ProductSkuWithSchemeList.Remove(productSkuWithScheme); + this.delayTrigger.SetKey(Guid.NewGuid().ToString()); + } } } diff --git a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml index 724f69b2..40925521 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml @@ -43,23 +43,37 @@ - + + - + + + + + + + + + + + + + @@ -74,6 +88,7 @@ + @@ -118,6 +133,8 @@ + + - - + + @@ -141,7 +158,7 @@ @@ -168,6 +185,11 @@ + + + + + @@ -175,10 +197,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml index 75bbc381..76a5268c 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml @@ -131,7 +131,7 @@ - +