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

BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@@ -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">
+                        <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"/>
+                            <TextBlock Grid.Row="1" VerticalAlignment="Center" Margin="0 0 0 0" Text="{Binding PackTaskModel.PositionType}" TextWrapping="Wrap" HorizontalAlignment="Center" FontWeight="Bold" FontSize="35"/>
-                        </StackPanel>
+
+                        </Grid>
+
                     </Grid>
                     <StackPanel Orientation="Vertical" Grid.Row="1" Margin="0">
                         <StackPanel Orientation="Vertical" Margin="5">