From cc286e3641ef72fe7cb1312487a6d4e40bda81fe Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 99d6298..da1b4e2 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,7 @@
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;
@@ -61,7 +62,7 @@
btnGongZi.ItemClick += BtnGongZi_ItemClick;
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_ItemClick;
- btnWeight.ItemClick += BtnWeight_ItemClick;
+ btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -69,18 +70,10 @@
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)
- {
- var frm = new Frm_Work09();
- frm.Show();
- }
+
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -399,7 +392,11 @@
if (btnGxClick != null)
btnGxClick(this, e);
}
-
+ private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBaoGaoClick != null)
+ btnBaoGaoClick(this, e);
+ }
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -439,7 +436,7 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- lst.Add(btnEsc.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
_enabledBtn(lst);
this.currentAction = "esc";
@@ -491,7 +488,7 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- lst.Add(btnEsc.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
_enabledBtn(lst);
}
@@ -516,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);
@@ -1023,6 +1019,10 @@
/// </summary>
public event EventHandler btnGxClick;
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3