From 780550649c0dbc13a49badf24cc35c8159e39e33 Mon Sep 17 00:00:00 2001
From: wushukun <18860363876@163.com>
Date: Wed, 16 May 2018 10:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaleOutStore_/SaleOutStoreSimpleAnayse.cs | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs
index fc18175..4ae70b7 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs
@@ -97,8 +97,17 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
 
       base.InitForm(form);
     }
-    private ChoiceBox _goodsPropertyCatalog;
 
+    protected override void InitQueryPanel(QueryPanel queryPanel)
+    {
+      base.InitQueryPanel(queryPanel);
+
+
+      queryPanel.EAdd(new HLayoutPanel() { new SimpleLabel("显示格式"), _showTypeList });
+      mQueryControls.Add("显示格式", _showTypeList);
+    }
+    private ChoiceBox _goodsPropertyCatalog;
+    private CheckBoxList _showTypeList;
     protected override void AddQueryControls(VLayoutPanel vPanel)
     {
       var layout = new LayoutManager("Main", _mainInfo);
@@ -108,8 +117,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       layout.Add("LoadTime", QueryCreator.TimeRange(_mainInfo.Fields["LoadTime"], mQueryContainer, "MinLoadTime", "MaxLoadTime"));
 
       var state = mQueryContainer.Add(billStateInput = QueryCreator.一般单据状态(_mainInfo.Fields["BillState"], true, false, true, true), "BillState");
-      ((ChoiceBox)state).Value = 单据状态.已审核.Value.ToString() + "|";
-      state.DisplayValue = "已审核;";
+      ((ChoiceBox)state).Value = 单据状态.未审核.Value.ToString() + "|";
+      state.DisplayValue = "未审核;";
       state.EnableInputArgument = true;
       layout.Add("BillState", state);
 
@@ -122,6 +131,20 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       layout["GoodsPropertyCatalog_ID"].NotAutoAddToContainer = true;
 
 
+      _showTypeList = new CheckBoxList
+      {
+        RepeatColumns = 6,
+        RepeatDirection = RepeatDirection.Horizontal
+      };
+      _showTypeList.Items.Add(new ListItem("合并单元格")
+      {
+        Selected = true
+      });
+      layout.Add("合并单元格",new SimpleLabel("合并单元格"), _showTypeList);
+
+ 
+
+
       var config = layout.CreateDefaultConfig(4);
       config.Expand = false;
       var section = mPageLayoutManager.AddSection("查询条件", "查询条件");
@@ -173,6 +196,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
     }
     protected override DQueryDom GetQueryDom()
     {
+      mBrowseGrid.EnableRowsGroup = _showTypeList.Items.FindByText("合并单元格").Selected;
       var dom = base.GetQueryDom();
       var root = dom.From.RootSource.Alias;
       var detail = JoinAlias.Create("detail");