标签页优化
This commit is contained in:
1 parent
c8adf98ae5
commit
a215590703
3 files changed
+88
-20
No files matched your search
@@ -1124,7 +1124,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (tabItem != null)
|
||||
{
|
||||
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("异常单")); }));
|
||||
if (tabItem != null)
|
||||
@@ -1150,7 +1156,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
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));
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单"))
|
||||
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))
|
||||
{
|
||||
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);
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time);
|
||||
@@ -1415,7 +1421,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
if (filterHeadStr.StartsWith("需处理售后单"))
|
||||
{
|
||||
if (!order.IsEmergency)
|
||||
if (!order.IsEmergencyManualReturnOrder)
|
||||
return true;
|
||||
|
||||
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()))
|
||||
return true;
|
||||
|
||||
// 退货仓
|
||||
if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
|
||||
return true;
|
||||
// 非退货仓
|
||||
else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
||||
return true;
|
||||
//// 退货仓
|
||||
//if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
|
||||
// return true;
|
||||
//// 非退货仓
|
||||
//else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
||||
// return true;
|
||||
|
||||
// 退款完成
|
||||
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"))
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("退货仓自动售后单"))
|
||||
{
|
||||
if (!order.IsEmergencyDistribReturnOrder)
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("售后完成单"))
|
||||
{
|
||||
if (!order.IsRefund)
|
||||
|
||||
Reference in new issue
Block a user