From 0569cccc1f91346caca8cc8f2c65b9f174ce2891 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 24 十二月 2024 11:07:17 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 42 ++++++++++++++----------------------------
1 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 9a1e814..6d694b1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,9 +27,8 @@
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
- toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
- toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -44,6 +43,14 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_sjXt.getSuppler("");
+ this.ucBtnPrint1.btnDesignClick += (s, e) =>
+ {
+ ucBtnPrint1.rptParameter = "rpt_daa{}";
+ };
+ this.ucBtnPrint1.btnReportClick += (s, e) =>
+ {
+ _print();
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -312,20 +319,6 @@
}
}
- private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_daa001, gridView1);
- toolBarMenu1.guidKey = rowGuid;
- toolBarMenu1.rptParameter = "rpt_daa{}";
- }
- private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
- {
- _print();
- }
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
@@ -402,38 +395,31 @@
private void _print()
{
- toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_daa001, gridView1);
- toolBarMenu1.guidKey = rowGuid;
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 5);
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
+ ucBtnPrint1.guidKey = rowGuid;
if (rowGuid.Length < 36)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
- this.toolBarMenu1.rptParameter = "return false";
+ this.ucBtnPrint1.rptParameter = "return false";
return;
}
if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
txt_iCount_1.Focus();
- this.toolBarMenu1.rptParameter = "return false";
+ this.ucBtnPrint1.rptParameter = "return false";
return;
}
if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
txt_psnQty_1.Focus();
- this.toolBarMenu1.rptParameter = "return false";
+ this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.toolBarMenu1.rptParameter = "rpt_daa{" + ""
+ this.ucBtnPrint1.rptParameter = "rpt_daa{" + ""
+ "," + txt_printRemark.Text.Trim()
+ "," + ""
+ "," + txt_iCount_1.Text.Trim()
--
Gitblit v1.9.3