订单修改发货功能,订单拦截结果显示

This commit is contained in:
wule committed 2026-09-16 20:34:28 +08:00
1 parent f3ec329e77
commit cbacc242db
15 files changed
+580 -63

No files matched your search

@@ -1022,7 +1022,7 @@
IsReadOnly="True"
Text="{Binding ItemOrder.shop_remark}"
TextWrapping="Wrap"
Visibility="Visible"
Visibility="{Binding ItemOrder.shop_remark, Converter={StaticResource HasTextVisibility}}"
WaterMark="店铺备注" />
<Button
x:Name="btnEditShopRemark"
@@ -1051,6 +1051,7 @@
IsReadOnly="True"
Text="{Binding ItemOrder.soft_remark}"
TextWrapping="Wrap"
Visibility="{Binding ItemOrder.soft_remark, Converter={StaticResource HasTextVisibility}}"
WaterMark="软件备注" />
<Button
x:Name="btnEditAppRemark"
@@ -1079,6 +1080,7 @@
IsReadOnly="True"
Text="{Binding TransitWarehouseRejectSuccessTimeStr}"
TextWrapping="Wrap"
Visibility="{Binding TransitWarehouseRejectSuccessTimeStr, Converter={StaticResource HasTextVisibility}}"
WaterMark="中转仓拒收" />
<Button
x:Name="btnAddEditTransitWarehouseReject"
@@ -1108,6 +1110,7 @@
IsReadOnly="True"
Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
TextWrapping="Wrap"
Visibility="{Binding TransitWarehouseAfterSaleWayBillStr, Converter={StaticResource HasTextVisibility}}"
WaterMark="拦截退回总店" />
<Button
x:Name="btnAddEditTransitWarehouseAfterSale"
@@ -1115,6 +1118,17 @@
Click="btnAddEditTransitWarehouseAfterSale_Click"
Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
Style="{StaticResource LinkButton}" />
<uc:UcWaterMarkTextBox1
x:Name="txtInterceptReturnInfoStr"
Margin="0,1,0,1"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="1"
IsReadOnly="True"
Text="{Binding InterceptReturnInfoStr, Converter={StaticResource TextEllipsisConverter8}}"
TextWrapping="Wrap"
ToolTip="{Binding InterceptReturnInfoStr}"
Visibility="{Binding InterceptReturnInfoStr, Converter={StaticResource HasTextVisibility}}" />
</WrapPanel>
</wpf:TitleContent>
@@ -1130,6 +1144,7 @@
IsReadOnly="True"
Text="{Binding AddEditTransitWarehouseReturnOrderWaybillStr}"
TextWrapping="Wrap"
Visibility="{Binding AddEditTransitWarehouseReturnOrderWaybillStr, Converter={StaticResource HasTextVisibility}}"
WaterMark="云仓退货" />
<Button
x:Name="btnRetrunOrder"
@@ -1217,7 +1232,7 @@
<wpf:TitleContent>
<Button
x:Name="btnMapSkus"
Height="24"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
@@ -1233,7 +1248,7 @@
<Button
x:Name="btnBuyOrder"
Height="24"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
@@ -1253,7 +1268,7 @@
<Button
x:Name="btnVoidTransitOrder"
Height="24"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
@@ -1265,7 +1280,7 @@
<Button
x:Name="btnAbnormalOrderRebuy"
Height="24"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
@@ -1281,7 +1296,7 @@
<wpf:TitleContent>
<Button
x:Name="btnDirectBuyOrder"
Height="24"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
@@ -1295,7 +1310,7 @@
<wpf:TitleContent>
<Button
x:Name="btnShipGift"
Height="24"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
@@ -1305,7 +1320,19 @@
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:TitleContent>
<wpf:TitleContent>
<Button
x:Name="btnChangeWaybill"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnChangeWaybill_Click"
Content="修改物流"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
</Grid>
</Grid>