diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs index 2bc6cd50..65fca1ae 100644 --- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs +++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs @@ -14,18 +14,20 @@ namespace BBWY.Client.ViewModels { private PurchaseService purchaseService; private GlobalContext globalContext; - + private BindingPurchaseProductViewModel bindingPurchaseProduct; public string SkuId { get; set; } + public string SkuName { get; set; } public IList PurchaseSchemeList { get; set; } public ICommand DeleteCommand { get; set; } public ICommand EditCommand { get; set; } - public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext) + public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext, BindingPurchaseProductViewModel bindingPurchaseProduct) { this.purchaseService = purchaseService; this.globalContext = globalContext; + this.bindingPurchaseProduct = bindingPurchaseProduct; PurchaseSchemeList = new ObservableCollection(); DeleteCommand = new RelayCommand(Delete); EditCommand = new RelayCommand(Edit); @@ -52,10 +54,16 @@ namespace BBWY.Client.ViewModels protected override void Unload() { - this.SkuId = string.Empty; + this.SkuId = this.SkuName = string.Empty; PurchaseSchemeList.Clear(); } + public void SetData(string skuId, string skuName) + { + this.SkuId = skuId; + this.SkuName = skuName; + } + public void Delete(PurchaseScheme purchaseScheme) { Task.Factory.StartNew(() => purchaseService.DeletePurchaseScheme(purchaseScheme.Id)).ContinueWith(r => @@ -70,7 +78,13 @@ namespace BBWY.Client.ViewModels public void Edit(PurchaseScheme purchaseScheme) { - + var skuList = new List() + { + new ProductSku(){ Id=purchaseScheme.SkuId,ProductId=purchaseScheme.ProductId, Title=SkuName} + }; + bindingPurchaseProduct.SetData(skuList, purchaseScheme.PurchaserId, purchaseScheme.PurchaserName); + var bindingView = new Views.Ware.BindingPurchaseProduct(); + var r = bindingView.ShowDialog(); } } } diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 0cd47141..415b364e 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -257,7 +257,7 @@ namespace BBWY.Client.ViewModels } else if (chooseDFType.DFType == DFType.在线采购) { - choosePurchaseSchemeViewModel.SkuId = order.ItemList[0].Id; + choosePurchaseSchemeViewModel.SetData(order.ItemList[0].Id, order.ItemList[0].Title); var choosePurchaseScheme = new ChoosePurchaseScheme(); choosePurchaseScheme.ShowDialog(); }