From 9010fdfa1f7f6fe29c76111ef95d6383c74ea313 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 22 九月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 2b068ee..5a8d8f1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -312,24 +312,24 @@
btnPrintClick(this, e);
else
return;
- //2025-09-01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
- //if (rptParameter == "return false")
- // return;
- //if (string.IsNullOrEmpty(rptParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
- // return;
- //}
- //var _bl = false;
- //_bl = _ckRptService();
- //if (_bl)
- //{
- // var frm = new RptPreview(guidKey, rptParameter);
- // frm.ShowDialog();
- // return;
- //}
+ // 2025 - 09 - 01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
+ if (rptParameter == "return false")
+ return;
+ if (string.IsNullOrEmpty(rptParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ return;
+ }
+ var _bl = false;
+ _bl = _ckRptService();
+ if (_bl)
+ {
+ var frm = new RptPreview(guidKey, rptParameter);
+ frm.ShowDialog();
+ return;
+ }
- //MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
+ MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
--
Gitblit v1.9.3