From d3a41870c9cef865dddcbfb78c39605e8506652f Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Tue, 30 Apr 2024 11:11:31 +0800
Subject: [PATCH] .

---
 .../ViewModels/SupplementPrintPageViewModel.cs         | 10 +++++-----
 Aucma.Core.PrintTo/Views/MainWindow.xaml               |  6 ++----
 Aucma.Core.PrintTo/Views/MainWindow.xaml.cs            |  1 +
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs
index d03a7c0f..a7e49feb 100644
--- a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs
+++ b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs
@@ -80,11 +80,11 @@ namespace Aucma.Core.PrintTo.ViewModels
                 MessageBox.Show("请选中要补打的条码！", "系统提醒");
                 return;
             }
-            if (string.IsNullOrWhiteSpace(BarType))
-            {
-                MessageBox.Show("请选中要补打的类型！", "系统提醒");
-                return;
-            }
+            //if (string.IsNullOrWhiteSpace(BarType))
+            //{
+            //    MessageBox.Show("请选中要补打的类型！", "系统提醒");
+            //    return;
+            //}
             int Id = Convert.ToInt32(obj);
             var printSuppleMentBarCode = _printSuppleMentBarCodeServices.FirstAsync(d => d.ObjId == Id).Result;
             if (printSuppleMentBarCode != null)
diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml b/Aucma.Core.PrintTo/Views/MainWindow.xaml
index 980a26b7..73c6b1ee 100644
--- a/Aucma.Core.PrintTo/Views/MainWindow.xaml
+++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml
@@ -52,11 +52,9 @@
                                 <TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="25" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/>
                                 <TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </StackPanel>
-
                         </Grid>
                     </StackPanel>
                 </Grid>
-
             </Border>
 
             <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" >
@@ -66,15 +64,15 @@
             <DockPanel  Grid.Row="2" Margin="5 0 5 5">
                 <Border  BorderBrush="#0288d1"   BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
                     <Grid>
-
                         <StackPanel  Height="60" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
                             <Button Content="首  页"   Margin="5 0" Height="40"/>
                             <Button Content="键  盘"  x:Name="TabTip" Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=TabTip}" />
                             <Button Content="最小化"  x:Name="Minimized" Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Width="100"  Background="#FF9900" BorderBrush="#FF9900" />
                             <Button Content="退  出"  x:Name="Exit" Height="40" Margin="5 0"  Command="{Binding CloseWindowCommand}"  CommandParameter="{Binding ElementName=window}"  Width="100"  Background="#FF0033" BorderBrush="#FF0033" />
 
-                            <TextBlock Text=" 登陆人账号:"  Height="30" Width="100" Margin="5 0" Foreground="White" Block.TextAlignment="Center" />
+                            <TextBlock Text=" 登陆人账号:"  Height="30" Width="auto" Margin="5 0" Foreground="White" Block.TextAlignment="Center" />
                             <TextBlock  x:Name="Account" Text="{Binding Account}"  Height="30" Width="100" Margin="5 0" Foreground="White" Block.TextAlignment="Center" />
+                     
                         </StackPanel>
                     </Grid>
                 </Border>
diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs b/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs
index 996e6f7d..9c66d322 100644
--- a/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs
+++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs
@@ -33,6 +33,7 @@ namespace Aucma.Core.PrintTo.Views
             else
             {
                 this.Account.Text = appConfig.Account;
+                //this.Team.Text = appConfig.TeamName;
                 return true;
             }
         }