修复订单管理 筛选条件显示问题

调整服务单采购单号显示条件

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -44,7 +44,7 @@ namespace BBWY.Client.ViewModels
         private bool onlyDF;
         private bool excludeSD;
         private bool excludeCanceled;
-        private bool onlyUnhandle;
+        //private bool onlyUnhandle;
         private Random random;
         public GlobalContext globalContext { get; set; }
         //private bool? includeAfterOrder;
@@ -93,10 +93,7 @@ namespace BBWY.Client.ViewModels
         //public bool? IncludeAfterOrder { get => includeAfterOrder; set { Set(ref includeAfterOrder, value); } }
         public string SearchServiceId { get => searchServiceId; set { Set(ref searchServiceId, value); } }
 
-        /// <summary>
-        /// 仅显示未处理
-        /// </summary>
-        public bool OnlyUnhandle { get => onlyUnhandle; set { Set(ref onlyUnhandle, value); } }
+        //public bool OnlyUnhandle { get => onlyUnhandle; set { Set(ref onlyUnhandle, value); } }
 
         public ToDayOrderAchievement ToDayOrderAchievement { get; set; }
 
@@ -450,39 +447,39 @@ namespace BBWY.Client.ViewModels
             IsLoading = false;
         }
 
-        private void LoadAfterSaleOrder(int pageIndex)
-        {
-            IsLoading = true;
-            Thread.Sleep(random.Next(0, 1000));
-            var response = afterOrderService.GetAfterSaleOrderList(globalContext.User.Shop.ShopId,
-                                                                   SearchOrderId,
-                                                                   StartDate,
-                                                                   EndDate,
-                                                                   SearchProductId,
-                                                                   SearchSku,
-                                                                   SearchServiceId,
-                                                                   OnlyUnhandle,
-                                                                   pageIndex,
-                                                                   pageSize);
+        //private void LoadAfterSaleOrder(int pageIndex)
+        //{
+        //    IsLoading = true;
+        //    Thread.Sleep(random.Next(0, 1000));
+        //    var response = afterOrderService.GetAfterSaleOrderList(globalContext.User.Shop.ShopId,
+        //                                                           SearchOrderId,
+        //                                                           StartDate,
+        //                                                           EndDate,
+        //                                                           SearchProductId,
+        //                                                           SearchSku,
+        //                                                           SearchServiceId,
+        //                                                           OnlyUnhandle,
+        //                                                           pageIndex,
+        //                                                           pageSize);
 
-            if (!response.Success)
-            {
-                IsLoading = false;
-                App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "提示"));
-                return;
-            }
+        //    if (!response.Success)
+        //    {
+        //        IsLoading = false;
+        //        App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "提示"));
+        //        return;
+        //    }
 
-            OrderCount = response.Data.Count;
-            var afterOrderList = response.Data.Items.Map<IList<AfterSaleOrder>>();
-            App.Current.Dispatcher.Invoke(() =>
-            {
-                AfterSaleOrderList.Clear();
-                foreach (var aso in afterOrderList)
-                    AfterSaleOrderList.Add(aso);
-                Messenger.Default.Send(string.Empty, "AfterSaleOrderList_ScrollToTop");
-            });
-            IsLoading = false;
-        }
+        //    OrderCount = response.Data.Count;
+        //    var afterOrderList = response.Data.Items.Map<IList<AfterSaleOrder>>();
+        //    App.Current.Dispatcher.Invoke(() =>
+        //    {
+        //        AfterSaleOrderList.Clear();
+        //        foreach (var aso in afterOrderList)
+        //            AfterSaleOrderList.Add(aso);
+        //        Messenger.Default.Send(string.Empty, "AfterSaleOrderList_ScrollToTop");
+        //    });
+        //    IsLoading = false;
+        //}
 
         private void LoadTodayAchievement(DateTime startTime, DateTime endTime, long shopId)
         {

BBWY.Client/ViewModels/ServiceOrder/EditServiceOrderViewModel.cs

@@ -2,6 +2,7 @@
 using BBWY.Client.Models;
 using GalaSoft.MvvmLight.Command;
 using HandyControl.Controls;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
@@ -29,7 +30,7 @@ namespace BBWY.Client.ViewModels
         private decimal? reissueProductAmount;
         private bool isLoading;
 
-
+        public IList<StorageType> RenewalTypeList { get; set; }
         public ServiceResult? ServiceResult { get => serviceResult; set { Set(ref serviceResult, value); } }
         public decimal? SDRefundFreight { get => sdRefundFreight; set { Set(ref sdRefundFreight, value); } }
         public ReturnDirection? ReturnDirection { get => returnDirection; set { Set(ref returnDirection, value); } }
@@ -63,6 +64,7 @@ namespace BBWY.Client.ViewModels
         {
             this.serviceOrderService = serviceOrderService;
             SaveCommand = new RelayCommand(Save);
+            RenewalTypeList = new List<StorageType>() { StorageType.本地自发, StorageType.代发 };
         }
 
         public void SetData(ServiceOrder serviceOrder)

BBWY.Client/Views/Order/OrderList.xaml

@@ -398,11 +398,11 @@
                 </StackPanel>
             </Border>
 
-            <Border Grid.Row="4" Background="{StaticResource Border.Background}">
+            <!--<Border Grid.Row="4" Background="{StaticResource Border.Background}">
                 <StackPanel Orientation="Horizontal">
                     <CheckBox Content="仅显示未处理" Margin="5,0,0,0" IsChecked="{Binding OnlyUnhandle}"/>
                 </StackPanel>
-            </Border>
+            </Border>-->
 
 
             <!--Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"-->

BBWY.Client/Views/ServiceOrder/EditServiceOrder.xaml

@@ -23,11 +23,6 @@
                 <x:Type TypeName="clientModel:ReturnDirection"/>
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
-        <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="clientModel:StorageType"/>
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
         <ObjectDataProvider x:Key="platformProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="clientModel:Platform"/>
@@ -114,7 +109,7 @@
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="换新方式:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                <ComboBox ItemsSource="{Binding Source={StaticResource storageTypeProvider}}"
+                <ComboBox ItemsSource="{Binding RenewalTypeList}"
                           SelectedItem="{Binding RenewalType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                           Grid.Column="1"
                           HorizontalAlignment="Left"
@@ -122,8 +117,14 @@
                           Width="160"
                           Margin="5,0,0,0"/>
             </Grid>
-            <Grid Height="25" Margin="0,5,0,0"
-                  Visibility="{Binding ServiceResult,ConverterParameter=线下换新:Visible:Collapsed,Converter={StaticResource objConverter}}">
+            <Grid Height="25" Margin="0,5,0,0">
+                <Grid.Visibility>
+                    <MultiBinding Converter="{StaticResource mobjConverter}"
+                                  ConverterParameter="线下换新;代发:&amp;:Visible:Collapsed:1">
+                        <Binding Path="ServiceResult"/>
+                        <Binding Path="RenewalType"/>
+                    </MultiBinding>
+                </Grid.Visibility>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="80"/>
                     <ColumnDefinition/>