From 640f5f3d154538a350306da03ff2528b35949709 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 06 十一月 2024 08:19:31 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 7392181..8c9b7e0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -43,6 +43,7 @@
btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
+ btnBoHui.ItemClick += BtnBoHui_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -50,6 +51,8 @@
lst.Add(item.Caption);
actions = lst;
}
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -59,7 +62,26 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
+ 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)
@@ -230,7 +252,7 @@
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶆楠屽悧锛�"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
return;
_ckService(0.ToString());
}
@@ -415,6 +437,8 @@
lst.Add(btnFjianYan.Name);
lst.Add(btnOut.Name);
lst.Add(btnIn.Name);
+ lst.Add(btnLog.Name);
+ lst.Add(btnPiZhun.Name);
_enabledBtn(lst);
if (btnEscClick != null) btnEscClick(this, e);
}
@@ -581,20 +605,20 @@
}
///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(鎻愪氦妫�楠�)锛�
- if (item.Caption == "鎻愪氦妫�楠�")
- {
- var ld1 = dt.AsEnumerable().Any(
- row => row.Field<string>("name") == "鎻愪氦妫�楠�"
- );
- if (ld1)
- {
- btnJianYan.Visibility = btnFjianYan.Visibility =
- btnLoad.Visibility = BarItemVisibility.Always;
- btnJianYan.Visibility = BarItemVisibility.Always;
- _enabledList.Add(item.Name);
- continue;
- }
- }
+ //if (item.Caption == "鎻愪氦妫�楠�")
+ //{
+ // var ld1 = dt.AsEnumerable().Any(
+ // row => row.Field<string>("name") == "鎻愪氦妫�楠�"
+ // );
+ // if (ld1)
+ // {
+ // btnJianYan.Visibility = btnFjianYan.Visibility =
+ // btnLoad.Visibility = BarItemVisibility.Always;
+ // btnJianYan.Visibility = BarItemVisibility.Always;
+ // _enabledList.Add(item.Name);
+ // continue;
+ // }
+ //}
//鎸夐挳鏄惁鍦ㄦ潈闄愯〃涓�
var exists = dt.AsEnumerable().Any(row =>
@@ -777,6 +801,10 @@
/// </summary>
public event EventHandler btnZhiLiangFchkClick;
+ /// <summary>
+ /// 椹冲洖
+ /// </summary>
+ public event EventHandler btnBoHuiClick;
#endregion
@@ -810,7 +838,7 @@
public string xlsInService { get; set; }
/// <summary>
- /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY,check_date,check_status,check_by,瀛樺偍杩囩▼鍚�
+ /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY(琛ㄥ悕),check_date(鏃堕棿),check_status(鐘舵��),check_by(瀹℃牳浜�),瀛樺偍杩囩▼鍚�
/// </summary>
public string chkParameter { get; set; }
--
Gitblit v1.9.3