From afb82d4d75ae1b58385c168ba85ba44c00fc980c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 11 十一月 2024 08:16:23 +0800
Subject: [PATCH] 附件上传
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 320 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 257 insertions(+), 63 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 95bc704..ba0b8a3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -38,18 +38,21 @@
btnJianYan.ItemClick += BtnJianYan_ItemClick;
btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnLog.ItemClick += BtnLog_ItemClick;
+ btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick;
+ 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)
- if (!string.IsNullOrEmpty(item.Caption))
+ if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊")
lst.Add(item.Caption);
actions = lst;
}
- private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnPiZhunClick != null) btnPiZhunClick(this, e);
- }
+
/// <summary>
@@ -59,6 +62,112 @@
{
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)
+ btnCaiGouFchkClick(this, e);
+ //if (string.IsNullOrEmpty(guidKey))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
+
+ //if (string.IsNullOrEmpty(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+
+ //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(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+
+ //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(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+
+ //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(chkParameter))
+ //{
+ // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
+ // return;
+ //_ckService("3");
}
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
@@ -109,28 +218,47 @@
_ckService(1.ToString());
}
+
+ private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLogClick != null) btnLogClick(this, e);
+ else
+ return;
+ if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UserControl.ShowLogcs frm = new ShowLogcs();
+ frm.ShowDialog();
+ }
+
+ private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPiZhunClick != null) btnPiZhunClick(this, e);
+ }
+
private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFjianYanClick != null)
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)
@@ -140,26 +268,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)
@@ -248,18 +376,24 @@
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
+ if (btnReportClick != null)
+ btnReportClick(this, e);
+ else
+ return;
+
+ if (rptParameter == "return false")
+ return;
if (string.IsNullOrEmpty(rptParameter))
{
MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
-
var _bl = false;
_bl = _ckRptService();
if (_bl)
{
- var frm = new RptPreview(rptParameter);
- frm.Show();
+ var frm = new RptPreview(guidKey, rptParameter);
+ frm.ShowDialog();
return;
}
@@ -268,24 +402,27 @@
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
{
+ if (btnDesignClick != null)
+ btnDesignClick(this, e);
+ else
+ return;
+
if (string.IsNullOrEmpty(rptParameter))
{
MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
-
var _bl = false;
_bl = _ckRptService();
//濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
if (_bl)
{
- var frm = new EasyRptDesign(rptParameter);
- frm.Show();
+ var frm = new EasyRptDesign(guidKey, rptParameter);
+ frm.ShowDialog();
return;
}
-
//鍚﹀垯鍚戝璁捐妯℃澘
- var rptWizard = new ShowRptWizard(rptParameter);
+ var rptWizard = new ShowRptWizard(guidKey, rptParameter);
rptWizard.ShowDialog();
}
@@ -309,6 +446,12 @@
lst.Add(btnDesign.Name);
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
+ lst.Add(btnJianYan.Name);
+ 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);
}
@@ -475,20 +618,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 =>
@@ -505,7 +648,7 @@
}
//榛樿鍚敤鐨勬寜閽�
- // _enabledList.Add(btnDesign.Name);
+ _enabledList.Add(btnLoad.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
@@ -535,9 +678,11 @@
{
var _obj = new
{
- rptParameter
+ guid = guidKey,
+ rptParameter,
+ isDesign = 1
};
- var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0) return true;
@@ -643,6 +788,53 @@
/// </summary>
public event EventHandler btnPiZhunClick;
+
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ public event EventHandler btnLogClick;
+
+
+ /// <summary>
+ /// 閲囪喘瀹℃牳
+ /// </summary>
+ public event EventHandler btnCaiGouChkClick;
+
+ /// <summary>
+ /// 閲囪喘鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnCaiGouFchkClick;
+
+ /// <summary>
+ /// 璐ㄩ噺瀹℃牳
+ /// </summary>
+ public event EventHandler btnZhiLiangChkClick;
+
+
+ /// <summary>
+ /// 璐ㄩ噺鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnZhiLiangFchkClick;
+
+ /// <summary>
+ /// 椹冲洖
+ /// </summary>
+ public event EventHandler btnBoHuiClick;
+
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ public event EventHandler btnPrintClick;
+
+ /// <summary>
+ /// 璁剧疆鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnDesignClick;
+
+ /// <summary>
+ /// 鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnReportClick;
#endregion
#region 鍏叡灞炴��
@@ -675,10 +867,12 @@
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; }
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3