From e60c4a36bfc4164536b6ec2a8880dd48664e82da Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 四月 2025 14:40:55 +0800
Subject: [PATCH] 多级审核
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 40 ++++++++++
DevApp/Gs.DevApp/Resources/employee_16x161.png | 0
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 77 ++++++++++++++++---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 55 ++++++-------
DevApp/Gs.DevApp/Resources/employee_32x322.png | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 4 +
DevApp/Gs.DevApp/Properties/Resources.resx | 48 +++++++----
DevApp/Gs.DevApp/Resources/user_32x321.png | 0
DevApp/Gs.DevApp/Resources/user_16x163.png | 0
9 files changed, 165 insertions(+), 59 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ff64d56..3d09d87 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1688,6 +1688,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="logo_ico.ico" />
+ <None Include="Resources\user_16x163.png" />
+ <None Include="Resources\user_32x321.png" />
<None Include="Resources\zoom100_16x161.png" />
<None Include="Resources\user_32x32.png" />
<None Include="Resources\user_16x162.png" />
@@ -1921,6 +1923,8 @@
<None Include="Resources\chartswitchrowcolumn_16x16.png" />
<None Include="Resources\inlinesizelegend_32x32.png" />
<None Include="Resources\inlinesizelegend_16x16.png" />
+ <None Include="Resources\employee_32x322.png" />
+ <None Include="Resources\employee_16x161.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 76ce8d5..b1a492e 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -943,6 +943,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap employee_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("employee_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap employee_32x32 {
get {
object obj = ResourceManager.GetObject("employee_32x32", resourceCulture);
@@ -956,6 +966,16 @@
internal static System.Drawing.Bitmap employee_32x321 {
get {
object obj = ResourceManager.GetObject("employee_32x321", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap employee_32x322 {
+ get {
+ object obj = ResourceManager.GetObject("employee_32x322", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -2423,6 +2443,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap user_16x163 {
+ get {
+ object obj = ResourceManager.GetObject("user_16x163", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap user_32x32 {
get {
object obj = ResourceManager.GetObject("user_32x32", resourceCulture);
@@ -2433,6 +2463,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap user_32x321 {
+ get {
+ object obj = ResourceManager.GetObject("user_32x321", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap usergroup_32x32 {
get {
object obj = ResourceManager.GetObject("usergroup_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index d91bb9d..46607d6 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -296,6 +296,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -308,9 +313,6 @@
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -572,8 +574,16 @@
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="user_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\user_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -610,6 +620,9 @@
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="user_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\user_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -629,6 +642,9 @@
</data>
<data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -705,9 +721,6 @@
</data>
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
- </data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -857,10 +870,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
@@ -895,6 +906,9 @@
<value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
@@ -931,8 +945,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1034,10 +1048,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -1050,7 +1062,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="employee_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\employee_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/employee_16x161.png b/DevApp/Gs.DevApp/Resources/employee_16x161.png
new file mode 100644
index 0000000..4c9d255
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/employee_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/employee_32x322.png b/DevApp/Gs.DevApp/Resources/employee_32x322.png
new file mode 100644
index 0000000..2af07b9
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/employee_32x322.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/user_16x163.png b/DevApp/Gs.DevApp/Resources/user_16x163.png
new file mode 100644
index 0000000..a683dec
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/user_16x163.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/user_32x321.png b/DevApp/Gs.DevApp/Resources/user_32x321.png
new file mode 100644
index 0000000..3a74ca6
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/user_32x321.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index d25a2cd..23498b1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -58,6 +58,7 @@
this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnTzbl = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnKg = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnShouJian = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -66,7 +67,10 @@
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnShouJian = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -120,9 +124,13 @@
this.btnLayout,
this.btnOa,
this.btnFont,
- this.btnShouJian});
+ this.btnShouJian,
+ this.btnCaiWuChk,
+ this.btnCaiWuFchk,
+ this.barLargeButtonItem1,
+ this.barLargeButtonItem2});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 58;
+ this.barManager1.MaxItemId = 62;
//
// bar2
//
@@ -166,6 +174,10 @@
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
new DevExpress.XtraBars.LinkPersistInfo(this.btnFont),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
@@ -428,6 +440,15 @@
this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnShouJian
+ //
+ this.btnShouJian.Caption = "鐢熸垚棣栨";
+ this.btnShouJian.Id = 56;
+ this.btnShouJian.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.inlinesizelegend_16x16;
+ this.btnShouJian.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.inlinesizelegend_32x32;
+ this.btnShouJian.Name = "btnShouJian";
+ this.btnShouJian.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnWg
//
this.btnWg.Caption = "鎵嬪姩瀹屽伐";
@@ -503,14 +524,41 @@
this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
this.btnHelp.Name = "btnHelp";
//
- // btnShouJian
+ // btnCaiWuChk
//
- this.btnShouJian.Caption = "鐢熸垚棣栨";
- this.btnShouJian.Id = 56;
- this.btnShouJian.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.inlinesizelegend_16x16;
- this.btnShouJian.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.inlinesizelegend_32x32;
- this.btnShouJian.Name = "btnShouJian";
- this.btnShouJian.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ this.btnCaiWuChk.Caption = "璐㈠姟瀹℃牳";
+ this.btnCaiWuChk.Id = 58;
+ this.btnCaiWuChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_32x32;
+ this.btnCaiWuChk.Name = "btnCaiWuChk";
+ this.btnCaiWuChk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnCaiWuChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnCaiWuFchk
+ //
+ this.btnCaiWuFchk.Caption = "璐㈠姟鍙嶅鏍�";
+ this.btnCaiWuFchk.Id = 59;
+ this.btnCaiWuFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insertdatafield_32x32;
+ this.btnCaiWuFchk.Name = "btnCaiWuFchk";
+ this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // barLargeButtonItem1
+ //
+ this.barLargeButtonItem1.Caption = "鍞悗瀹℃牳";
+ this.barLargeButtonItem1.Id = 60;
+ this.barLargeButtonItem1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_16x163;
+ this.barLargeButtonItem1.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.user_32x321;
+ this.barLargeButtonItem1.Name = "barLargeButtonItem1";
+ this.barLargeButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // barLargeButtonItem2
+ //
+ this.barLargeButtonItem2.Caption = "鍞悗鍙嶅鏍�";
+ this.barLargeButtonItem2.Id = 61;
+ this.barLargeButtonItem2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.employee_16x161;
+ this.barLargeButtonItem2.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.employee_32x322;
+ this.barLargeButtonItem2.Name = "barLargeButtonItem2";
+ this.barLargeButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// barDockControlTop
//
@@ -524,7 +572,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 66);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -553,7 +601,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 67);
+ this.Size = new System.Drawing.Size(1543, 66);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -601,6 +649,9 @@
private DevExpress.XtraBars.BarLargeButtonItem btnOa;
private DevExpress.XtraBars.BarLargeButtonItem btnFont;
private DevExpress.XtraBars.BarLargeButtonItem btnShouJian;
-
+ private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuChk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuFchk;
+ private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1;
+ private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem2;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 95227ab..1aa1f91 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -58,6 +58,9 @@
btnLayout.ItemClick += BtnLayout_ItemClick;
btnFont.ItemClick += BtnFont_ItemClick;
btnShouJian.ItemClick += BtnShouJian_ItemClick;
+ btnCaiWuChk.ItemClick += BtnCaiWuChk_ItemClick;
+ btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
+
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -67,6 +70,7 @@
}
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -136,42 +140,24 @@
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�"))
- // return;
- //_ckService("-2");
}
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
btnCaiGouChkClick(this, e);
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
+ }
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
+ private void BtnCaiWuFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnCaiWuFchkClick != null)
+ btnCaiWuFchkClick(this, e);
+ }
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
- // return;
- //_ckService("2");
+ private void BtnCaiWuChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnCaiWuChkClick != null)
+ btnCaiWuChkClick(this, e);
}
private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
@@ -976,6 +962,19 @@
/// </summary>
public event EventHandler btnZhiLiangFchkClick;
+
+ /// <summary>
+ /// 璐㈠姟瀹℃牳
+ /// </summary>
+ public event EventHandler btnCaiWuChkClick;
+
+
+ /// <summary>
+ /// 璐ㄩ噺鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnCaiWuFchkClick;
+
+
/// <summary>
/// 椹冲洖
/// </summary>
--
Gitblit v1.9.3