From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
index d64cda6..662bd38 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
@@ -4,7 +4,9 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
+using System.Collections.Generic;
using System.Data;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -18,6 +20,7 @@
private void GetList()
{
+ this.flowLayoutPanel1.Controls.Clear();
var _obj = new
{
keyType = ""
@@ -32,10 +35,15 @@
foreach (DataRow row in dt.Rows)
{
SimpleButton btn = new DevExpress.XtraEditors.SimpleButton();
- btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
+ if (row["reportType"].ToString().StartsWith("瀹㈡埛妯℃澘"))
+ {
+ btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_32x32;
+ }
+ else
+ btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
btn.Name = Guid.NewGuid().ToString();
- btn.Size = new System.Drawing.Size(150, 150);
+ btn.Size = new System.Drawing.Size(170, 170);
btn.TabIndex = 1;
btn.Text = row["reportType"].ToString() + "\n" + row["reportName"].ToString();
btn.Margin = new System.Windows.Forms.Padding(20);
@@ -56,12 +64,16 @@
btn2.Click += (s, e) =>
{
EasyRptEdtShow frm = new EasyRptEdtShow();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ GetList();
+ };
frm.ShowDialog();
};
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
--
Gitblit v1.9.3