From bf55ffb1b04c3b0589f49e524a9c1e163595b5e4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 25 十一月 2024 14:15:07 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 203 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 151 insertions(+), 52 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c43e44e..2e39bb8 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,16 @@
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
btnBoHui.ItemClick += BtnBoHui_ItemClick;
- btnPrint.ItemClick += BtnPrint_ItemClick;
+ btnJieAn.ItemClick += BtnJieAn_ItemClick;
+ btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
+ btnTzbl.ItemClick += BtnTzbl_ItemClick;
+ btnKg.ItemClick += BtnKg_ItemClick;
+ btnDkg.ItemClick += BtnDkg_ItemClick;
+ btnZanTing.ItemClick += BtnZanTing_ItemClick;
+ btnBdll.ItemClick += BtnBdll_ItemClick;
+ btnWg.ItemClick += BtnWg_ItemClick;
+
+
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -53,9 +61,7 @@
actions = lst;
}
-
-
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -64,13 +70,6 @@
base.OnCreateControl();
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)
{
@@ -185,19 +184,21 @@
if (string.IsNullOrEmpty(guidKey))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- if (string.IsNullOrEmpty(chkParameter))
+ else
{
- 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)
@@ -207,21 +208,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;
}
@@ -235,7 +252,7 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UserControl.ShowLogcs frm = new ShowLogcs();
+ UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
frm.ShowDialog();
}
@@ -382,18 +399,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 +425,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 +480,7 @@
}
}
- private void BtnKG_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnKGClick != null) btnKGClick(this, e);
- }
+
private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -518,6 +541,37 @@
//lst.Add(btnEsc.Name);
//setBtn(lst);
if (btnRoleClick != null) btnRoleClick(this, e);
+ }
+
+ private void BtnWg_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnWgClick != null) btnWgClick(this, e);
+ }
+
+ private void BtnBdll_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBdllClick != null) btnBdllClick(this, e);
+ }
+
+ private void BtnZanTing_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnZanTingClick != null) btnZanTingClick(this, e);
+ }
+
+ private void BtnDkg_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBtnDkgClick != null) btnBtnDkgClick(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 _enabledBtn(List<string> lstBtn)
@@ -675,9 +729,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;
@@ -688,7 +744,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
return true;
}
-
return false;
}
@@ -741,10 +796,6 @@
/// </summary>
public event EventHandler btnEscClick;
- /// <summary>
- /// 寮�宸�
- /// </summary>
- public event EventHandler btnKGClick;
/// <summary>
/// 鏉冮檺
@@ -816,8 +867,56 @@
/// </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;
+
+
+ /// <summary>
+ /// 寮�宸�
+ /// </summary>
+ public event EventHandler btnKgClick;
+
+ /// <summary>
+ /// 閫氱煡澶囨枡
+ /// </summary>
+ public event EventHandler btnTzblClick;
+
+ /// <summary>
+ /// 寰呭紑宸�
+ /// </summary>
+ public event EventHandler btnBtnDkgClick;
+
+ /// <summary>
+ /// 宸ュ崟鏆傚仠
+ /// </summary>
+ public event EventHandler btnZanTingClick;
+
+ /// <summary>
+ /// 澶囧崟棰嗘枡
+ /// </summary>
+ public event EventHandler btnBdllClick;
+
+ /// <summary>
+ /// 鎵嬪姩瀹屽伐
+ /// </summary>
+ public event EventHandler btnWgClick;
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3