liulb@mesnac.com 9 months ago
parent 1a7bae0b8e
commit d3a41870c9

@ -80,11 +80,11 @@ namespace Aucma.Core.PrintTo.ViewModels
MessageBox.Show("请选中要补打的条码!", "系统提醒"); MessageBox.Show("请选中要补打的条码!", "系统提醒");
return; return;
} }
if (string.IsNullOrWhiteSpace(BarType)) //if (string.IsNullOrWhiteSpace(BarType))
{ //{
MessageBox.Show("请选中要补打的类型!", "系统提醒"); // MessageBox.Show("请选中要补打的类型!", "系统提醒");
return; // return;
} //}
int Id = Convert.ToInt32(obj); int Id = Convert.ToInt32(obj);
var printSuppleMentBarCode = _printSuppleMentBarCodeServices.FirstAsync(d => d.ObjId == Id).Result; var printSuppleMentBarCode = _printSuppleMentBarCodeServices.FirstAsync(d => d.ObjId == Id).Result;
if (printSuppleMentBarCode != null) if (printSuppleMentBarCode != null)

@ -52,11 +52,9 @@
<TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="25" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/> <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"/> <TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
<Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" > <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"> <DockPanel Grid.Row="2" Margin="5 0 5 5">
<Border BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"> <Border BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
<Grid> <Grid>
<StackPanel Height="60" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left"> <StackPanel Height="60" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="首 页" Margin="5 0" Height="40"/> <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="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="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" /> <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" /> <TextBlock x:Name="Account" Text="{Binding Account}" Height="30" Width="100" Margin="5 0" Foreground="White" Block.TextAlignment="Center" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>

@ -33,6 +33,7 @@ namespace Aucma.Core.PrintTo.Views
else else
{ {
this.Account.Text = appConfig.Account; this.Account.Text = appConfig.Account;
//this.Team.Text = appConfig.TeamName;
return true; return true;
} }
} }

Loading…
Cancel
Save