中转仓退货包裹逻辑修改 新增中转仓拒收逻辑
This commit is contained in:
1 parent
141c237883
commit
f2d619eafb
10 files changed
+249
-119
No files matched your search
@@ -413,26 +413,34 @@
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnCancelEditAppRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="0,0,0,0" Content="取消" Click="btnCancelEditAppRemark_Click" Visibility="Collapsed" Cursor="Hand"></Button>
|
||||
</WrapPanel>
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="中转售后:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<uc:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseAfterSale" WaterMark="中转售后" Text="{Binding TransitWarehouseAfterSaleWayBillStr}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" Visibility="{Binding AddEditTransitWarehouseRejectStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="中转仓拒收:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<uc:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseReject" WaterMark="中转仓拒收占位" Text="" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
|
||||
VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnAddEditTransitWarehouseReject" Background="Transparent" HorizontalAlignment="Center"
|
||||
Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="2,0,0,0" Content="{Binding AddEditTransitWarehouseRejectStr}"
|
||||
Click="btnAddEditTransitWarehouseReject_Click" Cursor="Hand"></Button>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="退回中转仓:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<uc:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseAfterSale" WaterMark="退回中转仓" Text="{Binding TransitWarehouseAfterSaleWayBillStr}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
|
||||
VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
|
||||
<!--Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"-->
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnAddEditTransitWarehouseAfterSale" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="2,0,0,0" Content="{Binding AddEditTransitWarehouseAfterSaleStr}" Click="btnAddEditTransitWarehouseAfterSale_Click" Cursor="Hand"></Button>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5" Width="auto" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Width="auto" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="总店地址:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<!--<TextBlock Text="{Binding PddBuyerAfterSaleAddressStr}" TextTrimming="CharacterEllipsis" Width="100" ToolTip="这是一个非常长的文本字符串,需要显示省略号..." Visibility="Collapsed" x:Name="tbBuyerRefundAddress"/>-->
|
||||
<uc:UcWaterMarkTextBox1 WaterMark="总店退货地址" Text="{Binding PddBuyerAfterSaleAddressStr,Converter={StaticResource TextEllipsisConverter}}" ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
|
||||
x:Name="txtBuyerRefundAddress" Margin="0,1,0,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"
|
||||
Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"/>
|
||||
x:Name="txtBuyerRefundAddress" Margin="0,1,0,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"
|
||||
Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"/>
|
||||
<Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand"
|
||||
MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" Visibility="{Binding ElementName=txtBuyerRefundAddress,Path=Visibility}">
|
||||
MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" Visibility="{Binding ElementName=txtBuyerRefundAddress,Path=Visibility}">
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
|
||||
</Grid>
|
||||
<!--操作-->
|
||||
<Grid Grid.Column="8" Background="Transparent" VerticalAlignment="Center">
|
||||
|
||||
Reference in new issue
Block a user