中转仓订单中间状态优化
This commit is contained in:
1 parent
3a07409f5f
commit
e4e8f7166c
9 files changed
+489
-225
No files matched your search
@@ -1568,6 +1568,48 @@
|
||||
Grid.Column="1"
|
||||
Width="auto"
|
||||
Orientation="Horizontal"
|
||||
Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Margin="0,1,-8,1"
|
||||
VerticalAlignment="Top"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text="云仓退货:" />
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtTransitReturnOrderWaybill"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Margin="0,1,0,1"
|
||||
VerticalAlignment="Top"
|
||||
Background="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding DistribReturnOrderInfo.real_logistics_express_code}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="云仓退货" />
|
||||
<Button
|
||||
x:Name="btnRetrunOrder"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Margin="2,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Content="添加"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Click="btnReturnOrder_Click"
|
||||
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
||||
Cursor="Hand"
|
||||
Foreground="{StaticResource PageLinkBrush}" />
|
||||
</WrapPanel>
|
||||
<WrapPanel
|
||||
Grid.Row="7"
|
||||
Grid.Column="1"
|
||||
Width="auto"
|
||||
Orientation="Horizontal"
|
||||
Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox
|
||||
Grid.Row="2"
|
||||
@@ -1611,11 +1653,11 @@
|
||||
</WrapPanel>
|
||||
|
||||
<WrapPanel
|
||||
Grid.Row="7"
|
||||
Grid.Row="8"
|
||||
Grid.Column="1"
|
||||
Width="auto"
|
||||
Orientation="Horizontal"
|
||||
Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
@@ -1625,32 +1667,35 @@
|
||||
BorderBrush="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text="云仓退货:" />
|
||||
Text="直发总店:" />
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtTransitReturnOrderWaybill"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
x:Name="txtDirectBuyerRefundAddress"
|
||||
Margin="0,1,0,1"
|
||||
VerticalAlignment="Top"
|
||||
Background="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding DistribReturnOrderInfo.real_logistics_express_code}"
|
||||
Text="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="云仓退货" />
|
||||
<Button
|
||||
x:Name="btnRetrunOrder"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Margin="2,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Content="添加"
|
||||
ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
|
||||
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
|
||||
WaterMark="总店退货地址" />
|
||||
<Border
|
||||
Grid.Column="6"
|
||||
Width="12"
|
||||
Height="12"
|
||||
VerticalAlignment="Center"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Click="btnReturnOrder_Click"
|
||||
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
||||
Cursor="Hand"
|
||||
Foreground="{StaticResource PageLinkBrush}" />
|
||||
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
|
||||
Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
|
||||
<Path
|
||||
Margin="0,0,0,0"
|
||||
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"
|
||||
Fill="{StaticResource PageLinkBrush}"
|
||||
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
|
||||
Stretch="Uniform" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
|
||||
</Grid>
|
||||
|
||||
Reference in new issue
Block a user