From b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:19:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index b2b463b..01ad6ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -1,6 +1,7 @@
锘縰sing DevExpress.Utils.MVVM.Services;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout.Customization;
+using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -41,7 +42,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //瑙ｇ粦杩芥函鐮�
+ //纭畾鍙嶅伐
btnZsm.Click += (s, e) =>
{
if (!MsgHelper.AskQuestion("纭畾鐢熸垚鏂扮殑杩芥函鐮佸悧锛�"))
@@ -70,8 +71,8 @@
}
};
//杩欐槸鎵撳嵃锛岃繖鍜屽叾瀹冮〉闈㈡槸涓嶄竴鏍风殑锛屼笉鑳藉鍒惰繖閲�
- this.ucBtnPrint98.SetPlButton(false);
- this.ucBtnPrint98.btnPrintClick += (s, e) =>
+ this.ucBtnPrint98.SetPrintButton(false);
+ this.ucBtnPrint98.btnAllClick += (s, e) =>
{
string rowGuid = txt_aboutGuid.Text.Trim();
if (rowGuid.Length < 36)
@@ -82,33 +83,39 @@
}
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�", lbGuid.Text.Trim());
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
+ if (strAction == "print")
{
- string rptParameter = "rpt_trace{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ try
{
- rpt.ShowDialog();
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
+
};
}
--
Gitblit v1.9.3