From 754a26d7232c6efdc5af9fe148a8f4b86c98a8db Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 16 Jul 2023 19:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=93=E5=BA=93=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                              | 2 +-
 BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs | 2 +-
 BBWY.Client/Views/PackTask/WareHouseListControl.xaml      | 4 ++--
 BBWY.Client/Views/QualityTask/WaitQualityControl.xaml     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 7aebdd53..9d663ef1 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10150";
+            ClientVersion = "10151";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 14ca7c70..e7cde988 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -144,7 +144,7 @@ namespace BBWY.Client.ViewModels.PackTask
         {
             if (SelectTaskId == "任务ID")
             {
-                searchOrderSn = null;
+                SearchOrderSn = null;
             }
             if (SelectTaskId == "拳探订单号")
             {
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 7cce3512..5099897f 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -260,8 +260,8 @@
                                         >
                                     <!-- -->
                                     <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
-                                    <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
-                                   Margin="5,0,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>
+                                    <!--<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
+                                   Margin="5,0,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>-->
                                 </StackPanel>
                             </Grid>
                             <Grid Grid.Row="1">
diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
index 4a991135..0ca7b318 100644
--- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
@@ -269,8 +269,8 @@
                                         >
                                     <!-- -->
                                     <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
-                                    <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
-                                   Margin="5,0,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>
+                                    <!--<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
+                                   Margin="5,0,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>-->
                                 </StackPanel>
                             </Grid>
                             <Grid Grid.Row="1">