From 730ae1a961047b097fc3167b3418e899e0be2507 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 09 十一月 2024 18:08:00 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 204 ++++++++++++++++++++++++++++++--------------------
1 files changed, 121 insertions(+), 83 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 6b76a26..c43e44e 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -43,6 +43,8 @@
btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
+ btnBoHui.ItemClick += BtnBoHui_ItemClick;
+ btnPrint.ItemClick += BtnPrint_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -50,6 +52,9 @@
lst.Add(item.Caption);
actions = lst;
}
+
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -60,88 +65,115 @@
if (Parent != null) getNamespace();
}
+ private void BtnPrint_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
+ }
+
+
+ private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBoHuiClick != null)
+ btnBoHuiClick(this, e);
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
+
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾椹冲洖鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾椹冲洖閲嶆鍚楋紵"))
+ // return;
+ //_ckService("5");
+ }
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�"))
- return;
- _ckService("-2");
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�"))
+ // return;
+ //_ckService("-2");
}
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
btnCaiGouChkClick(this, e);
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
- return;
- _ckService("2");
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
+ // return;
+ //_ckService("2");
}
private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnZhiLiangFchkClick != null)
btnZhiLiangFchkClick(this, e);
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�"))
- return;
- _ckService("-3");
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�"))
+ // return;
+ //_ckService("-3");
}
private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnZhiLiangChkClick != null)
btnZhiLiangChkClick(this, e);
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
- return;
- _ckService("3");
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
+ // return;
+ //_ckService("3");
}
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
@@ -218,21 +250,21 @@
btnFjianYanClick(this, e);
else
return;
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
- return;
- _ckService(0.ToString());
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
+ // return;
+ //_ckService(0.ToString());
}
private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -242,26 +274,26 @@
else
return;
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
- return;
- var _obj = new
- {
- guid = guidKey,
- parameter = chkParameter
- };
- _ckService(1.ToString());
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
+ // return;
+ //var _obj = new
+ //{
+ // guid = guidKey,
+ // parameter = chkParameter
+ //};
+ //_ckService(1.ToString());
}
private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
@@ -779,7 +811,13 @@
/// </summary>
public event EventHandler btnZhiLiangFchkClick;
+ /// <summary>
+ /// 椹冲洖
+ /// </summary>
+ public event EventHandler btnBoHuiClick;
+
+ public event EventHandler btnPrintClick;
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3