From 7e2fe692d16412e0c20a433a81cb85a3cb39cb2b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 30 八月 2025 17:07:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 4e4d283..da1b4e2 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,8 +3,10 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
+using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -59,6 +61,8 @@
btnAll.ItemClick += BtnAll_ItemClick;
btnGongZi.ItemClick += BtnGongZi_ItemClick;
btnLianBan.ItemClick += BtnLianBan_ItemClick;
+ btnGx.ItemClick += BtnGx_ItemClick;
+ btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -69,7 +73,7 @@
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -383,8 +387,16 @@
if (btnGongZiClick != null)
btnGongZiClick(this, e);
}
-
-
+ private void BtnGx_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnGxClick != null)
+ btnGxClick(this, e);
+ }
+ private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBaoGaoClick != null)
+ btnBaoGaoClick(this, e);
+ }
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -422,6 +434,10 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -470,6 +486,10 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnIn.Name);
lst.Add(btnOut.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
_enabledBtn(lst);
}
}
@@ -493,7 +513,6 @@
lst.Add(btnEsc.Name);
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
- lst.Add(btnFont.Name);
lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
_enabledBtn(lst);
@@ -995,6 +1014,15 @@
/// </summary>
public event EventHandler btnGongZiClick;
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ public event EventHandler btnGxClick;
+
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3