diff --git a/BBWY.Client/Models/Product/PurchaseSchemeProduct.cs b/BBWY.Client/Models/Product/PurchaseSchemeProduct.cs
index 08701acf..212e8e4c 100644
--- a/BBWY.Client/Models/Product/PurchaseSchemeProduct.cs
+++ b/BBWY.Client/Models/Product/PurchaseSchemeProduct.cs
@@ -15,6 +15,7 @@ namespace BBWY.Client.Models
private string purchaseUrl;
private string purchaseProductId;
private bool isEditing;
+ private string searchPurchaseSkuName;
///
/// 采购商品和采购方案的关系Id
@@ -28,10 +29,20 @@ namespace BBWY.Client.Models
public string PurchaseUrl { get => purchaseUrl; set { Set(ref purchaseUrl, value); } }
public string PurchaseProductId { get => purchaseProductId; set => purchaseProductId = value; }
- public bool IsEditing { get => isEditing; set { Set(ref isEditing, value); } }
+ public bool IsEditing
+ {
+ get => isEditing;
+ set
+ {
+ SearchPurchaseSkuName = string.Empty;
+ Set(ref isEditing, value);
+ }
+ }
public IList SkuList { get; set; }
+ public IList SearchSkuList { get; set; }
+
public IList PurchaseSchemeProductSkuList { get; set; }
public List SelectedSkuIdList { get; set; }
@@ -41,9 +52,16 @@ namespace BBWY.Client.Models
get { return SelectedSkuIdList.Count(); }
}
+ public string SearchPurchaseSkuName
+ {
+ get => searchPurchaseSkuName;
+ set { Set(ref searchPurchaseSkuName, value); }
+ }
+
public PurchaseSchemeProduct()
{
SkuList = new ObservableCollection();
+ SearchSkuList = new ObservableCollection();
PurchaseSchemeProductSkuList = new ObservableCollection();
SelectedSkuIdList = new List();
}
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index d1c8f082..09e6e323 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -135,6 +135,8 @@ namespace BBWY.Client.ViewModels
public ICommand SetIncludeExceptionOrderCommand { get; set; }
+ public ICommand OpenSkuDetailCommand { get; set; }
+
///
/// 当前条件利润汇总
///
@@ -155,8 +157,6 @@ namespace BBWY.Client.ViewModels
///
public bool IsSDGroup { get => isSDGroup; set { Set(ref isSDGroup, value); } }
-
-
public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, AfterOrderService afterOrderService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
{
IsSDGroup = globalContext.User.TeamName == "刷单组";
@@ -227,6 +227,7 @@ namespace BBWY.Client.ViewModels
EditAfterSaleOrderCommand = new RelayCommand(EditAfterSaleOrder);
EditAfterSaleOrderRefundPurchaseAmountCommand = new RelayCommand(EditAfterSaleOrderRefundPurchaseAmount);
FindAfterSaleOrderCommand = new RelayCommand