From 1c087eaa70b2d3e8ce9ce498dd63b5b11a8dad31 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 30 Jun 2023 19:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=AB=AF=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml    | 4 ++--
 BBWY.Client/Views/PackTask/TaskListControl.xaml           | 8 ++++----
 BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
index 92c88518..65f9ab1d 100644
--- a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
@@ -119,11 +119,11 @@
                                                                    CommandParameter="{Binding DepartmentName}"
                                                                    Margin=" 5,0,0,0"/>
 
-                                <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
+                                <!--<TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
                                 <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding ShopName}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   Margin=" 5,0,0,0"/>-->
                                 <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
                                     <TextBlock  VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0"  />
                                     <TextBlock  VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml
index 4e8e5038..2c726e4e 100644
--- a/BBWY.Client/Views/PackTask/TaskListControl.xaml
+++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml
@@ -115,11 +115,11 @@
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding DepartmentName}" Margin="5,0,0,0" />
 
-                                <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                <!--<TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
+                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   CommandParameter="{Binding ShopName}"
+                                                                   Margin=" 5,0,0,0"/>-->
                                 <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
                             </StackPanel>
diff --git a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
index 294bd059..fee9f4fb 100644
--- a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
@@ -117,11 +117,11 @@
                                                                    CommandParameter="{Binding DepartmentName}"
                                                                    Margin=" 5,0,0,0"/>
 
-                                <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
+                                <!--<TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
                                 <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding ShopName}"
-                                                                   Margin=" 5,0,0,0"/>
+                                                                   Margin=" 5,0,0,0"/>-->
                                 <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
                                     <TextBlock  VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0"  />
                                     <TextBlock  VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />