diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs index 5d66126..35f7afe 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs @@ -89,9 +89,13 @@ namespace BWP.Web.Pages.B3YunKen { private ClientPageView _pageView; private readonly DFContainer _dFContainer = new DFContainer(); - private void CustomerAcceptInfo(ClientTab titlePanel) { + private void CustomerAcceptInfo(ClientTab clinetTab) { + var titlePanel1 = new TitlePanel("基础信息"); + var titlePanel2 = new TitlePanel("验收明细"); + clinetTab.Controls.Add(titlePanel1); + clinetTab.Controls.Add(titlePanel2); var vPanel = new VLayoutPanel(); - titlePanel.Controls.Add(vPanel); + titlePanel1.EAdd(vPanel); var layoutManager = new LayoutManager("main", _dFInfo, _dFContainer); var config = new AutoLayoutConfig { Cols = 6 }; config.Add("Code"); @@ -107,11 +111,14 @@ namespace BWP.Web.Pages.B3YunKen { config.Add("Remark").ColSpan = 4; layoutManager.Config = config; _dFContainer.Readonly = true; - + var section = mPageLayoutManager.AddSection("CustomerAccept", "基本信息"); + section.ApplyLayout(layoutManager, config, mPageLayoutManager, _dFInfo); + titlePanel1.SetPageLayoutSetting(mPageLayoutManager, section.Name); var buildButton = new TSButton(); buildButton.Text = "创建客户验收单"; vPanel.Add(layoutManager.CreateLayout()); + var hPanel = vPanel.Add(new HLayoutPanel()); hPanel.Add(buildButton); @@ -150,11 +157,12 @@ namespace BWP.Web.Pages.B3YunKen { InitDmo(); _pageView.ActiveTabIndex = 0; }; - + var vPanel2 = new VLayoutPanel(); + titlePanel2.EAdd(vPanel2); var detailEditor = new DFCollectionEditor(() => Dmo.Details); detailEditor.IsEditableFunc = (field, detail) => true; detailEditor.CanSelectFunc = (detail) => true; - _detailGrid = vPanel.Add(new DFEditGrid(detailEditor) { Width = Unit.Percentage(100) }); + _detailGrid = vPanel2.Add(new DFEditGrid(detailEditor) { Width = Unit.Percentage(100) }); _detailGrid.ShowLineNo = true; _detailGrid.MultiSelectionEnabled = true; _detailGrid.Columns.Add(new DFEditGridColumn("BrandItem_Name")); @@ -182,6 +190,9 @@ namespace BWP.Web.Pages.B3YunKen { _detailGrid.ValueColumns.Add("Goods_SecondUnitRatio"); _detailGrid.ValueColumns.Add("LeftRatio"); _detailGrid.ValueColumns.Add("RightRatio"); + var section2 = mPageLayoutManager.AddSection("DetailColumns_DetailGrid", "客户验收明细列"); + section2.ApplyLayout(_grid, mPageLayoutManager, DFInfo.Get(typeof(SaleOutStore))); + titlePanel2.SetPageLayoutSetting(mPageLayoutManager, section2.Name); new MainToSecondConvertRowMangerWithMoneyChange(_detailGrid, "AcceptUnitNum", "AcceptSecondNumber", "AcceptMoney"); } @@ -249,6 +260,10 @@ namespace BWP.Web.Pages.B3YunKen { _grid.ValueColumns.Add("Order_ID"); _grid.SingleSelection += GridSingleSelection; + + var section = mPageLayoutManager.AddSection("DetailColumns_Grid", "销售出库明细列"); + section.ApplyLayout(_grid, mPageLayoutManager, DFInfo.Get(typeof(SaleOutStore))); + titlePanel.SetPageLayoutSetting(mPageLayoutManager, section.Name); } private void GridSingleSelection(object sender, DFBrowseGridItemEventArgs e) { @@ -281,7 +296,12 @@ namespace BWP.Web.Pages.B3YunKen { _detailGrid.DataBind(); } - private void CreateQueryPanel(ClientTab titlePanel) { + private void CreateQueryPanel(ClientTab clinetTab) { + var titlePanel1 = new TitlePanel("查询条件"); + + clinetTab.Controls.Add(titlePanel1); + var vPanel = new VLayoutPanel(); + titlePanel1.EAdd(vPanel); var layer = new LayoutManager("", _dFInfo, _queryContainer); //layer.Add("ID", QueryCreator.DFTextBox(_dFInfo.Fields["ID"])); layer.Add("Code", QueryCreator.DFTextBox(_dFInfo.Fields["Code"])); @@ -297,9 +317,16 @@ namespace BWP.Web.Pages.B3YunKen { storeInput.CodeArgumentReferenceTo = accInput; layer.Add("Car", QueryCreator.DFTextBox(_dFInfo.Fields["Car"])); - layer.CreateDefaultConfig(8); - titlePanel.Controls.Add(layer.CreateLayout()); - var hPanel = titlePanel.EAdd(new HLayoutPanel()); + var config = layer.CreateDefaultConfig(8); + vPanel.Add(layer.CreateLayout()); + + + + var section = mPageLayoutManager.AddSection("SaleOutStoreQuery", "查询条件"); + section.ApplyLayout(layer, config, mPageLayoutManager, _dFInfo); + titlePanel1.SetPageLayoutSetting(mPageLayoutManager, section.Name); + + var hPanel = vPanel.Add(new HLayoutPanel()); _hideFinishedBill = new DFCheckBox { Text = "隐藏已转单据", Checked = true