From 1e70760fdbd1b09a8b697e97906d86235095d6c3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 26 五月 2025 15:55:18 +0800
Subject: [PATCH] 工单
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 232 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 120 insertions(+), 112 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 95227ab..73e5650 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -58,6 +58,11 @@
btnLayout.ItemClick += BtnLayout_ItemClick;
btnFont.ItemClick += BtnFont_ItemClick;
btnShouJian.ItemClick += BtnShouJian_ItemClick;
+ btnCaiWuChk.ItemClick += BtnCaiWuChk_ItemClick;
+ btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
+ btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
+ btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
+ btnOa.ItemClick += BtnOa_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -66,7 +71,7 @@
actions = lst;
}
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -136,63 +141,41 @@
{
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;
- //}
+ private void BtnCaiWuFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnCaiWuFchkClick != null)
+ btnCaiWuFchkClick(this, e);
+ }
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
- // return;
- //_ckService("2");
+ private void BtnCaiWuChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnCaiWuChkClick != null)
+ btnCaiWuChkClick(this, e);
+ }
+ private void BtnShouHouFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnShouHouFchkClick != null)
+ btnShouHouFchkClick(this, e);
+ }
+
+ private void BtnShouHouChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnShouHouChkClick != null)
+ btnShouHouChkClick(this, e);
}
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)
@@ -281,21 +264,6 @@
btnFjianYanClick(this, e);
else
return;
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
- // return;
- //_ckService(0.ToString());
}
private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -306,27 +274,6 @@
btnJianYanClick(this, e);
else
return;
-
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
- // return;
- //var _obj = new
- //{
- // guid = guidKey,
- // parameter = chkParameter
- //};
- //_ckService(1.ToString());
}
private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -343,38 +290,42 @@
MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
-
- var openFileDialog = new OpenFileDialog();
- //openFileDialog.InitialDirectory = "c:\\";
- openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
- openFileDialog.Title = "閫夋嫨鏂囦欢";
- var result = openFileDialog.ShowDialog();
- if (result == DialogResult.OK)
+ //鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc
+ string strType = "";
+ string strService = "";
+ if (xlsInService.Contains("&"))
{
- var WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"] +
- "Upload/UploadFile";
- var strJson =
- await UtilityHelper.UploadFileAsync(openFileDialog
- .FileName);
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- string filePath = _rtn.rtnData["filePath"].ToString();
- if (_rtn.rtnCode > 0)
- {
- var _obj = filePath;
- try
- {
- strJson = UtilityHelper.HttpPost("",
- "XlsInOut/" + xlsInService,
- JsonConvert.SerializeObject(_obj));
- _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+ strType = xlsInService.Split('&')[1];
+ strService = xlsInService.Split('&')[0];
}
+ else {
+ strType = "";
+ strService = xlsInService;
+ }
+ //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
+ string upGuid = Guid.NewGuid().ToString();
+ Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var _obj = new
+ {
+ tmpGuid = upGuid,
+ strType = strType,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("",
+ "XlsInOut/" + strService,
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ frm.ShowDialog();
}
private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
@@ -477,6 +428,16 @@
if (btnQueryClick != null) btnQueryClick(this, e);
}
+ private void BtnOa_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnOaClick != null) btnOaClick(this, e);
+ }
+
+ /// <summary>
+ /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
{
if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
@@ -505,6 +466,12 @@
lst.Add(btnKg.Name);
lst.Add(btnWg.Name);
lst.Add(btnZhongTai.Name);
+ lst.Add(btnCaiWuChk.Name);
+ lst.Add(btnCaiWuFchk.Name);
+ lst.Add(btnCaiGouChk.Name);
+ lst.Add(btnCaiGouFchk.Name);
+ lst.Add(btnShouHouChk.Name);
+ lst.Add(btnShouHouFchk.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -512,6 +479,11 @@
}
+ /// <summary>
+ /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnSaveClick != null)
@@ -522,7 +494,6 @@
var lst = new List<string>();
lst.Add(btnAdd.Name);
lst.Add(btnEdit.Name);
- //lst.Add(btnEsc.Name);
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
lst.Add(btnDel.Name);
@@ -544,6 +515,13 @@
lst.Add(btnFont.Name);
lst.Add(btnLoad.Name);
lst.Add(btnTzbl.Name);
+ lst.Add(btnZhongTai.Name);
+ lst.Add(btnCaiWuChk.Name);
+ lst.Add(btnCaiWuFchk.Name);
+ lst.Add(btnCaiGouChk.Name);
+ lst.Add(btnCaiGouFchk.Name);
+ lst.Add(btnShouHouChk.Name);
+ lst.Add(btnShouHouFchk.Name);
_enabledBtn(lst);
}
@@ -570,6 +548,9 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
+ lst.Add(btnFont.Name);
+ lst.Add(btnJianYan.Name);
+ lst.Add(btnLog.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -976,6 +957,29 @@
/// </summary>
public event EventHandler btnZhiLiangFchkClick;
+
+ /// <summary>
+ /// 璐㈠姟瀹℃牳
+ /// </summary>
+ public event EventHandler btnCaiWuChkClick;
+
+
+ /// <summary>
+ /// 璐㈠姟鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnCaiWuFchkClick;
+
+ /// <summary>
+ /// 鍞悗瀹℃牳
+ /// </summary>
+ public event EventHandler btnShouHouChkClick;
+
+
+ /// <summary>
+ /// 鍞悗鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnShouHouFchkClick;
+
/// <summary>
/// 椹冲洖
/// </summary>
@@ -1026,7 +1030,11 @@
/// 鐢熸垚棣栨
/// </summary>
public event EventHandler btnShouJianClick;
- //public event EventHandler btnLayoutClick;
+
+ /// <summary>
+ /// 鍙戦�丱A
+ /// </summary>
+ public event EventHandler btnOaClick;
#endregion
--
Gitblit v1.9.3