需要售后订单处理逻辑优化调整及bug修复

This commit is contained in:
wule committed 2026-08-27 08:55:53 +08:00
1 parent 854e10ed1a
commit 237fad81eb
9 files changed
+299 -189

No files matched your search

+225 -159
View File
@@ -752,168 +752,223 @@
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<CheckBox
x:Name="chkEmergencyBuyerWaitAfterSale"
Grid.Column="0"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手待申请售后"
FontSize="12" />
<Button
x:Name="btnBatchRefund"
Grid.Column="1"
Height="20"
MinWidth="48"
Margin="0,0,0,0"
Padding="4,0"
Click="btnBatchRefund_Click"
Content="批量申请买手售后"
FontSize="12"
Style="{StaticResource BasePageButtonStyle}" />
<WrapPanel>
<CheckBox
x:Name="chkEmergencyBuyerWaitSendBack"
Grid.Column="2"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手待退货"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyBuyerWaitSupplierRefund"
Grid.Column="3"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手已寄出待商家退款"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyBuyerRefundFail"
Grid.Column="4"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手退款失败"
FontSize="12" />
<Polyline
Grid.Column="5"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" />
<CheckBox
x:Name="chkEmergencyShopCustomRefundHasWaybill"
Grid.Column="6"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopCustomRefundWaybill_Click"
Content="店铺客户有退货单号"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyShopCustomRefundNoWaybill"
Grid.Column="7"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopCustomRefundWaybill_Click"
Content="店铺客户无退货单号"
FontSize="12" />
<Polyline
Grid.Column="8"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" />
<CheckBox
x:Name="chkEmergencyShopAfterSaleSuccess"
Grid.Column="9"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopAfterSale_Click"
Content="店铺退款完成"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyShopInAfterSale"
Grid.Column="10"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopAfterSale_Click"
Content="店铺退款中"
FontSize="12" />
<Polyline
Grid.Column="11"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" />
<CheckBox
x:Name="chkEmergencyReturn"
Grid.Column="12"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrRefund_Click"
Content="退货退款"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyRefund"
Grid.Column="13"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrRefund_Click"
Content="仅退款"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyWaitSupplierAccept"
Grid.Column="9"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopAfterSale_Click"
Content="待商家受理"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyWaitSupplierReceive"
Grid.Column="9"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopAfterSale_Click"
Content="待商家收货"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyShopAfterSaleSuccess"
Grid.Column="9"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopAfterSale_Click"
Content="店铺退款完成买手需处理"
FontSize="12" />
<Polyline
Grid.Column="14"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2"
Visibility="Hidden" />
<CheckBox
x:Name="chkReturnOrderAddress"
Grid.Column="15"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrder_Click"
Content="退货仓"
FontSize="12"
Visibility="Hidden" />
<CheckBox
x:Name="chkNotReturnOrderAddress"
Grid.Column="16"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrder_Click"
Content="非退货仓"
FontSize="12"
IsChecked="True"
Visibility="Hidden" />
<CheckBox
x:Name="chkEmergencyShopInAfterSale"
Grid.Column="10"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopAfterSale_Click"
Content="店铺退款中"
FontSize="12"
Visibility="Collapsed" />
<Polyline
Grid.Column="8"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2"
Visibility="Collapsed" />
<CheckBox
x:Name="chkEmergencyShopCustomRefundHasWaybill"
Grid.Column="6"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopCustomRefundWaybill_Click"
Content="店铺客户有退货单号"
FontSize="12"
Visibility="Collapsed" />
<CheckBox
x:Name="chkEmergencyShopCustomRefundNoWaybill"
Grid.Column="7"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyShopCustomRefundWaybill_Click"
Content="店铺客户无退货单号"
FontSize="12"
Visibility="Collapsed" />
<Polyline
Grid.Column="11"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" />
<CheckBox
x:Name="chkEmergencyReturn"
Grid.Column="12"
Margin="6,8"
VerticalAlignment="Center"
d:Opacity="0.2"
d:Visibility="Visible"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrRefund_Click"
Content="退货退款"
FontSize="12"
Visibility="Collapsed" />
<CheckBox
x:Name="chkEmergencyRefund"
Grid.Column="13"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrRefund_Click"
Content="仅退款"
FontSize="12" />
<Polyline
Grid.Column="14"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2"
Visibility="Visible" />
<CheckBox
x:Name="chkEmergencyBuyerWaitAfterSale"
Grid.Column="0"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手待申请售后"
FontSize="12" />
<Button
x:Name="btnBatchRefund"
Grid.Column="1"
Height="20"
MinWidth="48"
Margin="0,0,0,0"
Padding="4,0"
Click="btnBatchRefund_Click"
Content="批量申请买手售后"
FontSize="12"
Style="{StaticResource BasePageButtonStyle}" />
<CheckBox
x:Name="chkEmergencyBuyerWaitSendBack"
Grid.Column="2"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手待退货"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyBuyerWaitSupplierRefund"
Grid.Column="3"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手已寄出待商家退款"
FontSize="12" />
<CheckBox
x:Name="chkEmergencyBuyerRefundFail"
Grid.Column="4"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyBuyerAfterSale_Click"
Content="买手退款失败"
FontSize="12" />
<Polyline
Grid.Column="5"
Width="10"
Margin="5,0"
VerticalAlignment="Center"
Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" />
<wpf:TitleContent
Title="中转拒收状态"
Margin="4,0,4,0"
VerticalContentAlignment="Center"
FontSize="12"
Foreground="Black"
Placement="Left"
TitleVerticalAlignment="Center">
<ComboBox
x:Name="cmbRejectStatus"
Width="80"
Height="23"
SelectedIndex="0"
SelectionChanged="cmbRejectStatus_SelectionChanged"
Style="{StaticResource RoundedComboBox}">
<ComboBoxItem Content="请选择" />
<ComboBoxItem Content="未申请" />
<ComboBoxItem Content="申请中" />
<ComboBoxItem Content="拒收失败" />
<ComboBoxItem Content="拒收成功" />
</ComboBox>
</wpf:TitleContent>
<CheckBox
x:Name="chkReturnOrderAddress"
Grid.Column="15"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrder_Click"
Content="退货仓"
FontSize="12"
Visibility="Hidden" />
<CheckBox
x:Name="chkNotReturnOrderAddress"
Grid.Column="16"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrder_Click"
Content="非退货仓"
FontSize="12"
IsChecked="True"
Visibility="Hidden" />
</WrapPanel>
</Grid>
</Border>
</TabItem>
@@ -942,6 +997,17 @@
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button
x:Name="btnBatchRefund2"
Grid.Column="1"
Height="20"
MinWidth="48"
Margin="6,6"
Padding="4,0"
Click="btnBatchRefund_Click"
Content="批量申请买手售后"
FontSize="12"
Style="{StaticResource BasePageButtonStyle}" />
</Grid>
</Border>
</TabItem>