diff --git a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
index be16181b..a2926417 100644
--- a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
@@ -131,5 +131,25 @@ namespace BBWY.Client.Models
/// 退款支付宝订单号
///
public string RefundAlipayOrderNo { get; set; }
+
+ ///
+ /// 采购方式
+ ///
+ public PurchaseMethod? PurchaseMethod { get; set; }
+
+ ///
+ /// 采购平台
+ ///
+ public Platform? PurchasePlatform { get; set; }
+
+ ///
+ /// 采购单号
+ ///
+ public string PurchaseOrderId { get; set; }
+
+ ///
+ /// 采购单主键
+ ///
+ public long? PurchaseOrderPKId { get; set; }
}
}
diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
index 6fce77ac..4ae88b17 100644
--- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
+++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
@@ -117,6 +117,27 @@ namespace BBWY.Client.Models
///
public string RefundAlipayOrderNo { get; set; }
+
+ ///
+ /// 采购方式
+ ///
+ public PurchaseMethod? PurchaseMethod { get; set; }
+
+ ///
+ /// 采购平台
+ ///
+ public Platform? PurchasePlatform { get; set; }
+
+ ///
+ /// 采购单号
+ ///
+ public string PurchaseOrderId { get; set; }
+
+ ///
+ /// 采购单主键
+ ///
+ public long? PurchaseOrderPKId { get; set; }
+
public object Clone()
{
return this.MemberwiseClone();
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index eef18d6e..fcf308a5 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -272,6 +272,13 @@ namespace BBWY.Client.ViewModels
return;
}
var afterSaleOrderResponse = afterOrderService.GetAfterSaleOrderById(afterSaleOrderId);
+ IsLoading = false;
+ if (!afterSaleOrderResponse.Success)
+ {
+ Application.Current.Dispatcher.Invoke(() => MessageBox.Show(afterSaleOrderResponse.Msg, "查询售后单"));
+ return;
+ }
+
var newAfterSaleOrder = afterSaleOrderResponse.Data.Map();
App.Current.Dispatcher.Invoke(() =>
{
diff --git a/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml b/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml
index fc53620a..67c41893 100644
--- a/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml
+++ b/BBWY.Client/Views/Order/EditAfterSaleOrderRefundPurchaseAmount.xaml
@@ -6,6 +6,9 @@
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:local="clr-namespace:BBWY.Client.Views.Order"
mc:Ignorable="d"
+ Style="{StaticResource bwstyle}"
+ MinButtonVisibility="Collapsed"
+ MaxButtonVisibility="Collapsed"
Title="EditAfterSaleOrderRefundPurchaseAmount" Height="300" Width="300">
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 800a5f20..b1cdb292 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -1179,7 +1179,7 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BBWY.Server.API/Controllers/AfterSaleOrderController.cs b/BBWY.Server.API/Controllers/AfterSaleOrderController.cs
index e519fe12..3a8d7c9c 100644
--- a/BBWY.Server.API/Controllers/AfterSaleOrderController.cs
+++ b/BBWY.Server.API/Controllers/AfterSaleOrderController.cs
@@ -30,7 +30,7 @@ namespace BBWY.Server.API.Controllers
///
///
///
- [HttpGet]
+ [HttpGet("{afterSaleOrderId}")]
public AfterSaleOrderResponse GetAfterSaleOrderById([FromRoute] long afterSaleOrderId)
{
return afterSaleOrderBusiness.GetAfterSaleOrderById(afterSaleOrderId);