From 23e55c258ae5ef93a8d684be60271d1af9e730c9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 20 十一月 2024 15:52:27 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   84 +++++++++++++++++++++++++-----------------
 1 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index ba0b8a3..c63ce61 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,8 +52,6 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
-
-
 
 
         /// <summary>
@@ -63,8 +62,6 @@
             base.OnCreateControl();
             if (Parent != null) getNamespace();
         }
-
-
 
         private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -179,19 +176,20 @@
 
             if (string.IsNullOrEmpty(guidKey))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                //  MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
+            else {
+                if (string.IsNullOrEmpty(chkParameter))
+                {
+                    MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+                    return;
+                }
 
-            if (string.IsNullOrEmpty(chkParameter))
-            {
-                MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-                return;
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶅鏍稿悧锛�"))
+                    return;
+                _ckService(0.ToString());
             }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶅鏍稿悧锛�"))
-                return;
-            _ckService(0.ToString());
         }
 
         private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
@@ -201,21 +199,37 @@
             else
                 return;
 
-            if (string.IsNullOrEmpty(guidKey))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
             if (string.IsNullOrEmpty(chkParameter))
             {
-                MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+                //MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
                 return;
             }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
+            else
+            {
+                if (string.IsNullOrEmpty(guidKey))
+                {
+                    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                    return;
+                }
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
+                    return;
+                _ckService(1.ToString());
+            }
+        }
+        private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnFjieAnClick != null)
+                btnFjieAnClick(this, e);
+            else
                 return;
-            _ckService(1.ToString());
+        }
+
+        private void BtnJieAn_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnJieAnClick != null)
+                btnJieAnClick(this, e);
+            else
+                return;
         }
 
 
@@ -229,7 +243,7 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            UserControl.ShowLogcs frm = new ShowLogcs();
+            UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
             frm.ShowDialog();
         }
 
@@ -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