diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs index 8285bc1..55ebf6b 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs @@ -22,6 +22,7 @@ using TSingSoft.WebControls2; using TSingSoft.WebControls2.DFGrids; using TSingSoft.WebPluginFramework; using BWP.B3Frameworks; +using System.Web.UI; namespace BWP.Web.Pages.B3QingDaoWanFu.Reports { @@ -184,7 +185,6 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports config.Add("Employee_ID"); config.Add("ValuationArea_ID"); config.Add("PurchaseType_ID"); - config.Add("Date"); layoutManager.Config = config; vPanel.Add(layoutManager.CreateLayout()); } @@ -247,7 +247,17 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports panel.EAdd(_checkbox); mQueryControls.Add("显示字段", _checkbox); - mQueryControls.EnableHoldLastControlNames.Add("显示字段"); + mQueryControls.EnableHoldLastControlNames.Add("显示字段"); + + queryPanel.ConditonPanel.EAdd(CreateDataRangePanel()); + } + + Control CreateDataRangePanel() + { + var hPanel = new HLayoutPanel(); + hPanel.Add(new SimpleLabel("核算日期")); + hPanel.Add(QueryCreator.DateRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate", DateTime.Today.AddDays(-1), DateTime.Today.AddDays(-1))); + return hPanel; } private int GetReportLockCol()