From 67acb5c765b3d50f93c9854c6e3b870a6524144a Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 14 Aug 2023 18:37:50 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml      | 6 ++++--
 BBWY.Client/Views/PackTask/TaskListControl.xaml             | 2 +-
 BBWY.Client/Views/PackTask/WaitPackageControl.xaml          | 6 ++++--
 BBWY.Client/Views/PackTask/WareHouseListControl.xaml        | 2 +-
 BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml   | 5 ++++-
 BBWY.Client/Views/QualityTask/WaitQualityControl.xaml       | 6 ++++--
 .../Views/StorePickSelf/ShopStorePickSelfControl.xaml       | 6 +++---
 BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml   | 5 ++---
 8 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
index ef8c72f7..1fd0dc8c 100644
--- a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
@@ -112,8 +112,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,7,0"/>
 
-                                <!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>-->
-
+                                <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+       Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
+       
+      />
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                 <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml
index b5278bfe..7d33f522 100644
--- a/BBWY.Client/Views/PackTask/TaskListControl.xaml
+++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml
@@ -109,7 +109,7 @@
 
                                 <Label Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White"
                                        Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="20,0,0,0"
-                                        Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
+                                       
                                        />
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding DepartmentName}" Margin="5,0,0,0" />
diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
index dd277e41..7deb7223 100644
--- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
@@ -234,8 +234,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,7,0"/>
 
-                                    <!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>-->
-
+                                    <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+       Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
+       
+      />
                                     <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                     <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 01e36d2c..5555e294 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -248,7 +248,7 @@
                                                                    Margin=" 5,0,7,0"/>
                                     <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
                                         Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
-                                         Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
+                                        
                                        />
 
                                     <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
diff --git a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
index 9beb8a7e..7971f5ad 100644
--- a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
@@ -110,7 +110,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,7,0"/>
 
-                                <!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>-->
+                                <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+       Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
+       
+      />
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                 <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
index 2800a522..756c4030 100644
--- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
@@ -249,8 +249,10 @@
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,7,0"/>
 
-                                    <!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>-->
-
+                                    <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+       Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
+       
+      />
                                     <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                     <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
diff --git a/BBWY.Client/Views/StorePickSelf/ShopStorePickSelfControl.xaml b/BBWY.Client/Views/StorePickSelf/ShopStorePickSelfControl.xaml
index 7f95cea3..9587082a 100644
--- a/BBWY.Client/Views/StorePickSelf/ShopStorePickSelfControl.xaml
+++ b/BBWY.Client/Views/StorePickSelf/ShopStorePickSelfControl.xaml
@@ -226,10 +226,10 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,7,0"/>
-                                    <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+                                    <!--<Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
                                         Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
-                                         Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
-                                       />
+                                        
+                                       />-->
 
                                     <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                     <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
diff --git a/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml b/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml
index 038e86bf..4c3e608a 100644
--- a/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml
+++ b/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml
@@ -183,10 +183,9 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding TaskId}"
                                                                    Margin=" 5,0,7,0"/>
-                                    <Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
+                                    <!--<Label  Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center"  VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
                                         Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
-                                         Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
-                                       />
+                                       />-->
 
                                     <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                     <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"