From 668e7746a6fbe30cba78bffe37c9ce9b9ed9a4fe Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 16 四月 2024 12:01:10 +0800
Subject: [PATCH] 优化界面功能
---
.vs/ISupply.WinFrm.Desktop/v17/.futdcache.v2 | 0
WinFrm/ISupply.WinFrm.Main/basic/_UserControls/HospitalWizardForm.Designer.cs | 74 ++--
.vs/ISupply.WinFrm.Desktop/v17/.suo | 0
WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.cs | 6
.vs/ProjectEvaluation/isupply.winfrm.desktop.projects.v7.bin | 0
WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.cs | 8
WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.Designer.cs | 35 +
WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.Designer.cs | 35 +
WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.resx | 52 +-
WinFrm/ISupply.WinFrm.Main/basic/_UserControls/BuildWizardForm.Designer.cs | 160 +++++----
WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.resx | 73 ++-
.vs/ISupply.WinFrm.Desktop/DesignTimeBuild/.dtbcache.v2 | 0
WinFrm/ISupply.WinFrm.Main/basic/_UserControls/ShopWizardForm.Designer.cs | 6
WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.resx | 73 ++-
.vs/ProjectEvaluation/isupply.winfrm.desktop.metadata.v7.bin | 0
WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.Designer.cs | 425 ++++++++++++-------------
16 files changed, 515 insertions(+), 432 deletions(-)
diff --git a/.vs/ISupply.WinFrm.Desktop/DesignTimeBuild/.dtbcache.v2 b/.vs/ISupply.WinFrm.Desktop/DesignTimeBuild/.dtbcache.v2
index f2e71cf..1943f6a 100644
--- a/.vs/ISupply.WinFrm.Desktop/DesignTimeBuild/.dtbcache.v2
+++ b/.vs/ISupply.WinFrm.Desktop/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/.vs/ISupply.WinFrm.Desktop/v17/.futdcache.v2 b/.vs/ISupply.WinFrm.Desktop/v17/.futdcache.v2
index 28b3793..e05f318 100644
--- a/.vs/ISupply.WinFrm.Desktop/v17/.futdcache.v2
+++ b/.vs/ISupply.WinFrm.Desktop/v17/.futdcache.v2
Binary files differ
diff --git a/.vs/ISupply.WinFrm.Desktop/v17/.suo b/.vs/ISupply.WinFrm.Desktop/v17/.suo
index 7c85e27..3fd0dd6 100644
--- a/.vs/ISupply.WinFrm.Desktop/v17/.suo
+++ b/.vs/ISupply.WinFrm.Desktop/v17/.suo
Binary files differ
diff --git a/.vs/ProjectEvaluation/isupply.winfrm.desktop.metadata.v7.bin b/.vs/ProjectEvaluation/isupply.winfrm.desktop.metadata.v7.bin
index e551286..897656d 100644
--- a/.vs/ProjectEvaluation/isupply.winfrm.desktop.metadata.v7.bin
+++ b/.vs/ProjectEvaluation/isupply.winfrm.desktop.metadata.v7.bin
Binary files differ
diff --git a/.vs/ProjectEvaluation/isupply.winfrm.desktop.projects.v7.bin b/.vs/ProjectEvaluation/isupply.winfrm.desktop.projects.v7.bin
index c3a391a..d59080b 100644
--- a/.vs/ProjectEvaluation/isupply.winfrm.desktop.projects.v7.bin
+++ b/.vs/ProjectEvaluation/isupply.winfrm.desktop.projects.v7.bin
Binary files differ
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.Designer.cs b/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.Designer.cs
index beba1a6..e3b84d7 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.Designer.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.Designer.cs
@@ -34,10 +34,10 @@
barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
- barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barTagName = new DevExpress.XtraBars.BarButtonItem();
barBtnSortCode = new DevExpress.XtraBars.BarButtonItem();
barBtnUpdateUseStatus = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSearch = new DevExpress.XtraBars.BarCheckItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -49,6 +49,7 @@
gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ barBtnRefreshData = new DevExpress.XtraBars.BarButtonItem();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)PartbindingSource).BeginInit();
@@ -60,9 +61,9 @@
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, ribbonControl1.SearchEditItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnSearch, barTagName, barBtnSortCode, barBtnUpdateUseStatus });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, ribbonControl1.SearchEditItem, barBtnAdd, barBtnEdit, barBtnDelete, barTagName, barBtnSortCode, barBtnUpdateUseStatus, barBtnSearch, barBtnRefreshData });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 13;
+ ribbonControl1.MaxItemId = 15;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -95,14 +96,6 @@
barBtnDelete.Name = "barBtnDelete";
barBtnDelete.ItemClick += barBtnDelete_ItemClick;
//
- // barBtnSearch
- //
- barBtnSearch.Caption = "妫�绱�";
- barBtnSearch.Id = 4;
- barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
- barBtnSearch.Name = "barBtnSearch";
- barBtnSearch.ItemClick += barBtnSearch_ItemClick;
- //
// barTagName
//
barTagName.Caption = "鏍囩鍚嶇О";
@@ -127,6 +120,14 @@
barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
barBtnUpdateUseStatus.ItemClick += barBtnUpdateUseStatus_ItemClick;
//
+ // barBtnSearch
+ //
+ barBtnSearch.Caption = "妫�绱�";
+ barBtnSearch.Id = 13;
+ barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
+ barBtnSearch.Name = "barBtnSearch";
+ barBtnSearch.ItemClick += barBtnSearch_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
@@ -147,6 +148,7 @@
ribbonPageGroup2.ItemLinks.Add(barTagName);
ribbonPageGroup2.ItemLinks.Add(barBtnSortCode);
ribbonPageGroup2.ItemLinks.Add(barBtnUpdateUseStatus);
+ ribbonPageGroup2.ItemLinks.Add(barBtnRefreshData);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "ribbonPageGroup2";
//
@@ -209,6 +211,14 @@
gridColumn3.Visible = true;
gridColumn3.VisibleIndex = 4;
//
+ // barBtnRefreshData
+ //
+ barBtnRefreshData.Caption = "鍒锋柊";
+ barBtnRefreshData.Id = 14;
+ barBtnRefreshData.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
+ barBtnRefreshData.Name = "barBtnRefreshData";
+ barBtnRefreshData.ItemClick += barBtnRefreshData_ItemClick;
+ //
// PartitionMgr
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -238,7 +248,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnAdd;
private DevExpress.XtraBars.BarButtonItem barBtnEdit;
private DevExpress.XtraBars.BarButtonItem barBtnDelete;
- private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private BindingSource PartbindingSource;
private DevExpress.XtraBars.BarButtonItem barTagName;
private DevExpress.XtraBars.BarButtonItem barBtnSortCode;
@@ -246,5 +255,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnUpdateUseStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraBars.BarCheckItem barBtnSearch;
+ private DevExpress.XtraBars.BarButtonItem barBtnRefreshData;
}
}
\ No newline at end of file
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.cs b/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.cs
index 31083c6..0abf713 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.cs
@@ -187,5 +187,11 @@
else
this.gridView1.ShowFindPanel();
}
+
+ //鍒锋柊
+ private void barBtnRefreshData_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.SetBindingData();
+ }
}
}
\ No newline at end of file
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.resx b/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.resx
index 3ad84c9..737517b 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.resx
+++ b/WinFrm/ISupply.WinFrm.Main/basic/Part/PartitionMgr.resx
@@ -189,32 +189,6 @@
L2c+DQo8L3N2Zz4L
</value>
</data>
- <data name="barBtnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
- </data>
<data name="barTagName.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
@@ -287,6 +261,53 @@
MnoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
+ <data name="barBtnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
+ QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
+ MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
+ cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
+ LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
+ NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
+ MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
+ MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
+ MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
+ IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
+ NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
+ ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
+ LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
+ QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+ </data>
+ <data name="barButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41
+ LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs
+ NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3
+ LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt
+ NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz
+ LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj
+ bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+ </data>
<metadata name="PartbindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.Designer.cs b/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.Designer.cs
index b182a91..f997637 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.Designer.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.Designer.cs
@@ -34,10 +34,10 @@
barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
barBtndelete = new DevExpress.XtraBars.BarButtonItem();
- barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barBtnTagName = new DevExpress.XtraBars.BarButtonItem();
barBtnSortCode = new DevExpress.XtraBars.BarButtonItem();
barBtnStates = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSearch = new DevExpress.XtraBars.BarCheckItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -49,6 +49,7 @@
gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ barBtnRefreshData = new DevExpress.XtraBars.BarButtonItem();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)SystemtypebindingSource).BeginInit();
@@ -60,9 +61,9 @@
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, ribbonControl1.SearchEditItem, barBtnAdd, barBtnEdit, barBtndelete, barBtnSearch, barBtnTagName, barBtnSortCode, barBtnStates });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, ribbonControl1.SearchEditItem, barBtnAdd, barBtnEdit, barBtndelete, barBtnTagName, barBtnSortCode, barBtnStates, barBtnSearch, barBtnRefreshData });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 9;
+ ribbonControl1.MaxItemId = 11;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -95,14 +96,6 @@
barBtndelete.Name = "barBtndelete";
barBtndelete.ItemClick += barBtndelete_ItemClick_1;
//
- // barBtnSearch
- //
- barBtnSearch.Caption = "妫�绱�";
- barBtnSearch.Id = 4;
- barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
- barBtnSearch.Name = "barBtnSearch";
- barBtnSearch.ItemClick += barBtnSearch_ItemClick_1;
- //
// barBtnTagName
//
barBtnTagName.Caption = "鏍囩鍚嶇О";
@@ -127,6 +120,14 @@
barBtnStates.Name = "barBtnStates";
barBtnStates.ItemClick += barBtnStates_ItemClick;
//
+ // barBtnSearch
+ //
+ barBtnSearch.Caption = "妫�绱�";
+ barBtnSearch.Id = 9;
+ barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
+ barBtnSearch.Name = "barBtnSearch";
+ barBtnSearch.ItemClick += barBtnSearch_ItemClick_1;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
@@ -147,6 +148,7 @@
ribbonPageGroup2.ItemLinks.Add(barBtnTagName);
ribbonPageGroup2.ItemLinks.Add(barBtnSortCode);
ribbonPageGroup2.ItemLinks.Add(barBtnStates);
+ ribbonPageGroup2.ItemLinks.Add(barBtnRefreshData);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "ribbonPageGroup2";
//
@@ -209,6 +211,14 @@
gridColumn4.Visible = true;
gridColumn4.VisibleIndex = 1;
//
+ // barBtnRefreshData
+ //
+ barBtnRefreshData.Caption = "鍒锋柊";
+ barBtnRefreshData.Id = 10;
+ barBtnRefreshData.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
+ barBtnRefreshData.Name = "barBtnRefreshData";
+ barBtnRefreshData.ItemClick += barBtnRefreshData_ItemClick;
+ //
// SystemTypeMgr
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -238,7 +248,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnAdd;
private DevExpress.XtraBars.BarButtonItem barBtnEdit;
private DevExpress.XtraBars.BarButtonItem barBtndelete;
- private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private DevExpress.XtraBars.BarButtonItem barBtnTagName;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
private DevExpress.XtraBars.BarButtonItem barBtnSortCode;
@@ -246,5 +255,7 @@
private BindingSource SystemtypebindingSource;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraBars.BarCheckItem barBtnSearch;
+ private DevExpress.XtraBars.BarButtonItem barBtnRefreshData;
}
}
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.cs b/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.cs
index 4ac0471..72ad73a 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.cs
@@ -58,6 +58,7 @@
if (id > 0)
{
rhs.ID = id;
+ rhs.SortCode = _allBindinglist.Count == 0 ? 1 : _allBindinglist.Max(x => x.SortCode) + 1;
_allBindinglist.Add(new CurrentViewModel(rhs));
this.SystemtypebindingSource.ResetBindings(false);
return true;
@@ -187,5 +188,12 @@
dlg.ShowDialog();
}
+
+
+ //鍒锋柊
+ private void barBtnRefreshData_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.SetBindingData();
+ }
}
}
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.resx b/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.resx
index 99fa1de..576a511 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.resx
+++ b/WinFrm/ISupply.WinFrm.Main/basic/SystemType/SystemTypeMgr.resx
@@ -187,32 +187,6 @@
LjQsMC40LTEsMC0xLjRMMTguOCwxNnoiIGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L
</value>
</data>
- <data name="barBtnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
- </data>
<data name="barBtnTagName.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
@@ -285,6 +259,53 @@
MnoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
+ <data name="barBtnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
+ QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
+ MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
+ cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
+ LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
+ NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
+ MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
+ MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
+ MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
+ IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
+ NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
+ ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
+ LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
+ QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+ </data>
+ <data name="barButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41
+ LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs
+ NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3
+ LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt
+ NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz
+ LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj
+ bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+ </data>
<metadata name="SystemtypebindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/BuildWizardForm.Designer.cs b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/BuildWizardForm.Designer.cs
index 9007845..e405e5b 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/BuildWizardForm.Designer.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/BuildWizardForm.Designer.cs
@@ -119,138 +119,156 @@
//
// cbCity
//
- cbCity.Location = new Point(449, 29);
- cbCity.Margin = new Padding(2, 2, 2, 2);
+ cbCity.Location = new Point(450, 36);
+ cbCity.Margin = new Padding(2);
cbCity.Name = "cbCity";
cbCity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbCity.Properties.Items.AddRange(new object[] { "涓婃捣甯�" });
cbCity.Properties.NullText = "璇烽�夋嫨";
cbCity.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbCity.Size = new Size(331, 20);
+ cbCity.Size = new Size(326, 20);
cbCity.StyleController = layoutControl1;
cbCity.TabIndex = 118;
//
// cbArea
//
- cbArea.Location = new Point(65, 29);
- cbArea.Margin = new Padding(2, 2, 2, 2);
+ cbArea.Location = new Point(69, 36);
+ cbArea.Margin = new Padding(2);
cbArea.Name = "cbArea";
cbArea.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbArea.Properties.Items.AddRange(new object[] { "涓婃捣甯�" });
cbArea.Properties.NullText = "璇烽�夋嫨";
cbArea.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbArea.Size = new Size(262, 20);
+ cbArea.Size = new Size(258, 20);
cbArea.StyleController = layoutControl1;
cbArea.TabIndex = 116;
//
// cbDist
//
- cbDist.Location = new Point(65, 51);
- cbDist.Margin = new Padding(2, 2, 2, 2);
+ cbDist.Location = new Point(69, 60);
+ cbDist.Margin = new Padding(2);
cbDist.Name = "cbDist";
cbDist.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbDist.Properties.Items.AddRange(new object[] { "闂佃鍖�" });
cbDist.Properties.NullText = "璇烽�夋嫨";
cbDist.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbDist.Size = new Size(262, 20);
+ cbDist.Size = new Size(258, 20);
cbDist.StyleController = layoutControl1;
cbDist.TabIndex = 112;
//
// cbPropertyType
//
- cbPropertyType.Location = new Point(449, 7);
- cbPropertyType.Margin = new Padding(2, 2, 2, 2);
+ cbPropertyType.Location = new Point(450, 12);
+ cbPropertyType.Margin = new Padding(2);
cbPropertyType.Name = "cbPropertyType";
cbPropertyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbPropertyType.Properties.Items.AddRange(new object[] { "鍏瘬浣忓畢" });
cbPropertyType.Properties.NullText = "璇烽�夋嫨";
cbPropertyType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbPropertyType.Size = new Size(331, 20);
+ cbPropertyType.Size = new Size(326, 20);
cbPropertyType.StyleController = layoutControl1;
cbPropertyType.TabIndex = 111;
//
// txtName
//
- txtName.Location = new Point(65, 7);
- txtName.Margin = new Padding(2, 2, 2, 2);
+ txtName.Location = new Point(69, 12);
+ txtName.Margin = new Padding(2);
txtName.Name = "txtName";
- txtName.Size = new Size(262, 20);
+ txtName.Size = new Size(258, 20);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 109;
//
// txtCompletionTime
//
- txtCompletionTime.Location = new Point(449, 51);
- txtCompletionTime.Margin = new Padding(2, 2, 2, 2);
+ txtCompletionTime.Location = new Point(450, 60);
+ txtCompletionTime.Margin = new Padding(2);
txtCompletionTime.Name = "txtCompletionTime";
- txtCompletionTime.Size = new Size(303, 20);
+ txtCompletionTime.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtCompletionTime.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtCompletionTime.Properties.MaskSettings.Set("mask", "f");
+ txtCompletionTime.Size = new Size(298, 20);
txtCompletionTime.StyleController = layoutControl1;
txtCompletionTime.TabIndex = 108;
//
// txtProperTyYears
//
- txtProperTyYears.Location = new Point(65, 73);
- txtProperTyYears.Margin = new Padding(2, 2, 2, 2);
+ txtProperTyYears.Location = new Point(69, 84);
+ txtProperTyYears.Margin = new Padding(2);
txtProperTyYears.Name = "txtProperTyYears";
- txtProperTyYears.Size = new Size(233, 20);
+ txtProperTyYears.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtProperTyYears.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtProperTyYears.Properties.MaskSettings.Set("mask", "f");
+ txtProperTyYears.Size = new Size(229, 20);
txtProperTyYears.StyleController = layoutControl1;
txtProperTyYears.TabIndex = 106;
//
// txtTotalHouseHolds
//
- txtTotalHouseHolds.Location = new Point(449, 73);
- txtTotalHouseHolds.Margin = new Padding(2, 2, 2, 2);
+ txtTotalHouseHolds.Location = new Point(450, 84);
+ txtTotalHouseHolds.Margin = new Padding(2);
txtTotalHouseHolds.Name = "txtTotalHouseHolds";
- txtTotalHouseHolds.Size = new Size(331, 20);
+ txtTotalHouseHolds.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtTotalHouseHolds.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtTotalHouseHolds.Properties.MaskSettings.Set("mask", "d");
+ txtTotalHouseHolds.Size = new Size(326, 20);
txtTotalHouseHolds.StyleController = layoutControl1;
txtTotalHouseHolds.TabIndex = 104;
//
// txtAreaSquare
//
- txtAreaSquare.Location = new Point(65, 95);
- txtAreaSquare.Margin = new Padding(2, 2, 2, 2);
+ txtAreaSquare.Location = new Point(69, 108);
+ txtAreaSquare.Margin = new Padding(2);
txtAreaSquare.Name = "txtAreaSquare";
- txtAreaSquare.Size = new Size(262, 20);
+ txtAreaSquare.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtAreaSquare.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtAreaSquare.Properties.MaskSettings.Set("mask", "f");
+ txtAreaSquare.Size = new Size(258, 20);
txtAreaSquare.StyleController = layoutControl1;
txtAreaSquare.TabIndex = 102;
//
// txtPlotRatio
//
- txtPlotRatio.Location = new Point(449, 95);
- txtPlotRatio.Margin = new Padding(2, 2, 2, 2);
+ txtPlotRatio.Location = new Point(450, 108);
+ txtPlotRatio.Margin = new Padding(2);
txtPlotRatio.Name = "txtPlotRatio";
- txtPlotRatio.Size = new Size(331, 20);
+ txtPlotRatio.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtPlotRatio.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtPlotRatio.Properties.MaskSettings.Set("mask", "f");
+ txtPlotRatio.Size = new Size(326, 20);
txtPlotRatio.StyleController = layoutControl1;
txtPlotRatio.TabIndex = 100;
//
// txtGreeningRate
//
txtGreeningRate.IsEmptyContent = true;
- txtGreeningRate.Location = new Point(65, 117);
- txtGreeningRate.Margin = new Padding(2, 2, 2, 2);
+ txtGreeningRate.Location = new Point(69, 132);
+ txtGreeningRate.Margin = new Padding(2);
txtGreeningRate.MinValue = null;
txtGreeningRate.Name = "txtGreeningRate";
- txtGreeningRate.Size = new Size(262, 20);
+ txtGreeningRate.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtGreeningRate.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtGreeningRate.Properties.MaskSettings.Set("mask", "f");
+ txtGreeningRate.Size = new Size(258, 20);
txtGreeningRate.StyleController = layoutControl1;
txtGreeningRate.TabIndex = 98;
//
// txtDeveloper
//
- txtDeveloper.Location = new Point(449, 117);
- txtDeveloper.Margin = new Padding(2, 2, 2, 2);
+ txtDeveloper.Location = new Point(450, 132);
+ txtDeveloper.Margin = new Padding(2);
txtDeveloper.Name = "txtDeveloper";
- txtDeveloper.Size = new Size(331, 20);
+ txtDeveloper.Size = new Size(326, 20);
txtDeveloper.StyleController = layoutControl1;
txtDeveloper.TabIndex = 96;
//
// txtAddress
//
txtAddress.IsEmptyContent = true;
- txtAddress.Location = new Point(65, 139);
- txtAddress.Margin = new Padding(2, 2, 2, 2);
+ txtAddress.Location = new Point(69, 156);
+ txtAddress.Margin = new Padding(2);
txtAddress.MinValue = null;
txtAddress.Name = "txtAddress";
- txtAddress.Size = new Size(715, 20);
+ txtAddress.Size = new Size(707, 20);
txtAddress.StyleController = layoutControl1;
txtAddress.TabIndex = 94;
//
@@ -266,9 +284,9 @@
// layoutControlItem1
//
layoutControlItem1.Control = cbCity;
- layoutControlItem1.Location = new Point(384, 22);
+ layoutControlItem1.Location = new Point(381, 24);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(390, 22);
+ layoutControlItem1.Size = new Size(387, 24);
layoutControlItem1.Text = "鎵�灞炲煄甯�:";
layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem1.TextSize = new Size(52, 14);
@@ -277,9 +295,9 @@
// layoutControlItem7
//
layoutControlItem7.Control = cbDist;
- layoutControlItem7.Location = new Point(0, 44);
+ layoutControlItem7.Location = new Point(0, 48);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(321, 22);
+ layoutControlItem7.Size = new Size(319, 24);
layoutControlItem7.Text = "鎵�灞炲尯鍘�:";
layoutControlItem7.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem7.TextSize = new Size(52, 14);
@@ -288,9 +306,9 @@
// layoutControlItem13
//
layoutControlItem13.Control = txtProperTyYears;
- layoutControlItem13.Location = new Point(0, 66);
+ layoutControlItem13.Location = new Point(0, 72);
layoutControlItem13.Name = "layoutControlItem13";
- layoutControlItem13.Size = new Size(292, 22);
+ layoutControlItem13.Size = new Size(290, 24);
layoutControlItem13.Text = "浜ф潈骞撮檺:";
layoutControlItem13.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem13.TextSize = new Size(52, 14);
@@ -299,9 +317,9 @@
// layoutControlItem17
//
layoutControlItem17.Control = txtAreaSquare;
- layoutControlItem17.Location = new Point(0, 88);
+ layoutControlItem17.Location = new Point(0, 96);
layoutControlItem17.Name = "layoutControlItem17";
- layoutControlItem17.Size = new Size(321, 22);
+ layoutControlItem17.Size = new Size(319, 24);
layoutControlItem17.Text = "鎬诲缓闈㈢Н:";
layoutControlItem17.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem17.TextSize = new Size(52, 14);
@@ -310,9 +328,9 @@
// layoutControlItem21
//
layoutControlItem21.Control = txtGreeningRate;
- layoutControlItem21.Location = new Point(0, 110);
+ layoutControlItem21.Location = new Point(0, 120);
layoutControlItem21.Name = "layoutControlItem21";
- layoutControlItem21.Size = new Size(321, 22);
+ layoutControlItem21.Size = new Size(319, 24);
layoutControlItem21.Text = "缁垮寲鐜�:";
layoutControlItem21.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem21.TextSize = new Size(40, 14);
@@ -321,9 +339,9 @@
// layoutControlItem25
//
layoutControlItem25.Control = txtAddress;
- layoutControlItem25.Location = new Point(0, 132);
+ layoutControlItem25.Location = new Point(0, 144);
layoutControlItem25.Name = "layoutControlItem25";
- layoutControlItem25.Size = new Size(774, 63);
+ layoutControlItem25.Size = new Size(768, 43);
layoutControlItem25.Text = "璇︾粏鍦板潃:";
layoutControlItem25.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem25.TextSize = new Size(52, 14);
@@ -334,7 +352,7 @@
layoutControlItem10.Control = txtName;
layoutControlItem10.Location = new Point(0, 0);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(321, 22);
+ layoutControlItem10.Size = new Size(319, 24);
layoutControlItem10.Text = "灏忓尯鍚嶇О:";
layoutControlItem10.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem10.TextSize = new Size(52, 14);
@@ -343,9 +361,9 @@
// layoutControlItem8
//
layoutControlItem8.Control = cbPropertyType;
- layoutControlItem8.Location = new Point(384, 0);
+ layoutControlItem8.Location = new Point(381, 0);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(390, 22);
+ layoutControlItem8.Size = new Size(387, 24);
layoutControlItem8.Text = "鐗╀笟绫诲瀷:";
layoutControlItem8.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem8.TextSize = new Size(52, 14);
@@ -354,9 +372,9 @@
// layoutControlItem3
//
layoutControlItem3.Control = cbArea;
- layoutControlItem3.Location = new Point(0, 22);
+ layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(321, 22);
+ layoutControlItem3.Size = new Size(319, 24);
layoutControlItem3.Text = "鎵�灞炵渷浠�:";
layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem3.TextSize = new Size(52, 14);
@@ -365,9 +383,9 @@
// layoutControlItem11
//
layoutControlItem11.Control = txtCompletionTime;
- layoutControlItem11.Location = new Point(384, 44);
+ layoutControlItem11.Location = new Point(381, 48);
layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(362, 22);
+ layoutControlItem11.Size = new Size(359, 24);
layoutControlItem11.Text = "绔ｅ伐鏃堕棿:";
layoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem11.TextSize = new Size(52, 14);
@@ -376,9 +394,9 @@
// layoutControlItem15
//
layoutControlItem15.Control = txtTotalHouseHolds;
- layoutControlItem15.Location = new Point(384, 66);
+ layoutControlItem15.Location = new Point(381, 72);
layoutControlItem15.Name = "layoutControlItem15";
- layoutControlItem15.Size = new Size(390, 22);
+ layoutControlItem15.Size = new Size(387, 24);
layoutControlItem15.Text = "鎬绘埛鏁�:";
layoutControlItem15.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem15.TextSize = new Size(40, 14);
@@ -387,9 +405,9 @@
// layoutControlItem19
//
layoutControlItem19.Control = txtPlotRatio;
- layoutControlItem19.Location = new Point(384, 88);
+ layoutControlItem19.Location = new Point(381, 96);
layoutControlItem19.Name = "layoutControlItem19";
- layoutControlItem19.Size = new Size(390, 22);
+ layoutControlItem19.Size = new Size(387, 24);
layoutControlItem19.Text = "瀹圭Н鐜�:";
layoutControlItem19.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem19.TextSize = new Size(40, 14);
@@ -398,9 +416,9 @@
// layoutControlItem23
//
layoutControlItem23.Control = txtDeveloper;
- layoutControlItem23.Location = new Point(384, 110);
+ layoutControlItem23.Location = new Point(381, 120);
layoutControlItem23.Name = "layoutControlItem23";
- layoutControlItem23.Size = new Size(390, 22);
+ layoutControlItem23.Size = new Size(387, 24);
layoutControlItem23.Text = "寮�鍙戝晢:";
layoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem23.TextSize = new Size(40, 14);
@@ -409,17 +427,17 @@
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(321, 0);
+ emptySpaceItem1.Location = new Point(319, 0);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(63, 132);
+ emptySpaceItem1.Size = new Size(62, 144);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// simpleLabelItem1
//
simpleLabelItem1.AllowHotTrack = false;
- simpleLabelItem1.Location = new Point(292, 66);
+ simpleLabelItem1.Location = new Point(290, 72);
simpleLabelItem1.Name = "simpleLabelItem1";
- simpleLabelItem1.Size = new Size(29, 22);
+ simpleLabelItem1.Size = new Size(29, 24);
simpleLabelItem1.Text = "骞�";
simpleLabelItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
simpleLabelItem1.TextSize = new Size(12, 14);
@@ -427,9 +445,9 @@
// simpleLabelItem2
//
simpleLabelItem2.AllowHotTrack = false;
- simpleLabelItem2.Location = new Point(746, 44);
+ simpleLabelItem2.Location = new Point(740, 48);
simpleLabelItem2.Name = "simpleLabelItem2";
- simpleLabelItem2.Size = new Size(28, 22);
+ simpleLabelItem2.Size = new Size(28, 24);
simpleLabelItem2.Text = "骞�";
simpleLabelItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
simpleLabelItem2.TextSize = new Size(12, 14);
@@ -439,7 +457,7 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
- Margin = new Padding(2, 2, 2, 2);
+ Margin = new Padding(2);
Name = "BuildWizardForm";
Size = new Size(788, 207);
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/HospitalWizardForm.Designer.cs b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/HospitalWizardForm.Designer.cs
index 95e3c45..fd0cef3 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/HospitalWizardForm.Designer.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/HospitalWizardForm.Designer.cs
@@ -84,84 +84,84 @@
//
// txtName
//
- txtName.Location = new Point(65, 7);
- txtName.Margin = new Padding(2, 2, 2, 2);
+ txtName.Location = new Point(69, 12);
+ txtName.Margin = new Padding(2);
txtName.Name = "txtName";
- txtName.Size = new Size(211, 20);
+ txtName.Size = new Size(206, 20);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 145;
//
// cbLevel
//
- cbLevel.Location = new Point(418, 7);
- cbLevel.Margin = new Padding(2, 2, 2, 2);
+ cbLevel.Location = new Point(418, 12);
+ cbLevel.Margin = new Padding(2);
cbLevel.Name = "cbLevel";
cbLevel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbLevel.Properties.Items.AddRange(new object[] { "涓�绾х敳绛�", "涓�绾т箼绛�", "涓�绾т笝绛�", "浜岀骇鐢茬瓑", "浜岀骇涔欑瓑", "浜岀骇涓欑瓑", "涓夌骇鐢茬瓑", "涓夌骇涔欑瓑", "涓夌骇涓欑瓑" });
cbLevel.Properties.NullText = "璇烽�夋嫨";
cbLevel.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbLevel.Size = new Size(221, 20);
+ cbLevel.Size = new Size(217, 20);
cbLevel.StyleController = layoutControl1;
cbLevel.TabIndex = 143;
//
// cbArea
//
- cbArea.Location = new Point(65, 29);
- cbArea.Margin = new Padding(2, 2, 2, 2);
+ cbArea.Location = new Point(69, 36);
+ cbArea.Margin = new Padding(2);
cbArea.Name = "cbArea";
cbArea.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbArea.Properties.Items.AddRange(new object[] { "涓婃捣甯�" });
cbArea.Properties.NullText = "璇烽�夋嫨";
cbArea.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbArea.Size = new Size(211, 20);
+ cbArea.Size = new Size(206, 20);
cbArea.StyleController = layoutControl1;
cbArea.TabIndex = 141;
//
// cbCity
//
- cbCity.Location = new Point(418, 29);
- cbCity.Margin = new Padding(2, 2, 2, 2);
+ cbCity.Location = new Point(418, 36);
+ cbCity.Margin = new Padding(2);
cbCity.Name = "cbCity";
cbCity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbCity.Properties.Items.AddRange(new object[] { "涓婃捣甯�" });
cbCity.Properties.NullText = "璇烽�夋嫨";
cbCity.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbCity.Size = new Size(221, 20);
+ cbCity.Size = new Size(217, 20);
cbCity.StyleController = layoutControl1;
cbCity.TabIndex = 139;
//
// cbDist
//
- cbDist.Location = new Point(65, 51);
- cbDist.Margin = new Padding(2, 2, 2, 2);
+ cbDist.Location = new Point(69, 60);
+ cbDist.Margin = new Padding(2);
cbDist.Name = "cbDist";
cbDist.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbDist.Properties.Items.AddRange(new object[] { "闂佃鍖�" });
cbDist.Properties.NullText = "璇烽�夋嫨";
cbDist.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbDist.Size = new Size(211, 20);
+ cbDist.Size = new Size(206, 20);
cbDist.StyleController = layoutControl1;
cbDist.TabIndex = 137;
//
// cbHospitalType
//
- cbHospitalType.Location = new Point(418, 51);
- cbHospitalType.Margin = new Padding(2, 2, 2, 2);
+ cbHospitalType.Location = new Point(418, 60);
+ cbHospitalType.Margin = new Padding(2);
cbHospitalType.Name = "cbHospitalType";
cbHospitalType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
cbHospitalType.Properties.Items.AddRange(new object[] { "鍏姙", "绉佸姙" });
cbHospitalType.Properties.NullText = "璇烽�夋嫨";
cbHospitalType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbHospitalType.Size = new Size(221, 20);
+ cbHospitalType.Size = new Size(217, 20);
cbHospitalType.StyleController = layoutControl1;
cbHospitalType.TabIndex = 135;
//
// txtAddress
//
- txtAddress.Location = new Point(65, 73);
- txtAddress.Margin = new Padding(2, 2, 2, 2);
+ txtAddress.Location = new Point(69, 84);
+ txtAddress.Margin = new Padding(2);
txtAddress.Name = "txtAddress";
- txtAddress.Size = new Size(574, 20);
+ txtAddress.Size = new Size(566, 20);
txtAddress.StyleController = layoutControl1;
txtAddress.TabIndex = 133;
//
@@ -179,7 +179,7 @@
layoutControlItem1.Control = txtName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(270, 22);
+ layoutControlItem1.Size = new Size(267, 24);
layoutControlItem1.Text = "鍖婚櫌鍚嶇О:";
layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem1.TextSize = new Size(52, 14);
@@ -188,9 +188,9 @@
// layoutControlItem5
//
layoutControlItem5.Control = cbArea;
- layoutControlItem5.Location = new Point(0, 22);
+ layoutControlItem5.Location = new Point(0, 24);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(270, 22);
+ layoutControlItem5.Size = new Size(267, 24);
layoutControlItem5.Text = "鎵�灞炵渷浠�:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem5.TextSize = new Size(52, 14);
@@ -199,9 +199,9 @@
// layoutControlItem9
//
layoutControlItem9.Control = cbDist;
- layoutControlItem9.Location = new Point(0, 44);
+ layoutControlItem9.Location = new Point(0, 48);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(270, 22);
+ layoutControlItem9.Size = new Size(267, 24);
layoutControlItem9.Text = "鎵�灞炲尯鍘�:";
layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem9.TextSize = new Size(52, 14);
@@ -210,9 +210,9 @@
// layoutControlItem13
//
layoutControlItem13.Control = txtAddress;
- layoutControlItem13.Location = new Point(0, 66);
+ layoutControlItem13.Location = new Point(0, 72);
layoutControlItem13.Name = "layoutControlItem13";
- layoutControlItem13.Size = new Size(633, 81);
+ layoutControlItem13.Size = new Size(627, 67);
layoutControlItem13.Text = "璇︾粏鍦板潃:";
layoutControlItem13.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem13.TextSize = new Size(52, 14);
@@ -221,9 +221,9 @@
// layoutControlItem3
//
layoutControlItem3.Control = cbLevel;
- layoutControlItem3.Location = new Point(353, 0);
+ layoutControlItem3.Location = new Point(349, 0);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(280, 22);
+ layoutControlItem3.Size = new Size(278, 24);
layoutControlItem3.Text = "鍖婚櫌绛夌骇:";
layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem3.TextSize = new Size(52, 14);
@@ -232,9 +232,9 @@
// layoutControlItem7
//
layoutControlItem7.Control = cbCity;
- layoutControlItem7.Location = new Point(353, 22);
+ layoutControlItem7.Location = new Point(349, 24);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(280, 22);
+ layoutControlItem7.Size = new Size(278, 24);
layoutControlItem7.Text = "鎵�灞炲煄甯�:";
layoutControlItem7.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem7.TextSize = new Size(52, 14);
@@ -243,9 +243,9 @@
// layoutControlItem11
//
layoutControlItem11.Control = cbHospitalType;
- layoutControlItem11.Location = new Point(353, 44);
+ layoutControlItem11.Location = new Point(349, 48);
layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(280, 22);
+ layoutControlItem11.Size = new Size(278, 24);
layoutControlItem11.Text = "鍖婚櫌鎬ц川:";
layoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
layoutControlItem11.TextSize = new Size(52, 14);
@@ -254,9 +254,9 @@
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(270, 0);
+ emptySpaceItem1.Location = new Point(267, 0);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(83, 66);
+ emptySpaceItem1.Size = new Size(82, 72);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// HospitalWizardForm
@@ -264,7 +264,7 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
- Margin = new Padding(2, 2, 2, 2);
+ Margin = new Padding(2);
Name = "HospitalWizardForm";
Size = new Size(647, 159);
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.Designer.cs b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.Designer.cs
index 6b3c8d7..b347bcc 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.Designer.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.Designer.cs
@@ -28,282 +28,263 @@
/// </summary>
private void InitializeComponent()
{
- this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- this.txtName = new DevExpress.XtraEditors.TextEdit();
- this.cbLevel = new DevExpress.XtraEditors.ComboBoxEdit();
- this.cbArea = new DevExpress.XtraEditors.ComboBoxEdit();
- this.cbCity = new DevExpress.XtraEditors.ComboBoxEdit();
- this.cbDist = new DevExpress.XtraEditors.ComboBoxEdit();
- this.cbSchoolType = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txtAddress = new DevExpress.XtraEditors.TextEdit();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
- this.layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbLevel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbArea.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbCity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbDist.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbSchoolType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtAddress.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
- this.SuspendLayout();
+ layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ txtName = new DevExpress.XtraEditors.TextEdit();
+ cbLevel = new DevExpress.XtraEditors.ComboBoxEdit();
+ cbArea = new DevExpress.XtraEditors.ComboBoxEdit();
+ cbCity = new DevExpress.XtraEditors.ComboBoxEdit();
+ cbDist = new DevExpress.XtraEditors.ComboBoxEdit();
+ cbSchoolType = new DevExpress.XtraEditors.ComboBoxEdit();
+ txtAddress = new DevExpress.XtraEditors.TextEdit();
+ Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+ ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+ layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)txtName.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)cbLevel.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)cbArea.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)cbCity.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)cbDist.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)cbSchoolType.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)txtAddress.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+ SuspendLayout();
//
// layoutControl1
//
- this.layoutControl1.Controls.Add(this.txtName);
- this.layoutControl1.Controls.Add(this.cbLevel);
- this.layoutControl1.Controls.Add(this.cbArea);
- this.layoutControl1.Controls.Add(this.cbCity);
- this.layoutControl1.Controls.Add(this.cbDist);
- this.layoutControl1.Controls.Add(this.cbSchoolType);
- this.layoutControl1.Controls.Add(this.txtAddress);
- this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutControl1.Location = new System.Drawing.Point(0, 0);
- this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.layoutControl1.Name = "layoutControl1";
- this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1063, 255);
- this.layoutControl1.TabIndex = 118;
- this.layoutControl1.Text = "layoutControl1";
+ layoutControl1.Controls.Add(txtName);
+ layoutControl1.Controls.Add(cbLevel);
+ layoutControl1.Controls.Add(cbArea);
+ layoutControl1.Controls.Add(cbCity);
+ layoutControl1.Controls.Add(cbDist);
+ layoutControl1.Controls.Add(cbSchoolType);
+ layoutControl1.Controls.Add(txtAddress);
+ layoutControl1.Dock = DockStyle.Fill;
+ layoutControl1.Location = new Point(0, 0);
+ layoutControl1.Name = "layoutControl1";
+ layoutControl1.Root = Root;
+ layoutControl1.Size = new Size(744, 162);
+ layoutControl1.TabIndex = 118;
+ layoutControl1.Text = "layoutControl1";
//
// txtName
//
- this.txtName.Location = new System.Drawing.Point(100, 19);
- this.txtName.Name = "txtName";
- this.txtName.Size = new System.Drawing.Size(376, 28);
- this.txtName.StyleController = this.layoutControl1;
- this.txtName.TabIndex = 131;
+ txtName.Location = new Point(69, 12);
+ txtName.Margin = new Padding(2);
+ txtName.Name = "txtName";
+ txtName.Size = new Size(264, 20);
+ txtName.StyleController = layoutControl1;
+ txtName.TabIndex = 131;
//
// cbLevel
//
- this.cbLevel.Location = new System.Drawing.Point(658, 19);
- this.cbLevel.Name = "cbLevel";
- this.cbLevel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cbLevel.Properties.Items.AddRange(new object[] {
- "骞煎効鍥�",
- "灏忓",
- "涓",
- "楂樺",
- "澶у"});
- this.cbLevel.Properties.NullText = "璇烽�夋嫨";
- this.cbLevel.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cbLevel.Size = new System.Drawing.Size(388, 28);
- this.cbLevel.StyleController = this.layoutControl1;
- this.cbLevel.TabIndex = 129;
+ cbLevel.Location = new Point(459, 12);
+ cbLevel.Margin = new Padding(2);
+ cbLevel.Name = "cbLevel";
+ cbLevel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbLevel.Properties.Items.AddRange(new object[] { "骞煎効鍥�", "灏忓", "涓", "楂樺", "澶у" });
+ cbLevel.Properties.NullText = "璇烽�夋嫨";
+ cbLevel.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ cbLevel.Size = new Size(273, 20);
+ cbLevel.StyleController = layoutControl1;
+ cbLevel.TabIndex = 129;
//
// cbArea
//
- this.cbArea.Location = new System.Drawing.Point(100, 53);
- this.cbArea.Name = "cbArea";
- this.cbArea.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cbArea.Properties.Items.AddRange(new object[] {
- "涓婃捣甯�"});
- this.cbArea.Properties.NullText = "璇烽�夋嫨";
- this.cbArea.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cbArea.Size = new System.Drawing.Size(376, 28);
- this.cbArea.StyleController = this.layoutControl1;
- this.cbArea.TabIndex = 127;
+ cbArea.Location = new Point(69, 36);
+ cbArea.Margin = new Padding(2);
+ cbArea.Name = "cbArea";
+ cbArea.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbArea.Properties.Items.AddRange(new object[] { "涓婃捣甯�" });
+ cbArea.Properties.NullText = "璇烽�夋嫨";
+ cbArea.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ cbArea.Size = new Size(264, 20);
+ cbArea.StyleController = layoutControl1;
+ cbArea.TabIndex = 127;
//
// cbCity
//
- this.cbCity.Location = new System.Drawing.Point(658, 53);
- this.cbCity.Name = "cbCity";
- this.cbCity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cbCity.Properties.Items.AddRange(new object[] {
- "涓婃捣甯�"});
- this.cbCity.Properties.NullText = "璇烽�夋嫨";
- this.cbCity.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cbCity.Size = new System.Drawing.Size(388, 28);
- this.cbCity.StyleController = this.layoutControl1;
- this.cbCity.TabIndex = 125;
+ cbCity.Location = new Point(459, 36);
+ cbCity.Margin = new Padding(2);
+ cbCity.Name = "cbCity";
+ cbCity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbCity.Properties.Items.AddRange(new object[] { "涓婃捣甯�" });
+ cbCity.Properties.NullText = "璇烽�夋嫨";
+ cbCity.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ cbCity.Size = new Size(273, 20);
+ cbCity.StyleController = layoutControl1;
+ cbCity.TabIndex = 125;
//
// cbDist
//
- this.cbDist.Location = new System.Drawing.Point(100, 87);
- this.cbDist.Name = "cbDist";
- this.cbDist.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cbDist.Properties.Items.AddRange(new object[] {
- "闂佃鍖�"});
- this.cbDist.Properties.NullText = "璇烽�夋嫨";
- this.cbDist.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cbDist.Size = new System.Drawing.Size(376, 28);
- this.cbDist.StyleController = this.layoutControl1;
- this.cbDist.TabIndex = 123;
+ cbDist.Location = new Point(69, 60);
+ cbDist.Margin = new Padding(2);
+ cbDist.Name = "cbDist";
+ cbDist.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbDist.Properties.Items.AddRange(new object[] { "闂佃鍖�" });
+ cbDist.Properties.NullText = "璇烽�夋嫨";
+ cbDist.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ cbDist.Size = new Size(264, 20);
+ cbDist.StyleController = layoutControl1;
+ cbDist.TabIndex = 123;
//
// cbSchoolType
//
- this.cbSchoolType.Location = new System.Drawing.Point(658, 87);
- this.cbSchoolType.Name = "cbSchoolType";
- this.cbSchoolType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cbSchoolType.Properties.Items.AddRange(new object[] {
- "鍔炲叕",
- "绉佸姙"});
- this.cbSchoolType.Properties.NullText = "璇烽�夋嫨";
- this.cbSchoolType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cbSchoolType.Size = new System.Drawing.Size(388, 28);
- this.cbSchoolType.StyleController = this.layoutControl1;
- this.cbSchoolType.TabIndex = 121;
+ cbSchoolType.Location = new Point(459, 60);
+ cbSchoolType.Margin = new Padding(2);
+ cbSchoolType.Name = "cbSchoolType";
+ cbSchoolType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbSchoolType.Properties.Items.AddRange(new object[] { "鍔炲叕", "绉佸姙" });
+ cbSchoolType.Properties.NullText = "璇烽�夋嫨";
+ cbSchoolType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ cbSchoolType.Size = new Size(273, 20);
+ cbSchoolType.StyleController = layoutControl1;
+ cbSchoolType.TabIndex = 121;
//
// txtAddress
//
- this.txtAddress.Location = new System.Drawing.Point(100, 121);
- this.txtAddress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.txtAddress.Name = "txtAddress";
- this.txtAddress.Size = new System.Drawing.Size(946, 28);
- this.txtAddress.StyleController = this.layoutControl1;
- this.txtAddress.TabIndex = 132;
+ txtAddress.Location = new Point(69, 84);
+ txtAddress.Name = "txtAddress";
+ txtAddress.Size = new Size(663, 20);
+ txtAddress.StyleController = layoutControl1;
+ txtAddress.TabIndex = 132;
//
// Root
//
- this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.Root.GroupBordersVisible = false;
- this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
- this.layoutControlItem5,
- this.layoutControlItem3,
- this.layoutControlItem7,
- this.layoutControlItem9,
- this.layoutControlItem2,
- this.layoutControlItem11,
- this.emptySpaceItem1});
- this.Root.Name = "Root";
- this.Root.Size = new System.Drawing.Size(1063, 255);
- this.Root.TextVisible = false;
+ Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ Root.GroupBordersVisible = false;
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem5, layoutControlItem3, layoutControlItem7, layoutControlItem9, layoutControlItem2, layoutControlItem11, emptySpaceItem1 });
+ Root.Name = "Root";
+ Root.Size = new Size(744, 162);
+ Root.TextVisible = false;
//
// layoutControlItem1
//
- this.layoutControlItem1.Control = this.txtName;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(465, 34);
- this.layoutControlItem1.Text = "瀛︽牎鍚嶇О:";
- this.layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem1.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem1.TextToControlDistance = 5;
+ layoutControlItem1.Control = txtName;
+ layoutControlItem1.Location = new Point(0, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(325, 24);
+ layoutControlItem1.Text = "瀛︽牎鍚嶇О:";
+ layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem1.TextSize = new Size(52, 14);
+ layoutControlItem1.TextToControlDistance = 5;
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.cbArea;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 34);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.Size = new System.Drawing.Size(465, 34);
- this.layoutControlItem5.Text = "鎵�灞炵渷浠�:";
- this.layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem5.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem5.TextToControlDistance = 5;
+ layoutControlItem5.Control = cbArea;
+ layoutControlItem5.Location = new Point(0, 24);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(325, 24);
+ layoutControlItem5.Text = "鎵�灞炵渷浠�:";
+ layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem5.TextSize = new Size(52, 14);
+ layoutControlItem5.TextToControlDistance = 5;
//
// layoutControlItem3
//
- this.layoutControlItem3.Control = this.cbLevel;
- this.layoutControlItem3.Location = new System.Drawing.Point(558, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.Size = new System.Drawing.Size(477, 34);
- this.layoutControlItem3.Text = "瀛︽牎灞傛:";
- this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem3.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem3.TextToControlDistance = 5;
+ layoutControlItem3.Control = cbLevel;
+ layoutControlItem3.Location = new Point(390, 0);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(334, 24);
+ layoutControlItem3.Text = "瀛︽牎灞傛:";
+ layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem3.TextSize = new Size(52, 14);
+ layoutControlItem3.TextToControlDistance = 5;
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.cbCity;
- this.layoutControlItem7.Location = new System.Drawing.Point(558, 34);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.Size = new System.Drawing.Size(477, 34);
- this.layoutControlItem7.Text = "鎵�灞炲煄甯�:";
- this.layoutControlItem7.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem7.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem7.TextToControlDistance = 5;
+ layoutControlItem7.Control = cbCity;
+ layoutControlItem7.Location = new Point(390, 24);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(334, 24);
+ layoutControlItem7.Text = "鎵�灞炲煄甯�:";
+ layoutControlItem7.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem7.TextSize = new Size(52, 14);
+ layoutControlItem7.TextToControlDistance = 5;
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.cbDist;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 68);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.Size = new System.Drawing.Size(465, 34);
- this.layoutControlItem9.Text = "鎵�灞炲尯鍘�:";
- this.layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem9.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem9.TextToControlDistance = 5;
+ layoutControlItem9.Control = cbDist;
+ layoutControlItem9.Location = new Point(0, 48);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(325, 24);
+ layoutControlItem9.Text = "鎵�灞炲尯鍘�:";
+ layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem9.TextSize = new Size(52, 14);
+ layoutControlItem9.TextToControlDistance = 5;
//
// layoutControlItem2
//
- this.layoutControlItem2.Control = this.txtAddress;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 102);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(1035, 121);
- this.layoutControlItem2.Text = "璇︾粏鍦板潃:";
- this.layoutControlItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem2.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem2.TextToControlDistance = 5;
+ layoutControlItem2.Control = txtAddress;
+ layoutControlItem2.Location = new Point(0, 72);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(724, 70);
+ layoutControlItem2.Text = "璇︾粏鍦板潃:";
+ layoutControlItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem2.TextSize = new Size(52, 14);
+ layoutControlItem2.TextToControlDistance = 5;
//
// layoutControlItem11
//
- this.layoutControlItem11.Control = this.cbSchoolType;
- this.layoutControlItem11.Location = new System.Drawing.Point(558, 68);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.Size = new System.Drawing.Size(477, 34);
- this.layoutControlItem11.Text = "瀛︽牎绫诲瀷:";
- this.layoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
- this.layoutControlItem11.TextSize = new System.Drawing.Size(78, 22);
- this.layoutControlItem11.TextToControlDistance = 5;
+ layoutControlItem11.Control = cbSchoolType;
+ layoutControlItem11.Location = new Point(390, 48);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(334, 24);
+ layoutControlItem11.Text = "瀛︽牎绫诲瀷:";
+ layoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+ layoutControlItem11.TextSize = new Size(52, 14);
+ layoutControlItem11.TextToControlDistance = 5;
//
// emptySpaceItem1
//
- this.emptySpaceItem1.AllowHotTrack = false;
- this.emptySpaceItem1.Location = new System.Drawing.Point(465, 0);
- this.emptySpaceItem1.Name = "emptySpaceItem1";
- this.emptySpaceItem1.Size = new System.Drawing.Size(93, 102);
- this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
+ emptySpaceItem1.AllowHotTrack = false;
+ emptySpaceItem1.Location = new Point(325, 0);
+ emptySpaceItem1.Name = "emptySpaceItem1";
+ emptySpaceItem1.Size = new Size(65, 72);
+ emptySpaceItem1.TextSize = new Size(0, 0);
//
// SchoolWizardForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.layoutControl1);
- this.Name = "SchoolWizardForm";
- this.Size = new System.Drawing.Size(1063, 255);
- ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
- this.layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbLevel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbArea.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbCity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbDist.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cbSchoolType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtAddress.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
- this.ResumeLayout(false);
-
+ AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleMode = AutoScaleMode.Font;
+ Controls.Add(layoutControl1);
+ Margin = new Padding(2);
+ Name = "SchoolWizardForm";
+ Size = new Size(744, 162);
+ ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+ layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)txtName.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)cbLevel.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)cbArea.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)cbCity.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)cbDist.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)cbSchoolType.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)txtAddress.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)Root).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
+ ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+ ResumeLayout(false);
}
#endregion
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.resx b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.resx
index 1af7de1..a395bff 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.resx
+++ b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/SchoolWizardForm.resx
@@ -1,24 +1,24 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
+ <!--
Microsoft ResX Schema
-
+
Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
associated with the data types.
-
+
Example:
-
+
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
-
- There are any number of "resheader" rows that contain simple
+
+ There are any number of "resheader" rows that contain simple
name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
-
+
mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
+ value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
+ value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
+ value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
diff --git a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/ShopWizardForm.Designer.cs b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/ShopWizardForm.Designer.cs
index fee1e71..230ff7d 100644
--- a/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/ShopWizardForm.Designer.cs
+++ b/WinFrm/ISupply.WinFrm.Main/basic/_UserControls/ShopWizardForm.Designer.cs
@@ -117,6 +117,9 @@
txtAreaSquare.Location = new Point(453, 12);
txtAreaSquare.Margin = new Padding(2);
txtAreaSquare.Name = "txtAreaSquare";
+ txtAreaSquare.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtAreaSquare.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtAreaSquare.Properties.MaskSettings.Set("mask", "f");
txtAreaSquare.Size = new Size(248, 20);
txtAreaSquare.StyleController = layoutControl1;
txtAreaSquare.TabIndex = 152;
@@ -139,6 +142,9 @@
txtFloor.Location = new Point(73, 36);
txtFloor.Margin = new Padding(2);
txtFloor.Name = "txtFloor";
+ txtFloor.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtFloor.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtFloor.Properties.MaskSettings.Set("mask", "d");
txtFloor.Size = new Size(220, 20);
txtFloor.StyleController = layoutControl1;
txtFloor.TabIndex = 148;
--
Gitblit v1.9.3