标签页优化

This commit is contained in:
wule committed 2026-08-24 08:19:15 +08:00
1 parent c8adf98ae5
commit a215590703
3 files changed
+88 -20

No files matched your search

@@ -890,8 +890,8 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Points="5,0 5,8 5,0" Points="5,0 5,8 5,0"
Stroke="{StaticResource mainColorBrush}" Stroke="{StaticResource mainColorBrush}"
StrokeThickness="2" /> StrokeThickness="2"
Visibility="Hidden" />
<CheckBox <CheckBox
x:Name="chkReturnOrderAddress" x:Name="chkReturnOrderAddress"
Grid.Column="15" Grid.Column="15"
@@ -900,7 +900,8 @@
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrder_Click" Click="chkEmergencyReturnOrder_Click"
Content="退货仓" Content="退货仓"
FontSize="12" /> FontSize="12"
Visibility="Hidden" />
<CheckBox <CheckBox
x:Name="chkNotReturnOrderAddress" x:Name="chkNotReturnOrderAddress"
Grid.Column="16" Grid.Column="16"
@@ -909,7 +910,37 @@
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
Click="chkEmergencyReturnOrder_Click" Click="chkEmergencyReturnOrder_Click"
Content="非退货仓" Content="非退货仓"
FontSize="12" /> FontSize="12"
IsChecked="True"
Visibility="Hidden" />
</Grid>
</Border>
</TabItem>
<TabItem
MinWidth="60"
Background="Transparent"
BorderBrush="Transparent"
Foreground="#FF9966"
Header="退货仓自动售后单"
SizeChanged="TabItem_SizeChanged">
<Border
Margin="4,0,4,4"
BorderBrush="#e0e0e0"
BorderThickness="0,0,0,1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
</Grid> </Grid>
</Border> </Border>
</TabItem> </TabItem>
@@ -1124,7 +1124,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).ToList(); var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).ToList();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + userOrderLst.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Count() + ")"; })); Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; }));
}
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); }));
if (tabItem != null)
{
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).ToList();
Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; }));
} }
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常单")); })); Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常单")); }));
if (tabItem != null) if (tabItem != null)
@@ -1150,7 +1156,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
Dispatcher.Invoke(new Action(() => Dispatcher.Invoke(new Action(() =>
{ {
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime)); GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime));
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单")) else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单"))
GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.update_time)); GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.update_time));
@@ -1184,7 +1190,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!GetOrderIsFilter(order)) if (!GetOrderIsFilter(order))
{ {
oms_wei_order_info nextOrder = null; oms_wei_order_info nextOrder = null;
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime); nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单")) else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单"))
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time); nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time);
@@ -1415,7 +1421,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
} }
if (filterHeadStr.StartsWith("需处理售后单")) if (filterHeadStr.StartsWith("需处理售后单"))
{ {
if (!order.IsEmergency) if (!order.IsEmergencyManualReturnOrder)
return true; return true;
if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后"))) if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
@@ -1432,12 +1438,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
else if (chkEmergencyShopCustomRefundNoWaybill.IsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty())) else if (chkEmergencyShopCustomRefundNoWaybill.IsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty()))
return true; return true;
// 退货仓 //// 退货仓
if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress)) //if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
return true; // return true;
// 非退货仓 //// 非退货仓
else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)) //else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
return true; // return true;
// 退款完成 // 退款完成
if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成") if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成")
@@ -1453,6 +1459,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
else if (chkEmergencyRefund.IsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND")) else if (chkEmergencyRefund.IsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND"))
return true; return true;
} }
if (filterHeadStr.StartsWith("退货仓自动售后单"))
{
if (!order.IsEmergencyDistribReturnOrder)
return true;
}
if (filterHeadStr.StartsWith("售后完成单")) if (filterHeadStr.StartsWith("售后完成单"))
{ {
if (!order.IsRefund) if (!order.IsRefund)
+32 -6
View File
@@ -174,11 +174,37 @@ namespace AllBase.Model.DBModel
return false; return false;
} }
set { } set { }
} }
/// <summary>
/// 异常单(买手异常退货) public bool IsEmergencyDistribReturnOrder
/// </summary> {
public bool isAbnormal get
{
return IsEmergency && IsDistribReturnOrder;
}
set { }
}
public bool IsEmergencyManualReturnOrder
{
get
{
return IsEmergency && !IsDistribReturnOrder;
}
set { }
}
public bool IsDistribReturnOrder
{
get
{
return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
}
set { }
}
/// <summary>
/// 异常单(买手异常退货)
/// </summary>
public bool isAbnormal
{ {
get get
{ {
@@ -281,7 +307,7 @@ namespace AllBase.Model.DBModel
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成")) else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
return "退款完成"; return "退款完成";
// 用户取消申请 // 用户取消申请
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) && else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty())) this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr; return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
if (this.status == 20 || this.status == 21) if (this.status == 20 || this.status == 21)