From a906f71640d9ba5cd9f8d689a51de3a557d8bbff Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 14 三月 2025 17:37:10 +0800
Subject: [PATCH] 完善成套设备界面问题
---
WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs | 21 ++
WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs | 18
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.resx | 44 ++++
WinFrmUI/PBS.WinFrmUI.WE/PBS.WinFrmUI.WE.csproj | 2
WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.cs | 4
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.designer.cs | 0
WinFrmUI/PBS.WinFrmUI/02-facility/EditFacilityDlg.Designer.cs | 18
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.resx | 0
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs | 17 +
WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs | 225 ++++++++++++----------
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.cs | 49 ++++
WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs | 7
WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs | 145 ++++++++++---
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs | 19 +
14 files changed, 395 insertions(+), 174 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/PBS.WinFrmUI.WE.csproj b/WinFrmUI/PBS.WinFrmUI.WE/PBS.WinFrmUI.WE.csproj
index ba4f69b..5f2bc1d 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/PBS.WinFrmUI.WE.csproj
+++ b/WinFrmUI/PBS.WinFrmUI.WE/PBS.WinFrmUI.WE.csproj
@@ -51,7 +51,7 @@
<Compile Update="WaterWE\01-catalogue\CatalogueCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="WaterWE\EditWaterUtensilDlg.cs">
+ <Compile Update="WaterWE\EditWaterWEDlg.cs">
<SubType>Form</SubType>
</Compile>
</ItemGroup>
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.cs
similarity index 72%
rename from WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.cs
rename to WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.cs
index 9e29467..b002bc8 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.cs
@@ -18,13 +18,6 @@
/// </summary>
public event Func<PBS.Vmo.WE.ItemVmo, PBS.Vmo.WE.CatalogueMappingVmo, List<PBS.Vmo.WE.UtensilMappingVmo>, Task<bool>> ReloadDataEvent;
- private PBS.BLL.WE.Item _Bll = new PBS.BLL.WE.Item();
-
- /// <summary>
- /// 楠岃瘉璇嗗埆鐮佹槸鍚﹀瓨鍦ㄤ簨浠�
- /// </summary>
- // public event Func<string, bool> VerifyTagNameExistEvent;
-
private List<ItemViewModel> _allBindingList;
private PBS.Vmo.WE.ItemVmo _model = null;
@@ -32,6 +25,37 @@
private List<PBS.Vmo.WE.UtensilVmo> _allUtensilList = null;
private PBS.Vmo.WE.CatalogueMappingVmo _CatalogueMappingVmo;
+
+ //璇︾粏淇℃伅鏂规硶
+ public async void SetInfoDisplay(ItemViewModel itemView)
+ {
+ _allBindingList = new List<ItemViewModel>();
+ _allUtensilList = await new PBS.BLL.WE.Utensil().GetAll();
+ this.repositoryItemTreeListLookUpEdit1.DataSource = _allUtensilList;
+ var allUtensilList = await new PBS.BLL.WE.UtensilMapping().GetByItemID(itemView.ID);
+ if (allUtensilList != null)
+ {
+ foreach (var utensil in allUtensilList)
+ {
+ var model = new ItemViewModel();
+ model.UtensilID = utensil.UtensilID;
+ model.UtensilCount = utensil.UtensilCount;
+ model.RatedFlow = utensil.RatedFlow;
+ model.MinRatedFlow = utensil.MinRatedFlow;
+ _allBindingList.Add(model);
+ }
+ }
+
+ this.itemViewModelBindingSource.DataSource = _allBindingList;
+ this.textEditName.EditValue = itemView.Name;
+ this.Text = "璇︾粏淇℃伅";
+ this.ColDelete.Visible = false;
+ this.textEditName.Properties.ReadOnly = true;
+ this.gridView1.SetNormalView();
+ this.layoutControlItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ this.emptySpaceItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ this.layoutControlItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
/// <summary>
/// 缁戝畾
@@ -48,6 +72,7 @@
}
else
{
+ //涓虹紪杈戝仛鍑嗗
_model = item;
var allUtensilList = await new PBS.BLL.WE.UtensilMapping().GetByItemID(item.ID);
if (allUtensilList != null)
@@ -55,6 +80,7 @@
foreach (var utensil in allUtensilList)
{
var model = new ItemViewModel();
+
model.UtensilID = utensil.UtensilID;
model.UtensilCount = utensil.UtensilCount;
model.RatedFlow = utensil.RatedFlow;
@@ -84,6 +110,11 @@
{
if (!Valid())
return;
+ if (_allBindingList == null || _allBindingList.Count < 1)
+ {
+ TipFormHelper.ShowError("璇疯緭鍏ョ敤姘村櫒鍏锋暟鎹紒");
+ return;
+ }
if (_model == null)
{
_model = new PBS.Vmo.WE.ItemVmo();
@@ -107,10 +138,10 @@
return;
if (!await this.ReloadDataEvent(_model, _CatalogueMappingVmo, mappingList))
{
- MessageBoxHelper.ShowError("淇敼澶辫触锛�");
+ MessageBoxHelper.ShowError("璁剧疆澶辫触锛�");
return;
}
- MessageBoxHelper.ShowSuccess("淇敼鎴愬姛锛�");
+ MessageBoxHelper.ShowSuccess("璁剧疆鎴愬姛锛�");
this.DialogResult = System.Windows.Forms.DialogResult.OK;
this.Close();
}
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.designer.cs
similarity index 100%
rename from WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs
rename to WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.designer.cs
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.resx b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.resx
similarity index 100%
rename from WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.resx
rename to WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.resx
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs
index 002b0f4..b68e62b 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs
@@ -100,16 +100,18 @@
PBS.Vmo.WE.ItemVmo itemVmo = null;
if (model != null)
{
- // itemVmo = await new PBS.BLL.WE.Item().GetByID(model.ItemID);
+ //itemVmo = await new PBS.BLL.WE.Item().GetByID(model);
}
dlg.SetBindingData(itemVmo, catalogueID);
dlg.ReloadDataEvent += async (item, catalogue, mappingList) =>
{
+ //鐜板湪榛樿鍙兘澧炲姞锛屼笉鑳界紪杈�
if (itemVmo == null)
{
var id = await _bll.Insert(item);
if (id > 0)
{
+ item.ID = id;
catalogue.ItemID = id;
var cataID = await new PBS.BLL.WE.CatalogueMapping().Insert(catalogue);
if (cataID > 0)
@@ -182,5 +184,20 @@
}
else MessageBoxHelper.ShowError($"鍒犻櫎澶辫触!");
}
+
+ //璇︾粏淇℃伅
+ private void BtnInfo_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
+ if (vm == null)
+ {
+ TipFormHelper.ShowWarn("璇疯緭鍏ユ暟鎹锛�");
+ return;
+ }
+
+ var dlg = new EditWaterWEDlg();
+ dlg.SetInfoDisplay(vm);
+ dlg.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs
index 432a08e..0c27e7f 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs
@@ -48,6 +48,7 @@
barCekSearch = new DevExpress.XtraBars.BarCheckItem();
barBtnSetting = new DevExpress.XtraBars.BarButtonItem();
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
+ BtnInfo = new DevExpress.XtraBars.BarButtonItem();
ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
@@ -155,10 +156,10 @@
ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnRefresh, barCekSearch, barBtnSetting, BtnDelete });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnRefresh, barCekSearch, barBtnSetting, BtnDelete, BtnInfo });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.Margin = new Padding(3, 4, 3, 4);
- ribbonControl1.MaxItemId = 32;
+ ribbonControl1.MaxItemId = 33;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
@@ -196,8 +197,18 @@
//
BtnDelete.Caption = "鍒犻櫎";
BtnDelete.Id = 31;
+ BtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDelete.ImageOptions.SvgImage");
BtnDelete.Name = "BtnDelete";
BtnDelete.ItemClick += barBtnDelete_ItemClick;
+ //
+ // BtnInfo
+ //
+ BtnInfo.Caption = "璇︾粏淇℃伅";
+ BtnInfo.Id = 32;
+ BtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnInfo.ImageOptions.SvgImage");
+ BtnInfo.Name = "BtnInfo";
+ BtnInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ BtnInfo.ItemClick += BtnInfo_ItemClick;
//
// ribbonPage
//
@@ -211,6 +222,7 @@
ribbonPageGroup1.ItemLinks.Add(barCekSearch);
ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
ribbonPageGroup1.ItemLinks.Add(BtnDelete);
+ ribbonPageGroup1.ItemLinks.Add(BtnInfo);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "鍩虹";
//
@@ -324,5 +336,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnAdd;
private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.BarButtonItem BtnDelete;
+ private DevExpress.XtraBars.BarButtonItem BtnInfo;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.resx b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.resx
index 3618e73..c48d1db 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.resx
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.resx
@@ -194,6 +194,50 @@
NCwyNnoiIGNsYXNzPSJCbHVlIiAvPg0KPC9zdmc+Cw==
</value>
</data>
+ <data name="BtnDelete.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJIDAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
+ MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
+ bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4NCiAgICA8cGF0aCBk
+ PSJNMTguOCwxNmw4LjktOC45YzAuNC0wLjQsMC40LTEsMC0xLjRsLTEuNC0xLjRjLTAuNC0wLjQtMS0w
+ LjQtMS40LDBMMTYsMTMuMkw3LjEsNC4zYy0wLjQtMC40LTEtMC40LTEuNCwwICAgTDQuMyw1LjdjLTAu
+ NCwwLjQtMC40LDEsMCwxLjRsOC45LDguOWwtOC45LDguOWMtMC40LDAuNC0wLjQsMSwwLDEuNGwxLjQs
+ MS40YzAuNCwwLjQsMSwwLjQsMS40LDBsOC45LTguOWw4LjksOC45ICAgYzAuNCwwLjQsMSwwLjQsMS40
+ LDBsMS40LTEuNGMwLjQtMC40LDAuNC0xLDAtMS40TDE4LjgsMTZ6IiBjbGFzcz0iUmVkIiAvPg0KICA8
+ L2c+DQo8L3N2Zz4L
+</value>
+ </data>
+ <data name="BtnInfo.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
+ MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
+ bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9
+ Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs
+ MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs
+ NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
+ PC9nPg0KPC9zdmc+Cw==
+</value>
+ </data>
<metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs b/WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs
index c12415b..ba872d8 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs
@@ -40,6 +40,7 @@
memoEdit1 = new DevExpress.XtraEditors.MemoEdit();
txtEditRegion = new DevExpress.XtraEditors.TreeListLookUpEdit();
treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
+ treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -49,6 +50,7 @@
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ treeListColumn2 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
@@ -182,11 +184,20 @@
//
// treeListLookUpEdit1TreeList
//
+ treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1, treeListColumn2 });
treeListLookUpEdit1TreeList.Location = new Point(0, 0);
treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
treeListLookUpEdit1TreeList.Size = new Size(400, 200);
treeListLookUpEdit1TreeList.TabIndex = 0;
+ //
+ // treeListColumn1
+ //
+ treeListColumn1.Caption = "鍚嶇О";
+ treeListColumn1.FieldName = "Name";
+ treeListColumn1.Name = "treeListColumn1";
+ treeListColumn1.Visible = true;
+ treeListColumn1.VisibleIndex = 0;
//
// layoutControlItem1
//
@@ -260,6 +271,14 @@
//
dxErrorProvider1.ContainerControl = this;
//
+ // treeListColumn2
+ //
+ treeListColumn2.Caption = "绫诲瀷";
+ treeListColumn2.FieldName = "Type";
+ treeListColumn2.Name = "treeListColumn2";
+ treeListColumn2.Visible = true;
+ treeListColumn2.VisibleIndex = 1;
+ //
// AddPlaceDlg
//
AutoScaleDimensions = new SizeF(8F, 18F);
@@ -315,5 +334,7 @@
private DevExpress.XtraEditors.TreeListLookUpEdit txtEditRegion;
private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn2;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs b/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs
index 75a024d..1743d90 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs
@@ -38,9 +38,6 @@
panelControl1 = new DevExpress.XtraEditors.PanelControl();
textEditAddress = new DevExpress.XtraEditors.TextEdit();
memoEdit1 = new DevExpress.XtraEditors.MemoEdit();
- txtEditRegion = new DevExpress.XtraEditors.TreeListLookUpEdit();
- treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -49,6 +46,11 @@
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ txtEditRegion = new DevExpress.XtraEditors.TreeListLookUpEdit();
+ treeList1 = new DevExpress.XtraTreeList.TreeList();
+ treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ treeListColumn2 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
@@ -58,9 +60,6 @@
((System.ComponentModel.ISupportInitialize)panelControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditAddress.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)memoEdit1.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
@@ -69,6 +68,9 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
SuspendLayout();
//
// Root
@@ -77,17 +79,17 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, layoutControlItem1, tabbedControlGroup1, layoutControlItem3 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, tabbedControlGroup1, layoutControlItem3, layoutControlItem5 });
Root.Name = "Root";
- Root.Size = new Size(811, 539);
+ Root.Size = new Size(816, 443);
Root.TextVisible = false;
//
// layoutControlItem7
//
layoutControlItem7.Control = generalOkAndCancelCtrl1;
- layoutControlItem7.Location = new Point(0, 482);
+ layoutControlItem7.Location = new Point(0, 386);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(791, 37);
+ layoutControlItem7.Size = new Size(796, 37);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
@@ -97,11 +99,11 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(114, 33);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(131, 42);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(114, 33);
- generalOkAndCancelCtrl1.Location = new Point(12, 494);
+ generalOkAndCancelCtrl1.Location = new Point(12, 398);
generalOkAndCancelCtrl1.Margin = new Padding(3, 5, 3, 5);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(787, 33);
- generalOkAndCancelCtrl1.TabIndex = 6;
+ generalOkAndCancelCtrl1.Size = new Size(792, 33);
+ generalOkAndCancelCtrl1.TabIndex = 5;
//
// layoutControlItem8
//
@@ -109,7 +111,7 @@
layoutControlItem8.Control = txtEditName;
layoutControlItem8.Location = new Point(0, 0);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(791, 28);
+ layoutControlItem8.Size = new Size(796, 28);
layoutControlItem8.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem8.TextSize = new Size(65, 18);
//
@@ -118,25 +120,25 @@
txtEditName.Location = new Point(89, 12);
txtEditName.Margin = new Padding(3, 4, 3, 4);
txtEditName.Name = "txtEditName";
- txtEditName.Size = new Size(710, 24);
+ txtEditName.Size = new Size(715, 24);
txtEditName.StyleController = layoutControl1;
txtEditName.TabIndex = 0;
//
// layoutControl1
//
+ layoutControl1.Controls.Add(txtEditRegion);
layoutControl1.Controls.Add(panelControl1);
layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Controls.Add(txtEditName);
layoutControl1.Controls.Add(textEditAddress);
layoutControl1.Controls.Add(memoEdit1);
- layoutControl1.Controls.Add(txtEditRegion);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Margin = new Padding(3, 4, 3, 4);
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(811, 539);
+ layoutControl1.Size = new Size(816, 443);
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
@@ -145,7 +147,7 @@
panelControl1.Location = new Point(15, 129);
panelControl1.Margin = new Padding(3, 4, 3, 4);
panelControl1.Name = "panelControl1";
- panelControl1.Size = new Size(781, 358);
+ panelControl1.Size = new Size(786, 262);
panelControl1.TabIndex = 1;
//
// textEditAddress
@@ -153,7 +155,7 @@
textEditAddress.Location = new Point(89, 68);
textEditAddress.Margin = new Padding(3, 4, 3, 4);
textEditAddress.Name = "textEditAddress";
- textEditAddress.Size = new Size(710, 24);
+ textEditAddress.Size = new Size(715, 24);
textEditAddress.StyleController = layoutControl1;
textEditAddress.TabIndex = 3;
//
@@ -162,9 +164,72 @@
memoEdit1.Location = new Point(92, 129);
memoEdit1.Margin = new Padding(3, 4, 3, 4);
memoEdit1.Name = "memoEdit1";
- memoEdit1.Size = new Size(704, 358);
+ memoEdit1.Size = new Size(709, 262);
memoEdit1.StyleController = layoutControl1;
- memoEdit1.TabIndex = 5;
+ memoEdit1.TabIndex = 1;
+ //
+ // tabbedControlGroup1
+ //
+ tabbedControlGroup1.Location = new Point(0, 84);
+ tabbedControlGroup1.Name = "tabbedControlGroup1";
+ tabbedControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
+ tabbedControlGroup1.Size = new Size(796, 302);
+ tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup3 });
+ //
+ // layoutControlGroup1
+ //
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
+ layoutControlGroup1.Location = new Point(0, 0);
+ layoutControlGroup1.Name = "layoutControlGroup1";
+ layoutControlGroup1.Size = new Size(790, 266);
+ layoutControlGroup1.Text = "灞炴��";
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.Control = panelControl1;
+ layoutControlItem2.Location = new Point(0, 0);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(790, 266);
+ layoutControlItem2.TextSize = new Size(0, 0);
+ layoutControlItem2.TextVisible = false;
+ //
+ // layoutControlGroup2
+ //
+ layoutControlGroup2.Location = new Point(0, 0);
+ layoutControlGroup2.Name = "layoutControlGroup2";
+ layoutControlGroup2.Size = new Size(790, 266);
+ layoutControlGroup2.Text = "鍦板浘";
+ //
+ // layoutControlGroup3
+ //
+ layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4 });
+ layoutControlGroup3.Location = new Point(0, 0);
+ layoutControlGroup3.Name = "layoutControlGroup3";
+ layoutControlGroup3.Size = new Size(790, 266);
+ layoutControlGroup3.Text = "璇存槑";
+ //
+ // layoutControlItem4
+ //
+ layoutControlItem4.Control = memoEdit1;
+ layoutControlItem4.Location = new Point(0, 0);
+ layoutControlItem4.Name = "layoutControlItem4";
+ layoutControlItem4.Size = new Size(790, 266);
+ layoutControlItem4.Text = "璇存槑";
+ layoutControlItem4.TextSize = new Size(65, 18);
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = textEditAddress;
+ layoutControlItem3.Location = new Point(0, 56);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(796, 28);
+ layoutControlItem3.Text = "璇︾粏鍦板潃:";
+ layoutControlItem3.TextSize = new Size(65, 18);
+ //
+ // dxErrorProvider1
+ //
+ dxErrorProvider1.ContainerControl = this;
//
// txtEditRegion
//
@@ -174,97 +239,51 @@
txtEditRegion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
txtEditRegion.Properties.DisplayMember = "Name";
txtEditRegion.Properties.NullText = "";
- txtEditRegion.Properties.TreeList = treeListLookUpEdit1TreeList;
+ txtEditRegion.Properties.TreeList = treeList1;
txtEditRegion.Properties.ValueMember = "ID";
- txtEditRegion.Size = new Size(710, 24);
+ txtEditRegion.Size = new Size(715, 24);
txtEditRegion.StyleController = layoutControl1;
txtEditRegion.TabIndex = 2;
//
- // treeListLookUpEdit1TreeList
+ // treeList1
//
- treeListLookUpEdit1TreeList.Location = new Point(0, 0);
- treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
- treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
- treeListLookUpEdit1TreeList.Size = new Size(400, 200);
- treeListLookUpEdit1TreeList.TabIndex = 0;
+ treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1, treeListColumn2 });
+ treeList1.Location = new Point(6, 6);
+ treeList1.Name = "treeList1";
+ treeList1.OptionsView.ShowIndentAsRowStyle = true;
+ treeList1.Size = new Size(400, 200);
+ treeList1.TabIndex = 0;
//
- // layoutControlItem1
+ // treeListColumn1
//
- layoutControlItem1.Control = txtEditRegion;
- layoutControlItem1.Location = new Point(0, 28);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(791, 28);
- layoutControlItem1.Text = "鍦板尯:";
- layoutControlItem1.TextSize = new Size(65, 18);
+ treeListColumn1.Caption = "鍚嶇О";
+ treeListColumn1.FieldName = "Name";
+ treeListColumn1.Name = "treeListColumn1";
+ treeListColumn1.Visible = true;
+ treeListColumn1.VisibleIndex = 0;
//
- // tabbedControlGroup1
+ // layoutControlItem5
//
- tabbedControlGroup1.Location = new Point(0, 84);
- tabbedControlGroup1.Name = "tabbedControlGroup1";
- tabbedControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(791, 398);
- tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup3 });
+ layoutControlItem5.Control = txtEditRegion;
+ layoutControlItem5.Location = new Point(0, 28);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(796, 28);
+ layoutControlItem5.Text = "鍦板尯:";
+ layoutControlItem5.TextSize = new Size(65, 18);
//
- // layoutControlGroup1
+ // treeListColumn2
//
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
- layoutControlGroup1.Location = new Point(0, 0);
- layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(785, 362);
- layoutControlGroup1.Text = "灞炴��";
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = panelControl1;
- layoutControlItem2.Location = new Point(0, 0);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(785, 362);
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
- //
- // layoutControlGroup2
- //
- layoutControlGroup2.Location = new Point(0, 0);
- layoutControlGroup2.Name = "layoutControlGroup2";
- layoutControlGroup2.Size = new Size(785, 362);
- layoutControlGroup2.Text = "鍦板浘";
- //
- // layoutControlGroup3
- //
- layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4 });
- layoutControlGroup3.Location = new Point(0, 0);
- layoutControlGroup3.Name = "layoutControlGroup3";
- layoutControlGroup3.Size = new Size(785, 362);
- layoutControlGroup3.Text = "璇存槑";
- //
- // layoutControlItem4
- //
- layoutControlItem4.Control = memoEdit1;
- layoutControlItem4.Location = new Point(0, 0);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(785, 362);
- layoutControlItem4.Text = "璇存槑";
- layoutControlItem4.TextSize = new Size(65, 18);
- //
- // layoutControlItem3
- //
- layoutControlItem3.Control = textEditAddress;
- layoutControlItem3.Location = new Point(0, 56);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(791, 28);
- layoutControlItem3.Text = "璇︾粏鍦板潃:";
- layoutControlItem3.TextSize = new Size(65, 18);
- //
- // dxErrorProvider1
- //
- dxErrorProvider1.ContainerControl = this;
+ treeListColumn2.Caption = "绫诲瀷";
+ treeListColumn2.FieldName = "Type";
+ treeListColumn2.Name = "treeListColumn2";
+ treeListColumn2.Visible = true;
+ treeListColumn2.VisibleIndex = 1;
//
// EditPlaceDlg
//
AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(811, 539);
+ ClientSize = new Size(816, 443);
Controls.Add(layoutControl1);
Margin = new Padding(3, 4, 3, 4);
Name = "EditPlaceDlg";
@@ -279,9 +298,6 @@
((System.ComponentModel.ISupportInitialize)panelControl1).EndInit();
((System.ComponentModel.ISupportInitialize)textEditAddress.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)memoEdit1.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
@@ -290,6 +306,9 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
ResumeLayout(false);
}
@@ -301,7 +320,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraEditors.TextEdit txtEditName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.TextEdit textEditAddress;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
@@ -312,8 +330,11 @@
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.TreeListLookUpEdit txtEditRegion;
- private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private DevExpress.XtraEditors.TreeListLookUpEdit txtEditRegion;
+ private DevExpress.XtraTreeList.TreeList treeList1;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn2;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.cs b/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.cs
index 9209fa1..ee3569f 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.cs
@@ -30,11 +30,11 @@
{
_placeVmo = placeVmo;
var list = await new Yw.BLL.Division().GetAll();
- this.treeListLookUpEdit1TreeList.DataSource = list;
+ this.treeList1.DataSource = list;
this.txtEditName.EditValue = _placeVmo.Name;
this.txtEditRegion.EditValue = _placeVmo.RegionID;
this.textEditAddress.EditValue = _placeVmo.Address;
- switch (_placeVmo.PlaceType)
+ switch (_placeVmo.PlaceType)
{
case ePlaceType.Build:
_buildWizard = new BuildWizardForm();
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
index d03d25e..e686fac 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
@@ -30,6 +30,9 @@
{
components = new System.ComponentModel.Container();
FacilitiesWizardFormlayoutControl1ConvertedLayout = new DevExpress.XtraLayout.LayoutControl();
+ txtEditRegion = new DevExpress.XtraEditors.TreeListLookUpEdit();
+ treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
+ treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
txtFloorHeight = new DevExpress.XtraEditors.TextEdit();
txtFloor = new DevExpress.XtraEditors.TextEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
@@ -45,15 +48,19 @@
comboBoxCompletePlantitem = new DevExpress.XtraLayout.LayoutControlItem();
txtNameitem = new DevExpress.XtraLayout.LayoutControlItem();
comboBoxWaterSupplyitem = new DevExpress.XtraLayout.LayoutControlItem();
- txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
txtWaterHeightitem = new DevExpress.XtraLayout.LayoutControlItem();
txtFloorHeightitem = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ treeListColumn2 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).BeginInit();
FacilitiesWizardFormlayoutControl1ConvertedLayout.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit();
((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtFloor.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtName.Properties).BeginInit();
@@ -69,17 +76,19 @@
((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).BeginInit();
((System.ComponentModel.ISupportInitialize)txtNameitem).BeginInit();
((System.ComponentModel.ISupportInitialize)comboBoxWaterSupplyitem).BeginInit();
- ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)txtWaterHeightitem).BeginInit();
((System.ComponentModel.ISupportInitialize)txtFloorHeightitem).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// FacilitiesWizardFormlayoutControl1ConvertedLayout
//
+ FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtEditRegion);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHeight);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloor);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtName);
@@ -99,6 +108,38 @@
FacilitiesWizardFormlayoutControl1ConvertedLayout.Size = new Size(889, 396);
FacilitiesWizardFormlayoutControl1ConvertedLayout.TabIndex = 146;
//
+ // txtEditRegion
+ //
+ txtEditRegion.Location = new Point(592, 12);
+ txtEditRegion.Margin = new Padding(3, 4, 3, 4);
+ txtEditRegion.MinimumSize = new Size(0, 36);
+ txtEditRegion.Name = "txtEditRegion";
+ txtEditRegion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ txtEditRegion.Properties.DisplayMember = "Name";
+ txtEditRegion.Properties.NullText = "";
+ txtEditRegion.Properties.TreeList = treeListLookUpEdit1TreeList;
+ txtEditRegion.Properties.ValueMember = "ID";
+ txtEditRegion.Size = new Size(285, 36);
+ txtEditRegion.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
+ txtEditRegion.TabIndex = 2;
+ //
+ // treeListLookUpEdit1TreeList
+ //
+ treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1, treeListColumn2 });
+ treeListLookUpEdit1TreeList.Location = new Point(45, 98);
+ treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
+ treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
+ treeListLookUpEdit1TreeList.Size = new Size(400, 200);
+ treeListLookUpEdit1TreeList.TabIndex = 0;
+ //
+ // treeListColumn1
+ //
+ treeListColumn1.Caption = "鍚嶇О";
+ treeListColumn1.FieldName = "Name";
+ treeListColumn1.Name = "treeListColumn1";
+ treeListColumn1.Visible = true;
+ treeListColumn1.VisibleIndex = 0;
+ //
// txtFloorHeight
//
txtFloorHeight.Location = new Point(592, 132);
@@ -108,7 +149,7 @@
txtFloorHeight.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
txtFloorHeight.Size = new Size(285, 36);
txtFloorHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- txtFloorHeight.TabIndex = 10;
+ txtFloorHeight.TabIndex = 8;
//
// txtFloor
//
@@ -119,7 +160,7 @@
txtFloor.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
txtFloor.Size = new Size(284, 36);
txtFloor.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- txtFloor.TabIndex = 7;
+ txtFloor.TabIndex = 5;
//
// txtName
//
@@ -133,13 +174,13 @@
//
// txtWaterPressure
//
- txtWaterPressure.Location = new Point(592, 12);
+ txtWaterPressure.Location = new Point(158, 172);
txtWaterPressure.Margin = new Padding(2, 3, 2, 3);
txtWaterPressure.MinimumSize = new Size(0, 36);
txtWaterPressure.Name = "txtWaterPressure";
- txtWaterPressure.Size = new Size(285, 36);
+ txtWaterPressure.Size = new Size(284, 36);
txtWaterPressure.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- txtWaterPressure.TabIndex = 2;
+ txtWaterPressure.TabIndex = 9;
//
// txtMaxWaterDemand
//
@@ -162,7 +203,7 @@
comboBoxWaterSupply.Properties.NullText = "璇烽�夋嫨";
comboBoxWaterSupply.Size = new Size(284, 36);
comboBoxWaterSupply.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- comboBoxWaterSupply.TabIndex = 4;
+ comboBoxWaterSupply.TabIndex = 3;
//
// comboBoxCompletePlant
//
@@ -174,7 +215,7 @@
comboBoxCompletePlant.Properties.NullText = "璇烽�夋嫨";
comboBoxCompletePlant.Size = new Size(284, 36);
comboBoxCompletePlant.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- comboBoxCompletePlant.TabIndex = 9;
+ comboBoxCompletePlant.TabIndex = 7;
//
// txtFloorHouseHolds
//
@@ -184,11 +225,11 @@
txtFloorHouseHolds.Name = "txtFloorHouseHolds";
txtFloorHouseHolds.Size = new Size(285, 36);
txtFloorHouseHolds.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- txtFloorHouseHolds.TabIndex = 5;
+ txtFloorHouseHolds.TabIndex = 4;
//
// txtConstantP
//
- txtConstantP.Location = new Point(158, 172);
+ txtConstantP.Location = new Point(158, 212);
txtConstantP.MinimumSize = new Size(0, 36);
txtConstantP.Name = "txtConstantP";
txtConstantP.Size = new Size(284, 36);
@@ -203,7 +244,7 @@
textEditWaterModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
textEditWaterModel.Size = new Size(285, 36);
textEditWaterModel.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
- textEditWaterModel.TabIndex = 13;
+ textEditWaterModel.TabIndex = 10;
//
// layoutControlGroup1
//
@@ -211,7 +252,7 @@
layoutControlGroup1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
layoutControlGroup1.GroupBordersVisible = false;
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterPressureitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7 });
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem });
layoutControlGroup1.Name = "Root";
layoutControlGroup1.Size = new Size(889, 396);
layoutControlGroup1.TextVisible = false;
@@ -261,26 +302,6 @@
comboBoxWaterSupplyitem.TextLocation = DevExpress.Utils.Locations.Left;
comboBoxWaterSupplyitem.TextSize = new Size(134, 18);
//
- // txtWaterPressureitem
- //
- txtWaterPressureitem.AllowHtmlStringInCaption = true;
- txtWaterPressureitem.Control = txtWaterPressure;
- txtWaterPressureitem.Location = new Point(434, 0);
- txtWaterPressureitem.Name = "txtWaterPressureitem";
- txtWaterPressureitem.Size = new Size(435, 40);
- txtWaterPressureitem.Text = "<color=red>*</color>鏈鍘嬪姏(m):";
- txtWaterPressureitem.TextLocation = DevExpress.Utils.Locations.Left;
- txtWaterPressureitem.TextSize = new Size(134, 18);
- //
- // layoutControlItem7
- //
- layoutControlItem7.Control = textEditWaterModel;
- layoutControlItem7.Location = new Point(434, 160);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(435, 216);
- layoutControlItem7.Text = "渚涙按妯″紡:";
- layoutControlItem7.TextSize = new Size(134, 18);
- //
// txtWaterHeightitem
//
txtWaterHeightitem.AllowHtmlStringInCaption = true;
@@ -307,9 +328,9 @@
//
layoutControlItem6.AllowHtmlStringInCaption = true;
layoutControlItem6.Control = txtConstantP;
- layoutControlItem6.Location = new Point(0, 160);
+ layoutControlItem6.Location = new Point(0, 200);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(434, 216);
+ layoutControlItem6.Size = new Size(434, 176);
layoutControlItem6.Text = "<color=red>*</color>鎭掑畾鍘嬪姏:";
layoutControlItem6.TextSize = new Size(134, 18);
//
@@ -324,9 +345,47 @@
layoutControlItem5.Text = "<color=red>*</color>鎴锋暟:";
layoutControlItem5.TextSize = new Size(134, 18);
//
+ // layoutControlItem7
+ //
+ layoutControlItem7.Control = textEditWaterModel;
+ layoutControlItem7.Location = new Point(434, 160);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(435, 216);
+ layoutControlItem7.Text = "渚涙按妯″紡:";
+ layoutControlItem7.TextSize = new Size(134, 18);
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.AllowHtmlStringInCaption = true;
+ layoutControlItem2.Control = txtEditRegion;
+ layoutControlItem2.Location = new Point(434, 0);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(435, 40);
+ layoutControlItem2.Text = "<color=red>*</color>鍦板尯:";
+ layoutControlItem2.TextSize = new Size(134, 18);
+ //
+ // txtWaterPressureitem
+ //
+ txtWaterPressureitem.AllowHtmlStringInCaption = true;
+ txtWaterPressureitem.Control = txtWaterPressure;
+ txtWaterPressureitem.Location = new Point(0, 160);
+ txtWaterPressureitem.Name = "txtWaterPressureitem";
+ txtWaterPressureitem.Size = new Size(434, 40);
+ txtWaterPressureitem.Text = "<color=red>*</color>鏈鍘嬪姏(m):";
+ txtWaterPressureitem.TextLocation = DevExpress.Utils.Locations.Left;
+ txtWaterPressureitem.TextSize = new Size(134, 18);
+ //
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
+ //
+ // treeListColumn2
+ //
+ treeListColumn2.Caption = "绫诲瀷";
+ treeListColumn2.FieldName = "Type";
+ treeListColumn2.Name = "treeListColumn2";
+ treeListColumn2.Visible = true;
+ treeListColumn2.VisibleIndex = 1;
//
// FacilitiesCtrl
//
@@ -338,6 +397,8 @@
Size = new Size(889, 396);
((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).EndInit();
FacilitiesWizardFormlayoutControl1ConvertedLayout.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtFloor.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtName.Properties).EndInit();
@@ -353,12 +414,13 @@
((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).EndInit();
((System.ComponentModel.ISupportInitialize)txtNameitem).EndInit();
((System.ComponentModel.ISupportInitialize)comboBoxWaterSupplyitem).EndInit();
- ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)txtWaterHeightitem).EndInit();
((System.ComponentModel.ISupportInitialize)txtFloorHeightitem).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
@@ -393,5 +455,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.ImageComboBoxEdit textEditWaterModel;
public DevExpress.XtraEditors.TextEdit txtFloorHouseHolds;
+ private DevExpress.XtraEditors.TreeListLookUpEdit txtEditRegion;
+ private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn2;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
index 91f7ee7..1bb054b 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
@@ -73,6 +73,8 @@
this.textEditWaterModel.Properties.AddEnum(typeof(HStation.PBS.eSupplyMode));
this.comboBoxWaterSupply.Properties.AddEnum(typeof(HStation.PBS.eWaterSupply));
var allPackages = await new HStation.BLL.AssetsPackageMain().GetAll();
+ var list = await new Yw.BLL.Division().GetAll();
+ this.treeListLookUpEdit1TreeList.DataSource = list;
}
public void SetData(Vmo.FacilityVmo model)
@@ -87,6 +89,7 @@
this.comboBoxWaterSupply.EditValue = model.WaterSupply;
this.txtConstantP.EditValue = model.ConstantPressure;
this.textEditWaterModel.EditValue = model.SupplyMode;
+ this.txtEditRegion.EditValue = model.PlaceID;
}
//鑾峰彇鏂囨湰淇℃伅
@@ -103,6 +106,10 @@
_facilityVmo.ConstantPressure = double.Parse(txtConstantP.Text);
_facilityVmo.MaxWaterDemand = Convert.ToDouble(txtMaxWaterDemand.EditValue);
_facilityVmo.TerminalPressure = Convert.ToDouble(txtWaterPressure.EditValue);
+ if (this.txtEditRegion.EditValue != null)
+ {
+ _facilityVmo.PlaceID = Convert.ToInt64(this.txtEditRegion.EditValue);
+ }
if (comboBoxWaterSupply.EditValue != null)
{
_facilityVmo.WaterSupply = (HStation.PBS.eWaterSupply)comboBoxWaterSupply.EditValue;
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs
index 7dc2bee..f05bb3c 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs
@@ -49,15 +49,15 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem1 });
Root.Name = "Root";
- Root.Size = new Size(753, 287);
+ Root.Size = new Size(797, 331);
Root.TextVisible = false;
//
// layoutControlItem7
//
layoutControlItem7.Control = generalOkAndCancelCtrl1;
- layoutControlItem7.Location = new Point(0, 230);
+ layoutControlItem7.Location = new Point(0, 273);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(733, 37);
+ layoutControlItem7.Size = new Size(777, 38);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
@@ -67,10 +67,10 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(114, 33);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(131, 42);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(114, 33);
- generalOkAndCancelCtrl1.Location = new Point(12, 242);
+ generalOkAndCancelCtrl1.Location = new Point(12, 285);
generalOkAndCancelCtrl1.Margin = new Padding(3, 5, 3, 5);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(729, 33);
+ generalOkAndCancelCtrl1.Size = new Size(773, 34);
generalOkAndCancelCtrl1.TabIndex = 0;
//
// layoutControlItem1
@@ -78,7 +78,7 @@
layoutControlItem1.Control = facilitiesCtrl;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(733, 230);
+ layoutControlItem1.Size = new Size(777, 273);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
@@ -87,7 +87,7 @@
facilitiesCtrl.Location = new Point(12, 12);
facilitiesCtrl.Margin = new Padding(2, 3, 2, 3);
facilitiesCtrl.Name = "facilitiesCtrl";
- facilitiesCtrl.Size = new Size(729, 226);
+ facilitiesCtrl.Size = new Size(773, 269);
facilitiesCtrl.TabIndex = 4;
//
// layoutControl1
@@ -100,7 +100,7 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(753, 287);
+ layoutControl1.Size = new Size(797, 331);
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
@@ -108,7 +108,7 @@
//
AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(753, 287);
+ ClientSize = new Size(797, 331);
Controls.Add(layoutControl1);
Margin = new Padding(3, 4, 3, 4);
Name = "AddFacilityDlg";
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/EditFacilityDlg.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/EditFacilityDlg.Designer.cs
index 316404b..bcb99bb 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/EditFacilityDlg.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/EditFacilityDlg.Designer.cs
@@ -49,15 +49,15 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem1 });
Root.Name = "Root";
- Root.Size = new Size(769, 292);
+ Root.Size = new Size(788, 333);
Root.TextVisible = false;
//
// layoutControlItem7
//
layoutControlItem7.Control = generalOkAndCancelCtrl1;
- layoutControlItem7.Location = new Point(0, 235);
+ layoutControlItem7.Location = new Point(0, 275);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(749, 37);
+ layoutControlItem7.Size = new Size(768, 38);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
@@ -67,10 +67,10 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(114, 33);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(131, 42);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(114, 33);
- generalOkAndCancelCtrl1.Location = new Point(12, 247);
+ generalOkAndCancelCtrl1.Location = new Point(12, 287);
generalOkAndCancelCtrl1.Margin = new Padding(3, 5, 3, 5);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(745, 33);
+ generalOkAndCancelCtrl1.Size = new Size(764, 34);
generalOkAndCancelCtrl1.TabIndex = 0;
//
// layoutControlItem1
@@ -78,7 +78,7 @@
layoutControlItem1.Control = facilitiesCtrl;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(749, 235);
+ layoutControlItem1.Size = new Size(768, 275);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
@@ -87,7 +87,7 @@
facilitiesCtrl.Location = new Point(12, 12);
facilitiesCtrl.Margin = new Padding(2, 3, 2, 3);
facilitiesCtrl.Name = "facilitiesCtrl";
- facilitiesCtrl.Size = new Size(745, 231);
+ facilitiesCtrl.Size = new Size(764, 271);
facilitiesCtrl.TabIndex = 4;
//
// layoutControl1
@@ -100,7 +100,7 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(769, 292);
+ layoutControl1.Size = new Size(788, 333);
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
@@ -108,7 +108,7 @@
//
AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(769, 292);
+ ClientSize = new Size(788, 333);
Controls.Add(layoutControl1);
Margin = new Padding(3, 4, 3, 4);
Name = "EditFacilityDlg";
--
Gitblit v1.9.3