修复部分拍单问题 优化拍单显示
This commit is contained in:
1 parent
87c1b8fc79
commit
5571d227c8
13 files changed
+273
-108
No files matched your search
@@ -216,7 +216,7 @@
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border x:Name="borderRefundStatas" Grid.Row="1" Margin="0,0,0,2" Background="{StaticResource PageWarningBrushCC}" BorderBrush="{StaticResource PageWarningBrush}"
|
||||
<Border x:Name="borderRefundStatas" Grid.Row="1" Margin="0,0,0,2" Background="{Binding TransitRefundStatusBackColor}" BorderBrush="{Binding TransitRefundStatusBackColor}"
|
||||
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitRefundStatusStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox x:Name="txtRefundStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center"
|
||||
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitRefundStatusStr}" BorderThickness="0" />
|
||||
@@ -246,14 +246,14 @@
|
||||
<WrapPanel x:Name="wpBuyAccount" Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
|
||||
<TextBlock Text="采购账户:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtOutOrderBuyerStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购账户:" Text="{Binding ItemTransitOrderWithFake.OutOrderBuyerStr}" Grid.Column="1" Grid.Row="1"
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购账户:" Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}" Grid.Column="1" Grid.Row="1"
|
||||
Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtOutOrderBuyerStr" Background="Transparent"
|
||||
IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
|
||||
</WrapPanel>
|
||||
<WrapPanel x:Name="wpBuyOrderId" Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
|
||||
<TextBlock Text="采购单号:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtOutOrderNumStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购单号:" Text="{Binding ItemTransitOrderWithFake.OutOrderNumStr}" Grid.Column="1" Grid.Row="1"
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购单号:" Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}" Grid.Column="1" Grid.Row="1"
|
||||
Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtOutOrderNumStr" Background="Transparent"
|
||||
IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
|
||||
<Border Grid.Column="2" Margin="4,0,0,0" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Visibility="{Binding ElementName=txtOutOrderBuyerStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
|
||||
|
||||
Reference in new issue
Block a user