From 2ffa3cda080d1990775fe42e13ced433d27ca3e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
index 167b95f..5c48ea1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
@@ -13,9 +13,10 @@
public partial class EasyRptDesign : XtraForm
{
private readonly string _rptParameter;
-
- public EasyRptDesign(string rptParameter)
+ private readonly string _rptGuid;
+ public EasyRptDesign(string strGuid, string rptParameter)
{
+ _rptGuid = strGuid;
_rptParameter = rptParameter;
InitializeComponent();
Text = _rptParameter + "鎶ヨ〃璁捐锛氳璁℃椂璇峰弬鑰冨瓧娈佃鏄庯紝寤鸿z寮�澶翠负涓昏〃,m寮�澶翠负鏄庣粏琛�";
@@ -23,24 +24,25 @@
var RptRow = new DataTable();
var _obj = new
{
- rptParameter = _rptParameter
+ rptParameter = _rptParameter,
+ guid = _rptGuid,
+ isDesign = 1
};
try
{
- var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
var dy = _rtn.rtnData;
- if (dy.reportData.ToString().Length > 0)
+ if (dy.reportTemplateData.ToString().Length > 0)
{
- var buffer = (byte[])dy.reportData;
+ var buffer = (byte[])dy.reportTemplateData;
using (var Stream = new MemoryStream(buffer))
{
report.Load(Stream);
}
-
var d = dy.reportCol;
foreach (var a in d) listBox1.Items.Add(a);
}
--
Gitblit v1.9.3