From 182dad777e934534f6876ddc1fa5f5b453b37eea Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 10 十二月 2024 23:13:51 +0800 Subject: [PATCH] 1 --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 461 +++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 334 insertions(+), 127 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 2a60adb..5b452bf 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -19,16 +19,13 @@ { public UcToolBarMenu() { - InitializeComponent(); btnAdd.ItemClick += BtnAdd_ItemClick; btnDel.ItemClick += BtnDel_ItemClick; 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; btnReport.ItemClick += BtnReport_ItemClick; btnDesign.ItemClick += BtnDesign_ItemClick; @@ -40,14 +37,25 @@ btnFjianYan.ItemClick += BtnFjianYan_ItemClick; btnPiZhun.ItemClick += BtnPiZhun_ItemClick; btnLog.ItemClick += BtnLog_ItemClick; + btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick; + btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick; + btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick; + btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick; + btnBoHui.ItemClick += BtnBoHui_ItemClick; + btnJieAn.ItemClick += BtnJieAn_ItemClick; + btnFjieAn.ItemClick += BtnFjieAn_ItemClick; + btnTzbl.ItemClick += BtnTzbl_ItemClick; + btnKg.ItemClick += BtnKg_ItemClick; + btnZhongTai.ItemClick += BtnbZhongTai_ItemClick; + btnWg.ItemClick += BtnWg_ItemClick; + btnHelp.ItemClick += BtnHelp_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) - if (!string.IsNullOrEmpty(item.Caption)) + if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊") lst.Add(item.Caption); actions = lst; } - /// <summary> @@ -59,52 +67,141 @@ if (Parent != null) getNamespace(); } + private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnBoHuiClick != null) + btnBoHuiClick(this, e); + //if (string.IsNullOrEmpty(guidKey)) + //{ + // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + // return; + //} + + //if (string.IsNullOrEmpty(chkParameter)) + //{ + // MsgHelper.ShowError("娌℃湁鎸囧畾椹冲洖鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); + // return; + //} + + //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾椹冲洖閲嶆鍚楋紵")) + // return; + //_ckService("5"); + } + private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e) + { + 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; + //} + + //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵")) + // return; + //_ckService("2"); + } + + 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) + { + if (btnZhiLiangChkClick != null) + btnZhiLiangChkClick(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 BtnFchk_ItemClick(object sender, ItemClickEventArgs e) { if (btnFChkClick != null) + { btnFChkClick(this, e); - else - return; - - if (string.IsNullOrEmpty(guidKey)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; } - - if (string.IsNullOrEmpty(chkParameter)) - { - MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - return; - } - - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶅鏍稿悧锛�")) - return; - _ckService(0.ToString()); + return; } private void BtnChk_ItemClick(object sender, ItemClickEventArgs e) { if (btnChkClick != null) + { btnChkClick(this, e); + } + return; + } + private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnFjieAnClick != null) + btnFjieAnClick(this, e); else return; + } - if (string.IsNullOrEmpty(guidKey)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + private void BtnJieAn_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnJieAnClick != null) + btnJieAnClick(this, e); + else return; - } - - if (string.IsNullOrEmpty(chkParameter)) - { - MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - return; - } - - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵")) - return; - _ckService(1.ToString()); } @@ -118,7 +215,7 @@ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - UserControl.ShowLogcs frm = new ShowLogcs(); + UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey); frm.ShowDialog(); } @@ -133,22 +230,21 @@ btnFjianYanClick(this, e); else return; + //if (string.IsNullOrEmpty(guidKey)) + //{ + // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + // return; + //} - if (string.IsNullOrEmpty(guidKey)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } + //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 BtnJianYan_ItemClick(object sender, ItemClickEventArgs e) @@ -158,29 +254,29 @@ else return; - if (string.IsNullOrEmpty(guidKey)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } + //if (string.IsNullOrEmpty(guidKey)) + //{ + // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + // return; + //} - if (string.IsNullOrEmpty(chkParameter)) - { - MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - return; - } + //if (string.IsNullOrEmpty(chkParameter)) + //{ + // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); + // return; + //} - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�")) - return; - var _obj = new - { - guid = guidKey, - parameter = chkParameter - }; - _ckService(1.ToString()); + //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�")) + // return; + //var _obj = new + //{ + // guid = guidKey, + // parameter = chkParameter + //}; + //_ckService(1.ToString()); } - private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e) + private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e) { if (string.IsNullOrEmpty(xlsInService)) { @@ -266,18 +362,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; } @@ -286,24 +388,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(); } @@ -311,7 +416,7 @@ { if (btnQueryClick != null) btnQueryClick(this, e); } - + private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e) { if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?")) @@ -321,26 +426,24 @@ lst.Add(btnEdit.Name); lst.Add(btnLoad.Name); lst.Add(btnDel.Name); - lst.Add(btnRole.Name); lst.Add(btnQuery.Name); lst.Add(btnReport.Name); lst.Add(btnDesign.Name); lst.Add(btnChk.Name); lst.Add(btnFchk.Name); - lst.Add(btnLoad.Name); lst.Add(btnJianYan.Name); lst.Add(btnFjianYan.Name); lst.Add(btnOut.Name); lst.Add(btnIn.Name); + lst.Add(btnLog.Name); + lst.Add(btnPiZhun.Name); + lst.Add(btnHelp.Name); _enabledBtn(lst); if (btnEscClick != null) btnEscClick(this, e); } } - private void BtnKG_ItemClick(object sender, ItemClickEventArgs e) - { - if (btnKGClick != null) btnKGClick(this, e); - } + private void BtnSave_ItemClick(object sender, ItemClickEventArgs e) { @@ -372,6 +475,7 @@ var lst = new List<string>(); lst.Add(btnSave.Name); lst.Add(btnEsc.Name); + lst.Add(btnHelp.Name); _enabledBtn(lst); if (btnEdtClick != null) btnEdtClick(this, e); } @@ -390,6 +494,7 @@ var lst = new List<string>(); lst.Add(btnSave.Name); lst.Add(btnEsc.Name); + lst.Add(btnHelp.Name); _enabledBtn(lst); if (btnAddClick != null) btnAddClick(this, e); } @@ -402,6 +507,58 @@ //setBtn(lst); if (btnRoleClick != null) btnRoleClick(this, e); } + + private void BtnWg_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnWgClick != null) btnWgClick(this, e); + } + + + + private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnZhongTaiClick != null) btnZhongTaiClick(this, e); + } + + private void BtnKg_ItemClick(object sender, ItemClickEventArgs e) + { + + if (btnKgClick != null) btnKgClick(this, e); + } + + private void BtnTzbl_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnTzblClick != null) btnTzblClick(this, e); + } + private void BtnHelp_ItemClick(object sender, ItemClickEventArgs e) + { + var _formNamespace = ""; + Control parentControl = this; + while (parentControl.Parent != null) + { + if (parentControl.Parent is Form parentForm) + { + var formType = parentForm.GetType(); + _formNamespace = formType.FullName; + break; + } + parentControl = parentControl.Parent; + } + string strReturn = UtilityHelper.HttpPost("", + "MenuAction/GetHelpFile", + JsonConvert.SerializeObject(_formNamespace)); + var _rtnJson = UtilityHelper.ReturnToDynamic(strReturn); + if (_rtnJson.rtnCode > 0) + { + var urlPath = _rtnJson.rtnData.ToString(); + Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath); + frm.ShowDialog(); + return; + } + Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg); + + } + private void _enabledBtn(List<string> lstBtn) { @@ -430,7 +587,6 @@ _formNamespace = formType.FullName; break; } - parentControl = parentControl.Parent; } @@ -498,20 +654,20 @@ } ///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(鎻愪氦妫�楠�)锛� - if (item.Caption == "鎻愪氦妫�楠�") - { - var ld1 = dt.AsEnumerable().Any( - row => row.Field<string>("name") == "鎻愪氦妫�楠�" - ); - if (ld1) - { - btnJianYan.Visibility = btnFjianYan.Visibility = - btnLoad.Visibility = BarItemVisibility.Always; - btnJianYan.Visibility = BarItemVisibility.Always; - _enabledList.Add(item.Name); - continue; - } - } + //if (item.Caption == "鎻愪氦妫�楠�") + //{ + // var ld1 = dt.AsEnumerable().Any( + // row => row.Field<string>("name") == "鎻愪氦妫�楠�" + // ); + // if (ld1) + // { + // btnJianYan.Visibility = btnFjianYan.Visibility = + // btnLoad.Visibility = BarItemVisibility.Always; + // btnJianYan.Visibility = BarItemVisibility.Always; + // _enabledList.Add(item.Name); + // continue; + // } + //} //鎸夐挳鏄惁鍦ㄦ潈闄愯〃涓� var exists = dt.AsEnumerable().Any(row => @@ -528,7 +684,8 @@ } //榛樿鍚敤鐨勬寜閽� - // _enabledList.Add(btnDesign.Name); + _enabledList.Add(btnLoad.Name); + _enabledList.Add(btnHelp.Name); _enabledBtn(_enabledList); } catch (Exception ex) @@ -558,9 +715,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; @@ -571,26 +730,9 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); return true; } - return false; } - - private void _ckService(string _ckValue) - { - var _obj = new - { - guid = guidKey, - parameter = chkParameter, - ckValue = _ckValue - }; - var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString()); - if (_rtn.rtnCode > 0) - { - } - } + #region 鍏叡浜嬩欢 @@ -624,10 +766,6 @@ /// </summary> public event EventHandler btnEscClick; - /// <summary> - /// 寮�宸� - /// </summary> - public event EventHandler btnKGClick; /// <summary> /// 鏉冮檺 @@ -672,6 +810,75 @@ /// </summary> public event EventHandler btnLogClick; + + /// <summary> + /// 閲囪喘瀹℃牳 + /// </summary> + public event EventHandler btnCaiGouChkClick; + + /// <summary> + /// 閲囪喘鍙嶅鏍� + /// </summary> + public event EventHandler btnCaiGouFchkClick; + + /// <summary> + /// 璐ㄩ噺瀹℃牳 + /// </summary> + public event EventHandler btnZhiLiangChkClick; + + + /// <summary> + /// 璐ㄩ噺鍙嶅鏍� + /// </summary> + public event EventHandler btnZhiLiangFchkClick; + + /// <summary> + /// 椹冲洖 + /// </summary> + public event EventHandler btnBoHuiClick; + + /// <summary> + /// 璁剧疆鎶ヨ〃 + /// </summary> + public event EventHandler btnDesignClick; + + /// <summary> + /// 鎶ヨ〃 + /// </summary> + public event EventHandler btnReportClick; + + /// <summary> + /// 缁撴 + /// </summary> + public event EventHandler btnJieAnClick; + + /// <summary> + /// 鍙嶇粨妗� + /// </summary> + public event EventHandler btnFjieAnClick; + + + /// <summary> + /// 寮�宸� + /// </summary> + public event EventHandler btnKgClick; + + /// <summary> + /// 閫氱煡澶囨枡 + /// </summary> + public event EventHandler btnTzblClick; + + /// <summary> + /// 鐘舵�� + /// </summary> + public event EventHandler btnZhongTaiClick; + + /// <summary> + /// 鎵嬪姩瀹屽伐 + /// </summary> + public event EventHandler btnWgClick; + + #endregion #region 鍏叡灞炴�� @@ -704,12 +911,12 @@ public string xlsInService { get; set; } /// <summary> - /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY,check_date,check_status,check_by,瀛樺偍杩囩▼鍚� + /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY(琛ㄥ悕),check_date(鏃堕棿),check_status(鐘舵��),check_by(瀹℃牳浜�),瀛樺偍杩囩▼鍚� /// </summary> public string chkParameter { get; set; } #endregion - + } } \ No newline at end of file -- Gitblit v1.9.3