From d157667c10afbda2cf8005459bffa78f40d1b033 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 19 七月 2025 14:52:28 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 77 ++++++++++++++++++++++++++++++-------- 1 files changed, 60 insertions(+), 17 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs index 5feff55..2c46e5b 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs @@ -2,11 +2,13 @@ using DevExpress.Utils.VisualEffects; using DevExpress.XtraGrid.Views.Base.ViewInfo; using Gs.DevApp.DevFrm.Rpt; +using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Data; +using System.Drawing; using System.Windows.Forms; namespace Gs.DevApp.UserControl @@ -16,11 +18,14 @@ private readonly string _webServiceName = "VArrivalBarcodeManager/"; private string aboutGuid = ""; private string aboutType = "";//鍚庣洊鐮� + /// <summary> - /// 鐖朵翰guid + /// /// </summary> - /// <param name="_aboutGuid"></param> - public SelectDeleteBar(string _aboutGuid, string _aboutType) + /// <param name="_aboutGuid">鐖朵翰guid</param> + /// <param name="_aboutType">绫诲埆锛堝悗鐩栫爜锛岃拷婧爜锛屽彈鎵樺叆搴撶瓑锛�</param> + /// <param name="_qcGuid">qcGuid锛屽湪杩斿伐閲嶆潯鐨勬椂鍊�</param> + public SelectDeleteBar(string _aboutGuid, string _aboutType, string _qcGuid = "") { InitializeComponent(); this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; @@ -34,15 +39,19 @@ this.Text = "鎵归噺鎿嶄綔銆�" + this.aboutType + "銆�,銆�" + this.aboutGuid + "銆�"; switch (aboutType) { - case "鍚庣洊鐮�": - btnDelete.Visible = true; - colT1.Caption = "缁戝畾鎵樻澘鐮�"; - colT2.Caption = "缁戝畾杩芥函鐮�"; + case "鎵樻澘鐮�": + btnDelete.Visible = false; break; case "杩芥函鐮�": + btnDelete.Visible = false; colT1.Caption = "绾夸綋缂栧彿"; colT2.Caption = "绾夸綋鍚嶇О"; break; + case "鍚庣洊鐮�": + colT1.Caption = "缁戝畾鎵樻澘鐮�"; + colT2.Caption = "缁戝畾杩芥函鐮�"; + break; + default: colT1.Caption = "鍏ュ簱浜�"; colT2.Caption = "鍏ュ簱鏃ユ湡"; @@ -72,7 +81,7 @@ } if (sb.Length <= 0) { - MsgHelper.Warning("璇峰嬀閫変綘瑕佸垹闄ょ殑鏉$爜锛�"); + MsgHelper.ShowError("璇峰嬀閫変綘瑕佸垹闄ょ殑鏉$爜锛�"); return; } var _obj = new @@ -103,16 +112,16 @@ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); return; } - UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = strMsg }); Close(); + UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = strMsg, Data = "delete" }); Close(); }; btnPrint.Click += (s, e) => { gridView1.PostEditor(); gridView1.UpdateCurrentRow(); System.Text.StringBuilder sb = new System.Text.StringBuilder(); - DataTable dt = this.gcMain.DataSource as DataTable; + DataTable dtSelect = this.gcMain.DataSource as DataTable; { - foreach (DataRow dr in dt.Rows) + foreach (DataRow dr in dtSelect.Rows) { string checkBox = dr["chkInt"].ToString(); string _guid = dr["guid"].ToString(); @@ -126,11 +135,47 @@ } if (sb.Length <= 0) { - MsgHelper.Warning("璇峰嬀閫変綘瑕佹墦鍗扮殑鏉$爜锛�"); + MsgHelper.ShowError("璇峰嬀閫変綘瑕佹墦鍗扮殑鏉$爜锛�"); return; } - - UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString() }); Close(); + if (aboutType == "鍚庣洊鐮�") + { + var _obj = new + { + keyType = "瀹㈡埛妯℃澘" + }; + var json = JsonConvert.SerializeObject(_obj); + try + { + var strReturn = + UtilityHelper.HttpPost("", "Report/GetTemplateList", json); + ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn); + DataTable dt = dd.rtnData; + if (dd.rtnCode > 0) + { + // 鍒涘缓鎴栬幏鍙栦竴涓狢ontextMenu瀵硅薄锛堜緥濡備娇鐢–ontextMenuStrip锛� + ContextMenu contextMenu = new ContextMenu(); + foreach (DataRow dr in dt.Rows) + { + MenuItem menuItem1 = new MenuItem(dr["reportType"].ToString() + "銆�" + dr["reportName"].ToString() + "銆�"); + menuItem1.Click += (ss, ee) => + { + string rptParameter = dr["reportType"].ToString(); + UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString(), Data = "print" + rptParameter }); Close(); + }; + contextMenu.MenuItems.Add(menuItem1); + } + // 鏄剧ず鑿滃崟鍦ㄦ寜閽殑浣嶇疆 + contextMenu.Show(btnPrint, new Point(0, btnPrint.Height)); // 璋冩暣绗簩涓弬鏁颁互璋冩暣鑿滃崟鐨勬樉绀轰綅缃� + return; + } + } + catch (Exception ex) + { + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } + } + UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString(), Data = "print" }); Close(); }; } @@ -168,10 +213,8 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } - - } } \ No newline at end of file -- Gitblit v1.9.3