Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
shanji 2 years ago
parent
commit
2370b6c684
  1. 31
      BBWY.Client/Views/PackTask/PackDetailWindow.xaml

31
BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@ -168,7 +168,7 @@
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="耐摔等级:" Style="{StaticResource middleTextBlock}"/>
<Grid Margin="5" Grid.Column="1" Grid.ColumnSpan="3">
<Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
@ -215,7 +215,7 @@
</TextBlock>
</StackPanel>
</Grid>
<!--<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
@ -300,7 +300,7 @@
<Grid Margin="20 10 20 0" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60"/>
@ -531,7 +531,7 @@
<Grid Grid.Row="1" Grid.Column="1" Visibility="Hidden">
<Grid Grid.Row="1" Grid.Column="1" Visibility="Hidden" >
<Grid x:Name="print_box" Height="492" Width="272">
<Grid Margin="0 10 0 10" Width="272">
<Grid.RowDefinitions>
@ -544,13 +544,20 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Image Name="img_logo" Width="120"/>
<StackPanel VerticalAlignment="Top" Grid.Column="1" Margin="5">
<TextBlock Style="{StaticResource middleTextBlock}" Margin="0 10 0 0" FontSize="15" FontWeight="Bold">
<Run Text="任务ID:" />
<Run Text="{Binding PackTaskModel.TaskId}"/>
<Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="0 0 0 0" FontSize="15" FontWeight="Bold" Grid.Row="0">
<Run Text="任务ID:" />
<Run Text="{Binding PackTaskModel.TaskId}"/>
</TextBlock>
<TextBlock Margin="0 20 0 0" Text="{Binding PackTaskModel.PositionType}" TextWrapping="Wrap" HorizontalAlignment="Center" FontWeight="Bold" FontSize="40"/>
</StackPanel>
<TextBlock Grid.Row="1" VerticalAlignment="Center" Margin="0 0 0 0" Text="{Binding PackTaskModel.PositionType}" TextWrapping="Wrap" HorizontalAlignment="Center" FontWeight="Bold" FontSize="35"/>
</Grid>
</Grid>
<StackPanel Orientation="Vertical" Grid.Row="1" Margin="0">
<StackPanel Orientation="Vertical" Margin="5">
@ -654,7 +661,7 @@
<Border Height="1" Background="{StaticResource Border.Brush}" VerticalAlignment="Top" Grid.Row="2"/>
<Grid Grid.Row="2" >
<StackPanel HorizontalAlignment="Left" Margin="20 0 0 0" VerticalAlignment="Center" >
<TextBlock Style="{StaticResource middleTextBlock}">
@ -671,4 +678,4 @@
</Grid>
</c:BWindow>
</c:BWindow>
Loading…
Cancel
Save