From 217163eb8ad0cc07a7e6af70e95627445b8542da Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 14 Feb 2023 23:46:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8=E7=AD=89=E5=BE=85=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=AD=E8=AE=BE=E7=BD=AE=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E8=87=AA=E5=8F=91=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=202.=E5=9C=A8=E7=AD=89?= =?UTF-8?q?=E5=BE=85=E9=87=87=E8=B4=AD=E4=B8=AD=E8=AE=BE=E7=BD=AE=E4=BB=A3?= =?UTF-8?q?=E5=8F=91=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=A7=BB=E9=99=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/BBWY.Client.csproj | 2 +- .../ViewModels/Order/OrderListViewModel.cs | 62 +++---------------- 2 files changed, 10 insertions(+), 54 deletions(-) diff --git a/BBWY.Client/BBWY.Client.csproj b/BBWY.Client/BBWY.Client.csproj index 9d709acc..139cee55 100644 --- a/BBWY.Client/BBWY.Client.csproj +++ b/BBWY.Client/BBWY.Client.csproj @@ -1,7 +1,7 @@  - WinExe + Exe netcoreapp3.1 true Resources\Images\bbwylogo.ico diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 7c8e1596..bc4d6dc6 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -310,7 +310,7 @@ namespace BBWY.Client.ViewModels Task.Factory.StartNew(() => LoadOrder(1)); } - public void RefreshOrder(string orderId) + public void RefreshOrder(string orderId, bool isRemoveOrder = false) { //Task.Factory.StartNew(() => LoadOrder(PageIndex)); var order = OrderList.FirstOrDefault(o => o.Id == orderId); @@ -320,7 +320,7 @@ namespace BBWY.Client.ViewModels return; } - if (OrderState == Models.OrderState.等待采购 && order.StorageType == null) + if (isRemoveOrder) { IsLoading = false; Application.Current.Dispatcher.Invoke(() => @@ -512,34 +512,6 @@ namespace BBWY.Client.ViewModels AfterSaleOrderUnhandleCount = response.Data.AfterSaleOrderUnhandleCount; } - //private void DecodeConsignee(Order order) - //{ - // var plaintextMobile = string.Empty; - // var grab = new GrabJDMibole(order.Id); - // if (grab.ShowDialog() == true) - // plaintextMobile = grab.Tag.ToString(); - // if (string.IsNullOrEmpty(plaintextMobile)) - // { - // MessageBox.Show("未获取到手机号", "提示"); - // return; - // } - // IsLoading = true; - // Task.Factory.StartNew(() => orderService.DecodeConsignee(order.Id, plaintextMobile)).ContinueWith(t => - // { - // var response = t.Result; - // IsLoading = false; - // if (!response.Success) - // { - // App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "解密失败")); - // return; - // } - // order.Consignee.ContactName = response.Data.ContactName; - // order.Consignee.Address = response.Data.Address; - // order.Consignee.Mobile = response.Data.Mobile; - // order.Consignee.IsDecode = true; - // }); - //} - private void GetBuyerAccount(Order order) { if (string.IsNullOrEmpty(order.BuyerAccount)) @@ -689,26 +661,6 @@ namespace BBWY.Client.ViewModels } RefreshOrder(orderId); }); - - //var relationPurchaseOrder = sender as RelationPurchaseOrder; - //if (relationPurchaseOrder.DialogResult != true) - // return; - //var orderDropShipping = relationPurchaseOrder.OrderDropShipping; - //var relationPurchaseOrderSkuList = relationPurchaseOrder.RelationPurchaseOrderSkuList; - //IsLoading = true; - //Task.Factory.StartNew(() => orderService.RelationPurchaseOrder(orderDropShipping, relationPurchaseOrderSkuList, globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M)) - // .ContinueWith(r => - // { - // var response = r.Result; - // if (!response.Success) - // { - // IsLoading = false; - // App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "关联采购订单")); - // return; - // } - // //LoadOrder(PageIndex); //关联订单刷新订单列表 - // RefreshOrder(orderDropShipping.OrderId); - // }); } private void Sd_Closed(object sender, EventArgs e) @@ -833,7 +785,7 @@ namespace BBWY.Client.ViewModels } //LoadOrder(PageIndex); //自动计算成功刷新订单列表 - RefreshOrder(orderId); + RefreshOrder(orderId, isSetStorageType); }); } else @@ -910,7 +862,7 @@ namespace BBWY.Client.ViewModels return; } //LoadOrder(PageIndex); //手动计算成功刷新订单列表 - RefreshOrder(orderId); + RefreshOrder(orderId, isSetStorageType); }); } @@ -995,7 +947,11 @@ namespace BBWY.Client.ViewModels App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "修改商家备注")); return; } - + if (OrderState == Models.OrderState.等待采购 && order.StorageType == StorageType.代发) + { + App.Current.Dispatcher.Invoke(() => OrderList.Remove(order)); + return; + } order.VenderRemark = venderRemark; order.Flag = flag; });