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 |   85 +++++++++++++++++++++++++++++-------------
 1 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c43e44e..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,7 +43,8 @@
             btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
             btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
             btnBoHui.ItemClick += BtnBoHui_ItemClick;
-            btnPrint.ItemClick += BtnPrint_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)
@@ -52,9 +52,7 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
-
-       
-
+ 
 
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
@@ -65,11 +63,6 @@
             if (Parent != null) getNamespace();
         }
 
-        private void BtnPrint_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            if (btnPrintClick != null)
-                btnPrintClick(this, e);
-        }
 
 
         private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
@@ -223,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)
@@ -235,7 +243,7 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            UserControl.ShowLogcs frm = new ShowLogcs();
+            UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
             frm.ShowDialog();
         }
 
@@ -382,18 +390,24 @@
 
         private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
         {
+            if (btnReportClick != null)
+                btnReportClick(this, e);
+            else
+                return;
+
+            if (rptParameter == "return false")
+                return;
             if (string.IsNullOrEmpty(rptParameter))
             {
                 MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
                 return;
             }
-
             var _bl = false;
             _bl = _ckRptService();
             if (_bl)
             {
-                var frm = new RptPreview(rptParameter);
-                frm.Show();
+                var frm = new RptPreview(guidKey, rptParameter);
+                frm.ShowDialog();
                 return;
             }
 
@@ -402,24 +416,27 @@
 
         private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
         {
+            if (btnDesignClick != null)
+                btnDesignClick(this, e);
+            else
+                return;
+
             if (string.IsNullOrEmpty(rptParameter))
             {
                 MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
                 return;
             }
-
             var _bl = false;
             _bl = _ckRptService();
             //濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
             if (_bl)
             {
-                var frm = new EasyRptDesign(rptParameter);
-                frm.Show();
+                var frm = new EasyRptDesign(guidKey, rptParameter);
+                frm.ShowDialog();
                 return;
             }
-
             //鍚﹀垯鍚戝璁捐妯℃澘
-            var rptWizard = new ShowRptWizard(rptParameter);
+            var rptWizard = new ShowRptWizard(guidKey, rptParameter);
             rptWizard.ShowDialog();
         }
 
@@ -454,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)
         {
@@ -675,9 +689,11 @@
             {
                 var _obj = new
                 {
-                    rptParameter
+                    guid = guidKey,
+                    rptParameter,
+                    isDesign = 1
                 };
-                var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+                var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0) return true;
@@ -816,8 +832,25 @@
         /// </summary>
         public event EventHandler btnBoHuiClick;
 
+        /// <summary>
+        /// 璁剧疆鎶ヨ〃
+        /// </summary>
+        public event EventHandler btnDesignClick;
 
-        public event EventHandler btnPrintClick;
+        /// <summary>
+        /// 鎶ヨ〃
+        /// </summary>
+        public event EventHandler btnReportClick;
+
+        /// <summary>
+        /// 缁撴
+        /// </summary>
+        public event EventHandler btnJieAnClick;
+
+        /// <summary>
+        /// 鍙嶇粨妗�
+        /// </summary>
+        public event EventHandler btnFjieAnClick;
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3