From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 23:58:51 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index df222b5..5a8e1dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -43,33 +43,26 @@
if (int.Parse(rtnCode) > 0)
{
//妯℃澘
- var report = new Report();
+ var report = new FastReport.Report();
var buffer = (byte[])_job["rtnData"]["reportTemplateData"];
using (var Stream = new MemoryStream(buffer))
{
report.Load(Stream);
}
-
//涓昏〃
var array = new JArray();
foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
- var _zb =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
+ var _zb =JsonConvert.DeserializeObject<DataTable>(array.ToString());
_zb.TableName = "zb";
//鏄庣粏琛�1
var array1 = new JArray();
foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
- var _mx1 =
- JsonConvert.DeserializeObject<DataTable>(
- array1.ToString());
+ var _mx1 =JsonConvert.DeserializeObject<DataTable>( array1.ToString());
_mx1.TableName = "mx1";
//鏄庣粏琛�2
var array2 = new JArray();
- foreach (var a in _job["rtnData"]["mx2"]) array1.Add(a);
- var _mx2 =
- JsonConvert.DeserializeObject<DataTable>(
- array2.ToString());
+ foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
+ var _mx2 =JsonConvert.DeserializeObject<DataTable>(array2.ToString());
_mx2.TableName = "mx2";
//鍔犲埌鏁版嵁闆嗕腑
var ds = new DataSet();
@@ -84,6 +77,7 @@
else
{
MsgHelper.Warning("鎻愮ず锛�" + _job["rtnMsg"]);
+ this.Close();
}
}
catch (Exception ex)
--
Gitblit v1.9.3