diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index ec3dea38..d0bcfd5d 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -165,9 +165,35 @@ namespace BBWY.Client.ViewModels Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单 } - public void RefreshOrder() + public void RefreshOrder(string orderId) { - Task.Factory.StartNew(() => LoadOrder(PageIndex)); + //Task.Factory.StartNew(() => LoadOrder(PageIndex)); + var order = OrderList.FirstOrDefault(o => o.Id == orderId); + if (order == null) + { + IsLoading = false; + return; + } + + var orderResponse = orderService.GetOrderById(orderId); + IsLoading = false; + if (!orderResponse.Success) + { + Application.Current.Dispatcher.Invoke(() => MessageBox.Show(orderResponse.Msg, "查询订单详情")); + return; + } + + var newOrder = orderResponse.Map(); + if (newOrder.OrderCostDetailList.Count() > 0) + newOrder.ConvertOrderCostDetailToGroup(); + + Application.Current.Dispatcher.Invoke(() => + { + var orderIndex = OrderList.IndexOf(order); + OrderList.Remove(order); + OrderList.Insert(orderIndex, newOrder); + }); + } private void LoadOrder(int pageIndex) @@ -306,7 +332,7 @@ namespace BBWY.Client.ViewModels App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "关联采购订单")); return; } - LoadOrder(PageIndex); //关联订单刷新订单列表 + //LoadOrder(PageIndex); //关联订单刷新订单列表 }); } @@ -340,7 +366,8 @@ namespace BBWY.Client.ViewModels App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "设置刷单成本")); return; } - LoadOrder(PageIndex); //设置刷单刷新订单列表 + //LoadOrder(PageIndex); //设置刷单刷新订单列表 + RefreshOrder(orderId); }); } @@ -402,7 +429,8 @@ namespace BBWY.Client.ViewModels return; } - LoadOrder(PageIndex); //自动计算成功刷新订单列表 + //LoadOrder(PageIndex); //自动计算成功刷新订单列表 + RefreshOrder(orderId); }); } else @@ -436,7 +464,8 @@ namespace BBWY.Client.ViewModels App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "手动计算成本")); return; } - LoadOrder(PageIndex); //手动计算成功刷新订单列表 + //LoadOrder(PageIndex); //手动计算成功刷新订单列表 + RefreshOrder(orderId); }); } diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs index 63e580a9..eaab4cdb 100644 --- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -305,7 +305,7 @@ namespace BBWY.Client.ViewModels } //刷新订单列表 - orderListViewModel.RefreshOrder(); + orderListViewModel.RefreshOrder(orderId); //关闭当前窗口 GalaSoft.MvvmLight.Messaging.Messenger.Default.Send(null, "OnlinePurchase_Close");