From 854387d20de3afa766f08bc08f45ee7494b10281 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 11 九月 2025 14:08:17 +0800
Subject: [PATCH] 七喜代码
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 125 ++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 9b4a6ad..b62ed97 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,8 +3,12 @@
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;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -56,16 +60,26 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
- btnHb.ItemClick += BtnHb_ItemClick;
+ 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)
if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊" && item.Caption != "甯姪" && item.Caption != "淇濆瓨鐗堥潰" && item.Caption != "鍙栨秷")
lst.Add(item.Caption);
actions = lst;
+
+
+
+
}
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -110,7 +124,7 @@
}
return false;
}
-
+
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
@@ -145,7 +159,7 @@
if (btnShouHouChkClick != null)
btnShouHouChkClick(this, e);
}
-
+
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
bool bl = _isCk(0);
@@ -229,9 +243,10 @@
strType = xlsInService.Split('&')[1];
strService = xlsInService.Split('&')[0];
}
- else {
- strType = "";
- strService = xlsInService;
+ else
+ {
+ strType = "";
+ strService = xlsInService;
}
//杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
string upGuid = Guid.NewGuid().ToString();
@@ -253,7 +268,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
@@ -361,6 +376,33 @@
if (btnQueryClick != null) btnQueryClick(this, e);
}
+ private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnAllClick != null)
+ btnAllClick(this, e);
+ }
+
+ private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLianBanClick != null)
+ btnLianBanClick(this, e);
+ }
+
+ private void BtnGongZi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ 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>
@@ -398,7 +440,11 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
- lst.Add(btnHb.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
+ // lst.Add(btnEsc.Name);
+ lst.Add(btnGx.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -445,12 +491,15 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
- lst.Add(btnEdit.Name);
- lst.Add(btnHb.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);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
}
-
-
}
}
@@ -473,8 +522,8 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -530,19 +579,6 @@
{
if (btnWgClick != null) btnWgClick(this, e);
}
-
- private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
- {
-
- bool bl = _isCk(1);
- if (bl) return;
- if (btnHbClick != null)
- {
- btnHbClick(this, e);
- }
- return;
- }
-
private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -848,18 +884,6 @@
/// </summary>
public event EventHandler btnFChkClick;
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- public event EventHandler btnJianYanClick;
-
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- public event EventHandler btnFjianYanClick;
-
-
/// <summary>
/// 鎵瑰噯
/// </summary>
@@ -984,10 +1008,30 @@
public event EventHandler btnOutClick;
/// <summary>
- /// 鍚堝苟
+ /// 鎵归噺璁剧疆
/// </summary>
- public event EventHandler btnHbClick;
+ public event EventHandler btnAllClick;
+ /// <summary>
+ /// 杩炵彮璁剧疆
+ /// </summary>
+ public event EventHandler btnLianBanClick;
+
+
+ /// <summary>
+ /// 璁＄畻宸ヨ祫
+ /// </summary>
+ public event EventHandler btnGongZiClick;
+
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ public event EventHandler btnGxClick;
+
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
#endregion
#region 鍏叡灞炴��
@@ -1242,5 +1286,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3