diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj index 2faed3e..51791c5 100644 --- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj +++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj @@ -122,15 +122,9 @@ ASPXCodeBehind - - ASPXCodeBehind - - - ASPXCodeBehind - - - ASPXCodeBehind - + + + ASPXCodeBehind @@ -143,9 +137,7 @@ ASPXCodeBehind - - ASPXCodeBehind - + ASPXCodeBehind diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs index 5d39df6..5eee5d1 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs @@ -46,21 +46,6 @@ namespace BWP.Web.Pages.B3YunKen.Reports mQueryContainer.GetControl("Stopped").Value=true; } - protected override void CreateDFBrowseGridColumns(DFBrowseGrid grid) - { - base.CreateDFBrowseGridColumns(grid); - grid.DataFilter = delegate (DFDataTable tbl) { - foreach (DFDataRow row in tbl.Rows) - { - var val = (bool)row["是否停用"]; - if (!val) - { - row["移动电话"] = ""; - } - } - }; - } - protected override void AddQueryControls(VLayoutPanel vPanel) { var layout = new LayoutManager("Main", mDFInfo, mQueryContainer); @@ -182,7 +167,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetLinkName(bill)), field.Text)); break; case "移动电话": - query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetLinkPhone(bill)), field.Text)); + query.Columns.Add(DQSelectColumn.Create(DQExpression.LogicCase(DQCondition.EQ("Stopped", true), DQExpression.SubQuery(GetLinkPhone(bill)),DQExpression.Value(string.Empty)), field.Text)); break; case "最后一次发货时间": query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetMaxLoadTime(bill)), field.Text));