From d75f7beb48ed16f7d975b86e66ab347b79e315de Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 19 十一月 2024 15:51:49 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b595b7b..ebeb35a 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -25,7 +25,6 @@
             btnEdit.ItemClick += BtnEdit_ItemClick;
             btnLoad.ItemClick += BtnLoad_ItemClick;
             btnSave.ItemClick += BtnSave_ItemClick;
-            btnKG.ItemClick += BtnKG_ItemClick;
             btnEsc.ItemClick += BtnEsc_ItemClick;
             btnRole.ItemClick += BtnRole_ItemClick;
             btnQuery.ItemClick += BtnQuery_ItemClick;
@@ -44,6 +43,8 @@
             btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
             btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
             btnBoHui.ItemClick += BtnBoHui_ItemClick;
+            btnJieAn.ItemClick += BtnJieAn_ItemClick;
+            btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -51,9 +52,7 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
-
-
-
+ 
 
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
@@ -217,6 +216,21 @@
                 return;
             _ckService(1.ToString());
         }
+        private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnFjieAnClick != null)
+                btnFjieAnClick(this, e);
+            else
+                return;
+        }
+
+        private void BtnJieAn_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnJieAnClick != null)
+                btnJieAnClick(this, e);
+            else
+                return;
+        }
 
 
         private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
@@ -229,7 +243,7 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            UserControl.ShowLogcs frm = new ShowLogcs();
+            UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
             frm.ShowDialog();
         }
 
@@ -393,7 +407,7 @@
             if (_bl)
             {
                 var frm = new RptPreview(guidKey, rptParameter);
-                frm.Show();
+                frm.ShowDialog();
                 return;
             }
 
@@ -418,7 +432,7 @@
             if (_bl)
             {
                 var frm = new EasyRptDesign(guidKey, rptParameter);
-                frm.Show();
+                frm.ShowDialog();
                 return;
             }
             //鍚﹀垯鍚戝璁捐妯℃澘
@@ -457,10 +471,7 @@
             }
         }
 
-        private void BtnKG_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            if (btnKGClick != null) btnKGClick(this, e);
-        }
+       
 
         private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -822,11 +833,6 @@
         public event EventHandler btnBoHuiClick;
 
         /// <summary>
-        /// 鎵撳嵃
-        /// </summary>
-        public event EventHandler btnPrintClick;
-
-        /// <summary>
         /// 璁剧疆鎶ヨ〃
         /// </summary>
         public event EventHandler btnDesignClick;
@@ -835,6 +841,16 @@
         /// 鎶ヨ〃
         /// </summary>
         public event EventHandler btnReportClick;
+
+        /// <summary>
+        /// 缁撴
+        /// </summary>
+        public event EventHandler btnJieAnClick;
+
+        /// <summary>
+        /// 鍙嶇粨妗�
+        /// </summary>
+        public event EventHandler btnFjieAnClick;
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3