hb
This commit is contained in:
commit
a7f1891dd3
2 files changed
+11
-6
No files matched your search
@@ -934,6 +934,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (order == null)
|
if (order == null)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
// 过滤id
|
||||||
|
if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()))
|
||||||
|
{
|
||||||
|
if (!(";" + txtOrderId.Text.Trim().Replace(' ', ';').Replace(',', ';') + ";").Contains(";" + order.order_id + ";"))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// 其他一级过滤选项
|
||||||
|
else
|
||||||
|
{
|
||||||
if (chkHideGreenFlag.IsChecked == true && order.colour_flag == 4)
|
if (chkHideGreenFlag.IsChecked == true && order.colour_flag == 4)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
@@ -978,11 +987,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
|
else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// 过滤id
|
|
||||||
if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()) && !(";" + txtOrderId.Text.Trim().Replace(' ', ';').Replace(',', ';') + ";").Contains(";" + order.order_id + ";"))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// 过滤多子单订单
|
// 过滤多子单订单
|
||||||
if (chkNoMultiOrder.IsChecked.ParseToBool() && order.orderItems.Count() > 1)
|
if (chkNoMultiOrder.IsChecked.ParseToBool() && order.orderItems.Count() > 1)
|
||||||
{
|
{
|
||||||
@@ -1040,6 +1044,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 过滤标签页
|
// 过滤标签页
|
||||||
if (filterHeadStr.IsNullOrEmpty())
|
if (filterHeadStr.IsNullOrEmpty())
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace AllBase
|
|||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public static int VersionCount = 229;
|
public static int VersionCount = 230;
|
||||||
|
|
||||||
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||||
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
||||||
|
|||||||
Reference in new issue
Block a user