From f8ef4acfc742e9f32f0a2aa5d8bf9e122d26857f Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 08 五月 2025 14:19:52 +0800 Subject: [PATCH] fqc流程 --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 143 +++++++++++++++++++++++++++-------------------- 1 files changed, 82 insertions(+), 61 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 5f655d9..ad85a95 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -1,4 +1,15 @@ -锘縰sing System; +锘縰sing DevExpress.XtraBars; +using DevExpress.XtraEditors; +using DevExpress.XtraGrid; +using DevExpress.XtraGrid.Views.Grid; +using DevExpress.XtraLayout; +using Gs.DevApp.DevFrm.Rpt; +using Gs.DevApp.DevFrm.Sys; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -7,19 +18,6 @@ using System.Net; using System.Text; using System.Windows.Forms; -using DevExpress.XtraBars; -using DevExpress.XtraEditors; -using DevExpress.XtraEditors.TextEditController; -using DevExpress.XtraGrid; -using DevExpress.XtraGrid.Views.Grid; -using DevExpress.XtraLayout; -using DevExpress.XtraRichEdit.Export.Rtf; -using Gs.DevApp.DevFrm.Rpt; -using Gs.DevApp.DevFrm.Sys; -using Gs.DevApp.Entity; -using Gs.DevApp.ToolBox; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; namespace Gs.DevApp.UserControl { @@ -59,6 +57,12 @@ btnHelp.ItemClick += BtnHelp_ItemClick; btnLayout.ItemClick += BtnLayout_ItemClick; btnFont.ItemClick += BtnFont_ItemClick; + btnShouJian.ItemClick += BtnShouJian_ItemClick; + btnCaiWuChk.ItemClick += BtnCaiWuChk_ItemClick; + btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick; + btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick; + btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick; + btnOa.ItemClick += BtnOa_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -66,8 +70,6 @@ lst.Add(item.Caption); actions = lst; } - - /// <summary> @@ -139,63 +141,41 @@ { if (btnCaiGouFchkClick != null) btnCaiGouFchkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�")) - // return; - //_ckService("-2"); } private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e) { if (btnCaiGouChkClick != null) btnCaiGouChkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} + } - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} + private void BtnCaiWuFchk_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnCaiWuFchkClick != null) + btnCaiWuFchkClick(this, e); + } - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵")) - // return; - //_ckService("2"); + private void BtnCaiWuChk_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnCaiWuChkClick != null) + btnCaiWuChkClick(this, e); + } + private void BtnShouHouFchk_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnShouHouFchkClick != null) + btnShouHouFchkClick(this, e); + } + + private void BtnShouHouChk_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnShouHouChkClick != null) + btnShouHouChkClick(this, e); } private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e) { if (btnZhiLiangFchkClick != null) btnZhiLiangFchkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�")) - // return; - //_ckService("-3"); } private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e) @@ -330,6 +310,13 @@ // parameter = chkParameter //}; //_ckService(1.ToString()); + } + private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnShouJianClick != null) + btnShouJianClick(this, e); + else + return; } private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e) @@ -473,6 +460,10 @@ if (btnQueryClick != null) btnQueryClick(this, e); } + private void BtnOa_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnOaClick != null) btnOaClick(this, e); + } private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e) { if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?")) @@ -972,6 +963,29 @@ /// </summary> public event EventHandler btnZhiLiangFchkClick; + + /// <summary> + /// 璐㈠姟瀹℃牳 + /// </summary> + public event EventHandler btnCaiWuChkClick; + + + /// <summary> + /// 璐㈠姟鍙嶅鏍� + /// </summary> + public event EventHandler btnCaiWuFchkClick; + + /// <summary> + /// 鍞悗瀹℃牳 + /// </summary> + public event EventHandler btnShouHouChkClick; + + + /// <summary> + /// 鍞悗鍙嶅鏍� + /// </summary> + public event EventHandler btnShouHouFchkClick; + /// <summary> /// 椹冲洖 /// </summary> @@ -1018,8 +1032,15 @@ /// </summary> public event EventHandler btnWgClick; + /// <summary> + /// 鐢熸垚棣栨 + /// </summary> + public event EventHandler btnShouJianClick; - //public event EventHandler btnLayoutClick; + /// <summary> + /// 鍙戦�丱A + /// </summary> + public event EventHandler btnOaClick; #endregion @@ -1230,7 +1251,7 @@ { spt.RestoreLayoutFromStream(stream); } - // spt.Horizontal = false; + // spt.Horizontal = false; spt.Panel1.AutoScroll = false; spt.Panel2.AutoScroll = false; //spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100); -- Gitblit v1.9.3