From 4c09363b9dc423003848ae4861414e5357129bfb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 六月 2025 16:44:49 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
index 272e9c8..7762687 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
@@ -1,16 +1,10 @@
锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -43,9 +37,11 @@
btn.Name = Guid.NewGuid().ToString();
btn.Size = new System.Drawing.Size(150, 150);
btn.TabIndex = 1;
- btn.Text = row["reportName"].ToString()+"(" + row["reportType"].ToString() + ")";
+ btn.Text = row["reportType"].ToString() + "\n" + row["reportName"].ToString();
btn.Margin = new System.Windows.Forms.Padding(20);
+ btn.Tag = row["reportType"].ToString() + "{}";
this.flowLayoutPanel1.Controls.Add(btn);
+ btn.Click += Btn_Click;
}
}
catch (Exception ex)
@@ -53,5 +49,53 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void Btn_Click(object sender, EventArgs e)
+ {
+ string _guid = Guid.NewGuid().ToString();
+ SimpleButton btn = (SimpleButton)sender;
+ string rptParameter = btn.Tag.ToString();
+ if (string.IsNullOrEmpty(rptParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ return;
+ }
+ var _bl = false;
+ _bl = _ckRptService(_guid, rptParameter);
+ //濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
+ if (_bl)
+ {
+ var frm = new EasyRptDesign(_guid, rptParameter);
+ frm.ShowDialog();
+ return;
+ }
+ //鍚﹀垯鍚戝璁捐妯℃澘
+ var rptWizard = new ShowRptWizard(_guid, rptParameter);
+ rptWizard.ShowDialog();
+ }
+
+ private bool _ckRptService(string _guid, string rptParameter)
+ {
+ try
+ {
+ var _obj = new
+ {
+ guid = _guid,
+ rptParameter,
+ isDesign = 1
+ };
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) return true;
+ return false;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ return false;
+ }
+ return false;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3