优化中转仓处理拍单流程 隐藏部分不可用功能

This commit is contained in:
wule committed 2026-11-06 16:11:23 +08:00
1 parent 27ac748f33
commit 518365a0d3
30 files changed
+1237 -634

No files matched your search

@@ -634,8 +634,8 @@
Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
Text="{Binding BuyerTransitWaybillStatusStr}" />
</Border>
<Border
x:Name="borderWarehouseStatas"
<!--<Border
x:Name="borderWarehouseStatus"
Height="auto"
MinWidth="30"
Margin="0,0,4,0"
@@ -647,7 +647,7 @@
BorderThickness="1"
CornerRadius="2"
Cursor="Hand"
MouseUp="borderWarehouseStatas_MouseUp"
MouseUp="borderWarehouseStatus_MouseUp"
Visibility="{Binding WarehouseWaybillStatusStrVisibility}">
<TextBlock
x:Name="txtWarehouseStatus"
@@ -658,8 +658,33 @@
Foreground="{Binding WarehouseWaybillStatusStrColor}"
MouseEnter="txtWarehouseStatus_MouseEnter"
Text="{Binding WarehouseWaybillStatusStr}" />
</Border>
</Border>-->
<Border
x:Name="borderWarehousePackageStatus"
Height="auto"
MinWidth="30"
Margin="0,0,4,0"
HorizontalAlignment="Center"
d:Background="{StaticResource PageOkBrush50}"
d:BorderBrush="{StaticResource PageOkBrush}"
Background="{Binding WarehouseWaybillStatusBackColor}"
BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
BorderThickness="1"
CornerRadius="2"
Cursor="Hand"
MouseUp="borderWarehouseStatus_MouseUp"
Visibility="{Binding TransitPackageLatestWarehouseStatusStrVisibility}">
<TextBlock
x:Name="txtWarehouseStatus"
MinWidth="20"
VerticalAlignment="Center"
d:Text="包裹状态"
Background="Transparent"
Foreground="{Binding WarehouseWaybillStatusStrColor}"
MouseEnter="txtWarehouseStatus_MouseEnter"
Text="{Binding TransitPackageLatestWarehouseStatusStr}" />
</Border>
<!--<Border
Height="auto"
MinWidth="30"
Margin="0,0,4,0"
@@ -677,6 +702,25 @@
Background="Transparent"
Foreground="White"
Text="{Binding TransitRefundVoidStatusStr}" />
</Border>-->
<Border
Height="auto"
MinWidth="30"
Margin="0,0,4,0"
HorizontalAlignment="Center"
Background="{StaticResource pageColorBrush}"
BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding TransitPackageLatestVoidStatusStrVisibility}">
<TextBlock
MinWidth="20"
Padding="0"
VerticalAlignment="Center"
d:Text="作废状态"
Background="Transparent"
Foreground="White"
Text="{Binding TransitPackageLatestVoidStatusStr}" />
</Border>
</WrapPanel>
@@ -1399,7 +1443,8 @@
HorizontalAlignment="Center"
Click="btnTransitInfo_Click"
Content="云仓详情"
Style="{StaticResource BasePageButtonLightStyle}" />
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" />
<Button
x:Name="btnMapSkus"
@@ -1463,10 +1508,12 @@
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnDirectBuyOrder_Click"
Content="直发拍单"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnDirectBuyOrderVisibility}" />
Visibility="Collapsed" />
<!-- Visibility="{Binding BtnDirectBuyOrderVisibility}" -->
<!-- 礼品发货 -->
<Button
@@ -1486,7 +1533,8 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="3">
VerticalSpacing="5">
<Button
x:Name="btnChangeWaybill"
MinWidth="38"
@@ -1500,7 +1548,8 @@
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
<Button
<!--<Button
x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38"
MinHeight="20"
@@ -1553,7 +1602,75 @@
Content="滞留补发买家"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />-->
<Button
x:Name="btnVoidPackage"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Content="作废包裹"
d:Visibility="Visible"
Click="btnVoidTransitOrder_Click"
Content="{Binding VoidPackageTypeStr}"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.VoidPackageBtnVisibility}" />
<Button
x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAddEditTransitWarehouseReject_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.RejectPackageBtnVisibility}">
<TextBlock>
云仓拒收<LineBreak />
退回总店</TextBlock>
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.ReturnPackageBtnVisibility}">
<TextBlock>
拒收失败<LineBreak />
转寄总店</TextBlock>
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.InterceptPackageBtnVisibility}">
<TextBlock>
出库拦截<LineBreak />
退回仓库</TextBlock>
</Button>
<Button
x:Name="btnTransitExtraPackages"
Height="20"
MinWidth="38"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnTransitExtraPackages_Click"
Content="滞留补发买家"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.ExtraPackagesBtnVisibility}" />
</wpf:SpacingStackPanel>
</wpf:SpacingStackPanel>
</Grid>