优化售后仓退货相关逻辑
This commit is contained in:
1 parent
d06ec9badc
commit
05a48bf605
10 files changed
+750
-235
No files matched your search
@@ -1513,6 +1513,7 @@
|
||||
Grid.Column="1"
|
||||
Margin="2,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Content="申请"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Click="btnAddEditTransitWarehouseReject_Click"
|
||||
@@ -1546,7 +1547,7 @@
|
||||
IsReadOnly="True"
|
||||
Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="退回中转仓" />
|
||||
WaterMark="中转仓退回" />
|
||||
<!-- Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}" -->
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseAfterSale"
|
||||
@@ -1554,6 +1555,7 @@
|
||||
Grid.Column="1"
|
||||
Margin="2,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Content="添加"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Click="btnAddEditTransitWarehouseAfterSale_Click"
|
||||
@@ -1566,7 +1568,7 @@
|
||||
Grid.Column="1"
|
||||
Width="auto"
|
||||
Orientation="Horizontal"
|
||||
Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
@@ -1608,11 +1610,48 @@
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
|
||||
<!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" 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"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnRetrunOrder" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="2,0,0,0" Content="退货" Click="btnReturnOrder_Click" Cursor="Hand"></Button>
|
||||
</WrapPanel>-->
|
||||
<WrapPanel
|
||||
Grid.Row="7"
|
||||
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>
|
||||
|
||||
</Grid>
|
||||
<!-- 操作 -->
|
||||
|
||||
Reference in new issue
Block a user