From 4bca678c092d53d53140fab2ce25363026cbc6ec Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 10 十一月 2024 11:19:02 +0800
Subject: [PATCH] 打印
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c43e44e..b595b7b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -44,7 +44,6 @@
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
btnBoHui.ItemClick += BtnBoHui_ItemClick;
- btnPrint.ItemClick += BtnPrint_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -53,7 +52,7 @@
actions = lst;
}
-
+
/// <summary>
@@ -65,11 +64,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)
@@ -382,17 +376,23 @@
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);
+ var frm = new RptPreview(guidKey, rptParameter);
frm.Show();
return;
}
@@ -402,24 +402,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);
+ var frm = new EasyRptDesign(guidKey, rptParameter);
frm.Show();
return;
}
-
//鍚﹀垯鍚戝璁捐妯℃澘
- var rptWizard = new ShowRptWizard(rptParameter);
+ var rptWizard = new ShowRptWizard(guidKey, rptParameter);
rptWizard.ShowDialog();
}
@@ -675,9 +678,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 +821,20 @@
/// </summary>
public event EventHandler btnBoHuiClick;
-
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
public event EventHandler btnPrintClick;
+
+ /// <summary>
+ /// 璁剧疆鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnDesignClick;
+
+ /// <summary>
+ /// 鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnReportClick;
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3