From fc6d76c183e2becbb7433f0caa11af4d08eeec50 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 24 七月 2025 15:31:35 +0800
Subject: [PATCH] 增加工资和连班按钮
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 93a9be6..dc8dd2f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -11,11 +11,9 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
-using System.Net;
using System.Text;
using System.Windows.Forms;
@@ -40,6 +38,7 @@
btnChk.ItemClick += BtnChk_ItemClick;
btnFchk.ItemClick += BtnFchk_ItemClick;
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnFPiZhun.ItemClick += BtnFPiZhun_ItemClick;
btnLog.ItemClick += BtnLog_ItemClick;
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
@@ -57,6 +56,9 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
+ btnAll.ItemClick += BtnAll_ItemClick;
+ btnGongZi.ItemClick += BtnGongZi_ItemClick;
+ btnLianBan.ItemClick += BtnLianBan_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -64,7 +66,6 @@
lst.Add(item.Caption);
actions = lst;
}
-
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -110,7 +111,7 @@
}
return false;
}
-
+
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
@@ -145,7 +146,7 @@
if (btnShouHouChkClick != null)
btnShouHouChkClick(this, e);
}
-
+
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
bool bl = _isCk(0);
@@ -201,6 +202,10 @@
{
if (btnPiZhunClick != null) btnPiZhunClick(this, e);
}
+ private void BtnFPiZhun_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPiZhunClick != null) btnFPiZhunClick(this, e);
+ }
private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -225,9 +230,10 @@
strType = xlsInService.Split('&')[1];
strService = xlsInService.Split('&')[0];
}
- else {
- strType = "";
- strService = xlsInService;
+ else
+ {
+ strType = "";
+ strService = xlsInService;
}
//杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
string upGuid = Guid.NewGuid().ToString();
@@ -249,7 +255,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
@@ -302,8 +308,8 @@
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnReportClick != null)
- btnReportClick(this, e);
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
else
return;
@@ -357,6 +363,25 @@
if (btnQueryClick != null) btnQueryClick(this, e);
}
+ private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnAllClick != null)
+ btnAllClick(this, e);
+ }
+
+ private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLianBanClick != null)
+ btnLianBanClick(this, e);
+ }
+
+ private void BtnGongZi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnGongZiClick != null)
+ btnGongZiClick(this, e);
+ }
+
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -380,6 +405,7 @@
lst.Add(btnIn.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
@@ -393,6 +419,8 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -421,6 +449,7 @@
lst.Add(btnQuery.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnDesign.Name);
lst.Add(btnReport.Name);
lst.Add(btnKg.Name);
@@ -438,10 +467,12 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnIn.Name);
+ lst.Add(btnOut.Name);
+ lst.Add(btnGongZi.Name);
+ lst.Add(btnLianBan.Name);
_enabledBtn(lst);
}
-
-
}
}
@@ -826,22 +857,15 @@
/// </summary>
public event EventHandler btnFChkClick;
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- public event EventHandler btnJianYanClick;
-
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- public event EventHandler btnFjianYanClick;
-
-
/// <summary>
/// 鎵瑰噯
/// </summary>
public event EventHandler btnPiZhunClick;
+
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ public event EventHandler btnFPiZhunClick;
/// <summary>
@@ -907,7 +931,7 @@
/// <summary>
/// 鎶ヨ〃
/// </summary>
- public event EventHandler btnReportClick;
+ public event EventHandler btnPrintClick;
/// <summary>
/// 缁撴
@@ -956,6 +980,22 @@
/// </summary>
public event EventHandler btnOutClick;
+ /// <summary>
+ /// 鎵归噺璁剧疆
+ /// </summary>
+ public event EventHandler btnAllClick;
+
+ /// <summary>
+ /// 杩炵彮璁剧疆
+ /// </summary>
+ public event EventHandler btnLianBanClick;
+
+
+ /// <summary>
+ /// 璁＄畻宸ヨ祫
+ /// </summary>
+ public event EventHandler btnGongZiClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3