From cf7744e9f271b675181f622f3e16b2fa5e85e7a1 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 09 八月 2025 17:42:27 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index a010583..4488ac2 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -5,6 +5,7 @@ using DevExpress.XtraLayout; 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; @@ -60,6 +61,7 @@ btnGongZi.ItemClick += BtnGongZi_ItemClick; btnLianBan.ItemClick += BtnLianBan_ItemClick; btnGx.ItemClick += BtnGx_ItemClick; + btnWeight.ItemClick += BtnWeight_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -67,8 +69,30 @@ 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> /// 鍒濆鍖栨寜閽姸鎬� @@ -428,7 +452,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"; @@ -480,8 +504,9 @@ lst.Add(btnOut.Name); lst.Add(btnGongZi.Name); lst.Add(btnLianBan.Name); - lst.Add(btnEsc.Name); + // lst.Add(btnEsc.Name); lst.Add(btnGx.Name); + lst.Add(btnWeight.Name); _enabledBtn(lst); } } @@ -506,8 +531,8 @@ lst.Add(btnHelp.Name); lst.Add(btnLayout.Name); lst.Add(btnFont.Name); - lst.Add(btnFont.Name); lst.Add(btnLog.Name); + lst.Add(btnWeight.Name); _enabledBtn(lst); this.currentAction = "edit"; if (btnEdtClick != null) btnEdtClick(this, e); @@ -535,6 +560,7 @@ 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); -- Gitblit v1.9.3