订单查询-切换选项卡不重置时间条件

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -171,8 +171,8 @@ namespace BBWY.Client.ViewModels
             this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel;
             OrderList = new ObservableCollection<Order>();
             AfterSaleOrderList = new ObservableCollection<AfterSaleOrder>();
-            //EndDate = DateTime.Now;
+            EndDate = DateTime.Now;
-            //StartDate = DateTime.Now.Date.AddDays(-6);
+            StartDate = DateTime.Now.Date.AddDays(-6);
             ToDayOrderAchievement = new ToDayOrderAchievement();
             InitSearchParam();
 
@@ -223,7 +223,7 @@ namespace BBWY.Client.ViewModels
             SearchOrderCommand.Execute(null);
         }
 
-        private void InitSearchParam()
+        private void InitSearchParam(bool isInitDate = false)
         {
             this.OrderState = null;
             SearchOrderId = string.Empty;
@@ -232,8 +232,11 @@ namespace BBWY.Client.ViewModels
             SearchSku = string.Empty;
             SearchProductId = string.Empty;
             SearchWaybill = string.Empty;
-            EndDate = DateTime.Now;
+            if (isInitDate)
-            StartDate = DateTime.Now.Date.AddDays(-6);
+            {
+                EndDate = DateTime.Now;
+                StartDate = DateTime.Now.Date.AddDays(-6);
+            }
             PageIndex = 1;
             IncludeAfterOrder = null;
             IncludeExceptionOrder = false;
@@ -264,7 +267,7 @@ namespace BBWY.Client.ViewModels
 
         public void SetOrderState(OrderState? orderState)
         {
-            InitSearchParam();
+            InitSearchParam(orderState == null);
             this.OrderState = orderState;
             Task.Factory.StartNew(() => LoadOrder(1));  //选择状态查询订单
         }