From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 85 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index bd2410e..d3ffe88 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,9 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
+using DevExpress.XtraWaitForm;
+using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.Work;
@@ -61,7 +64,10 @@
btnGongZi.ItemClick += BtnGongZi_ItemClick;
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_ItemClick;
- btnWeight.ItemClick += BtnWeight_ItemClick;
+ btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
+ btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
+ btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
+
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -69,30 +75,8 @@
lst.Add(item.Caption);
actions = lst;
}
- /// <summary>
- /// 鍚姩绉伴噸
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void BtnWeight_ItemClick(object sender, ItemClickEventArgs e)
- {
- bool isOpen = false;
- foreach (Form form in Application.OpenForms)
- {
- if (form is Frm_Work09)
- {
- isOpen = true;
- form.Activate(); // 婵�娲诲凡瀛樺湪鐨勭獥浣�
- break;
- }
- }
- if (!isOpen)
- {
- var form = new Frm_Work09(QcSeason.iqc绉伴噸.ToString());
- form.Show();
- }
- }
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -102,7 +86,6 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
-
private bool _isCk(int _type)
{
Form parentForm = this.FindForm();
@@ -138,13 +121,11 @@
}
return false;
}
-
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
}
-
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
@@ -412,6 +393,21 @@
if (btnGxClick != null)
btnGxClick(this, e);
}
+ private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBaoGaoClick != null)
+ btnBaoGaoClick(this, e);
+ }
+ private void BtnFPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPingZhiClick != null)
+ btnFPingZhiClick(this, e);
+ }
+ private void BtnPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPingZhiClick != null)
+ btnPingZhiClick(this, e);
+ }
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
@@ -452,15 +448,16 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- // lst.Add(btnEsc.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
- lst.Add(btnWeight.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
}
}
-
/// <summary>
/// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -505,9 +502,11 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- // lst.Add(btnEsc.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
- lst.Add(btnWeight.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
}
}
@@ -533,7 +532,7 @@
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
- lst.Add(btnWeight.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -561,7 +560,6 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "add";
if (btnAddClick != null) btnAddClick(this, e);
@@ -1039,6 +1037,21 @@
/// </summary>
public event EventHandler btnGxClick;
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
+
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ public event EventHandler btnPingZhiClick;
+
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ public event EventHandler btnFPingZhiClick;
+
#endregion
#region 鍏叡灞炴��
@@ -1182,7 +1195,6 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
string _formNamespace = parentForm.GetType().FullName;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
@@ -1293,5 +1305,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3