From 4a2721ab695e13b44436236396903d86d51dc363 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Thu, 1 Jun 2023 00:22:56 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs | 10 +++++-----
 BBWY.Client/Views/PackTask/ServiceWindow.xaml          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs b/BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs
index 4e6acbd4..b77b05f8 100644
--- a/BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs
+++ b/BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs
@@ -269,7 +269,7 @@ namespace BBWY.Client.Views.PackTask
                 <RowDefinition Height=""*""/>
             </Grid.RowDefinitions>
             <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7""  Grid.RowSpan=""2""  BorderThickness=""0,0,1,0""/>
-            <TextBlock Text=""收费方式""  Grid.Row=""0""   VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
+            <TextBlock Text="" 收费方式 ""  Grid.Row=""0""   VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
             <TextBlock   Text=""[:FeesMode:]"" Grid.Row=""1""  VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
         </Grid>";
 
@@ -279,7 +279,7 @@ namespace BBWY.Client.Views.PackTask
                 <RowDefinition Height=""*""/>
             </Grid.RowDefinitions>
             <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7""  Grid.RowSpan=""2""  BorderThickness=""0,0,1,0""/>
-            <TextBlock Text=""折扣系数""  Grid.Row=""0""   VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
+            <TextBlock Text="" 折扣系数 ""  Grid.Row=""0""   VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
             <TextBlock   Text=""[:DiscountFactor:]"" Grid.Row=""1""  VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
         </Grid>";
         //string processFeesStr = @" 
@@ -383,7 +383,7 @@ namespace BBWY.Client.Views.PackTask
                     for (int i = 0; i < basicProcessList.Count; i++)
                     {
                         basicSB.AppendLine(basicProcessdata.Replace("[:index:]", $"{i}")
-                                    .Replace("[:ServiceName:]", $"{basicProcessList[i].ItemName}")
+                                    .Replace("[:ServiceName:]", $" {basicProcessList[i].ItemName} ")
                                     .Replace("[:ServiceCount:]", $"{basicProcessList[i].ItemPrice}*{basicProcessList[i].ItemCount}"));
                         basiccolumns.AppendLine(columnStr);
                     }
@@ -406,7 +406,7 @@ namespace BBWY.Client.Views.PackTask
                     for (int i = 0; i < increateProcessList.Count(); i++)
                     {
                         increateProcessSB.AppendLine(increateProcessData.Replace("[:index:]", $"{i}")
-                                    .Replace("[:ServiceName:]", $"{increateProcessList[i].ItemName}")
+                                    .Replace("[:ServiceName:]", $" {increateProcessList[i].ItemName} ")
                                     .Replace("[:ServiceCount:]", $"{increateProcessList[i].ItemPrice}*{increateProcessList[i].ItemCount}"));
                         increateProcesscolumns.AppendLine(columnStr);
                     }
@@ -445,7 +445,7 @@ namespace BBWY.Client.Views.PackTask
                     {
                         rowIndex++;
                         serviceData.AppendLine(incrementConsumableStr.Replace("[:index:]", $"{rowIndex}")
-                                           .Replace("[:ServiceName:]", $"{item.ItemName}")
+                                           .Replace("[:ServiceName:]", $" {item.ItemName} ")
                                            .Replace("[:ServiceCount:]", $""));
                     }
                    
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
index dd629549..d036a2c1 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@@ -414,7 +414,7 @@
 
 
 
-        <Grid Grid.Row="1" Grid.Column="1">
+        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Hidden">