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 | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 203fcb5..d3ffe88 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -3,6 +3,8 @@ 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; @@ -63,6 +65,9 @@ btnLianBan.ItemClick += BtnLianBan_ItemClick; btnGx.ItemClick += BtnGx_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) @@ -71,9 +76,8 @@ actions = lst; } + - - /// <summary> /// 鍒濆鍖栨寜閽姸鎬� /// </summary> @@ -82,7 +86,6 @@ base.OnCreateControl(); if (Parent != null) getNamespace(); } - private bool _isCk(int _type) { Form parentForm = this.FindForm(); @@ -118,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) @@ -397,6 +398,17 @@ 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> /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬� /// </summary> @@ -436,6 +448,8 @@ lst.Add(btnShouHouFchk.Name); lst.Add(btnGongZi.Name); lst.Add(btnLianBan.Name); + lst.Add(btnFPingZhi.Name); + lst.Add(btnPingZhi.Name); // lst.Add(btnEsc.Name); lst.Add(btnGx.Name); lst.Add(btnBaoGao.Name); @@ -444,7 +458,6 @@ if (btnEscClick != null) btnEscClick(this, e); } } - /// <summary> /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬� @@ -489,6 +502,8 @@ lst.Add(btnOut.Name); lst.Add(btnGongZi.Name); lst.Add(btnLianBan.Name); + lst.Add(btnFPingZhi.Name); + lst.Add(btnPingZhi.Name); // lst.Add(btnEsc.Name); lst.Add(btnGx.Name); lst.Add(btnBaoGao.Name); @@ -1026,6 +1041,17 @@ /// 鐢熸垚鎶ュ憡 /// </summary> public event EventHandler btnBaoGaoClick; + + /// <summary> + /// 鍝佽川 + /// </summary> + public event EventHandler btnPingZhiClick; + + /// <summary> + /// 鍙嶅搧璐� + /// </summary> + public event EventHandler btnFPingZhiClick; + #endregion #region 鍏叡灞炴�� @@ -1169,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(); @@ -1280,5 +1305,6 @@ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + } } \ No newline at end of file -- Gitblit v1.9.3