From 4ee93cf8945ddde03a610e0d02bfccf903f987a8 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 10 Mar 2018 11:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=88=86=E6=9E=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3QingDaoWanFu/Reports/ComprehensiveReport.cs  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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()