实收改成实付

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -101,13 +101,13 @@ namespace BBWY.Client.ViewModels
             this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel;
             OrderList = new ObservableCollection<Order>();
             EndDate = DateTime.Now;
-            StartDate = DateTime.Now.Date.AddDays(-29);
+            StartDate = DateTime.Now.Date.AddDays(-6);
             ToDayOrderAchievement = new ToDayOrderAchievement();
             SetOrderStateCommand = new RelayCommand<OrderState?>(SetOrderState);
             SearchOrderCommand = new RelayCommand(() =>
             {
                 PageIndex = 1;
-                Task.Factory.StartNew(() => LoadOrder(1));
+                Task.Factory.StartNew(() => LoadOrder(1));  //手动点击查询订单
                 Task.Factory.StartNew(() => LoadTodayAchievement(StartDate, EndDate));
             });
             CopyTextCommand = new RelayCommand<string>(s =>
@@ -130,7 +130,7 @@ namespace BBWY.Client.ViewModels
                 EndDate = d == 1 ? DateTime.Now.Date.AddDays(-1) : DateTime.Now;
                 StartDate = DateTime.Now.Date.AddDays(d * -1);
                 PageIndex = 1;
-                Task.Factory.StartNew(() => LoadOrder(1));
+                Task.Factory.StartNew(() => LoadOrder(1));  //点击日期查询订单
                 Task.Factory.StartNew(() => LoadTodayAchievement(StartDate, EndDate));
             });
             OrderPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
@@ -154,9 +154,9 @@ namespace BBWY.Client.ViewModels
             SearchSku = String.Empty;
             SearchWaybill = String.Empty;
             EndDate = DateTime.Now;
-            StartDate = DateTime.Now.Date.AddDays(-29);
+            StartDate = DateTime.Now.Date.AddDays(-6);
             PageIndex = 1;
-            Task.Factory.StartNew(() => LoadOrder(1));
+            Task.Factory.StartNew(() => LoadOrder(1));  //选择状态查询订单
         }
 
         private void LoadOrder(int pageIndex)
@@ -295,7 +295,7 @@ namespace BBWY.Client.ViewModels
                                 App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "关联采购订单"));
                                 return;
                             }
-                            LoadOrder(PageIndex); //手动计算成功刷新订单列表
+                            LoadOrder(PageIndex); //关联订单刷新订单列表
                         });
         }
 
@@ -329,7 +329,7 @@ namespace BBWY.Client.ViewModels
                                 App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "设置刷单成本"));
                                 return;
                             }
-                            LoadOrder(PageIndex); //手动计算成功刷新订单列表
+                            LoadOrder(PageIndex); //设置刷单刷新订单列表
                         });
         }
 

BBWY.Client/Views/Order/OrderList.xaml

@@ -476,7 +476,7 @@
 
                                 <StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,10">
                                     <TextBlock>
-                                        <Run Text="实收金额"/>
+                                        <Run Text="实付金额"/>
                                         <Run Text="{Binding OrderPayment}"/>
                                     </TextBlock>