From 734ba49ea1c7e3a1b6b3d5edbc023842339a82a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 13 九月 2025 16:25:09 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   72 +++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index dc8dd2f..b6bd2cc 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;
@@ -59,6 +63,11 @@
             btnAll.ItemClick += BtnAll_ItemClick;
             btnGongZi.ItemClick += BtnGongZi_ItemClick;
             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)
@@ -66,6 +75,8 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
+
+      
 
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
@@ -75,7 +86,6 @@
             base.OnCreateControl();
             if (Parent != null) getNamespace();
         }
-
         private bool _isCk(int _type)
         {
             Form parentForm = this.FindForm();
@@ -111,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)
@@ -328,7 +336,6 @@
                 frm.ShowDialog();
                 return;
             }
-
             MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
         }
 
@@ -368,7 +375,6 @@
             if (btnAllClick != null)
                 btnAllClick(this, e);
         }
-
         private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnLianBanClick != null)
@@ -380,7 +386,26 @@
             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);
+        }
+        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>
         /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
@@ -421,12 +446,16 @@
                 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);
                 _enabledBtn(lst);
                 this.currentAction = "esc";
                 if (btnEscClick != null) btnEscClick(this, e);
             }
         }
-
 
         /// <summary>
         /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -471,6 +500,11 @@
                     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);
                     _enabledBtn(lst);
                 }
             }
@@ -495,8 +529,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);
@@ -996,6 +1030,26 @@
         /// </summary>
         public event EventHandler btnGongZiClick;
 
+        /// <summary>
+        /// 宸ュ簭鍙樻洿
+        /// </summary>
+        public event EventHandler btnGxClick;
+
+        /// <summary>
+        /// 鐢熸垚鎶ュ憡
+        /// </summary>
+        public event EventHandler btnBaoGaoClick;
+
+        /// <summary>
+        ///     鍝佽川
+        /// </summary>
+        public event EventHandler btnPingZhiClick;
+
+        /// <summary>
+        ///    鍙嶅搧璐�
+        /// </summary>
+        public event EventHandler btnFPingZhiClick;
+      
         #endregion
 
         #region 鍏叡灞炴��
@@ -1139,7 +1193,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();
@@ -1250,5 +1303,6 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+ 
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3