From 0d721e907c394d1e8694da7bb5669a2feeb2f202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 六月 2025 08:05:34 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 225 +++++++++++++++++++++++---------------------------------
1 files changed, 92 insertions(+), 133 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5429567..b70ed3b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,7 +1,6 @@
锘縰sing DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.Rpt;
@@ -12,14 +11,10 @@
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.Net.Http;
using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -42,15 +37,11 @@
btnIn.ItemClick += BtnIn_ItemClick;
btnChk.ItemClick += BtnChk_ItemClick;
btnFchk.ItemClick += BtnFchk_ItemClick;
- btnJianYan.ItemClick += BtnJianYan_ItemClick;
- btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnFPiZhun.ItemClick += BtnFPiZhun_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;
btnJieAn.ItemClick += BtnJieAn_ItemClick;
btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
btnTzbl.ItemClick += BtnTzbl_ItemClick;
@@ -65,7 +56,6 @@
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)
@@ -74,7 +64,7 @@
actions = lst;
}
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -119,27 +109,7 @@
}
return false;
}
-
- 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)
@@ -174,34 +144,7 @@
if (btnShouHouChkClick != null)
btnShouHouChkClick(this, e);
}
-
- private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnZhiLiangFchkClick != null)
- btnZhiLiangFchkClick(this, e);
- }
-
- 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)
{
bool bl = _isCk(0);
@@ -239,7 +182,6 @@
return;
}
-
private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnLogClick != null) btnLogClick(this, e);
@@ -258,26 +200,11 @@
{
if (btnPiZhunClick != null) btnPiZhunClick(this, e);
}
-
- private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
+ private void BtnFPiZhun_ItemClick(object sender, ItemClickEventArgs e)
{
- bool bl = _isCk(0);
- if (bl) return;
- if (btnFjianYanClick != null)
- btnFjianYanClick(this, e);
- else
- return;
+ if (btnFPiZhunClick != null) btnFPiZhunClick(this, e);
}
- private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
- {
- bool bl = _isCk(1);
- if (bl) return;
- if (btnJianYanClick != null)
- btnJianYanClick(this, e);
- else
- return;
- }
private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnShouJianClick != null)
@@ -295,9 +222,15 @@
}
//鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc
string strType = "";
+ string strService = "";
if (xlsInService.Contains("&"))
{
strType = xlsInService.Split('&')[1];
+ strService = xlsInService.Split('&')[0];
+ }
+ else {
+ strType = "";
+ strService = xlsInService;
}
//杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
string upGuid = Guid.NewGuid().ToString();
@@ -312,7 +245,7 @@
try
{
string strJson = UtilityHelper.HttpPost("",
- "XlsInOut/" + xlsInService,
+ "XlsInOut/" + strService,
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -327,45 +260,47 @@
private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
{
- if (string.IsNullOrEmpty(this.xlsOutParameter))
- {
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
- using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
- {
- folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
- DialogResult dialogResult = folderBrowserDialog.ShowDialog();
- if (dialogResult == DialogResult.OK)
- {
- string _folder = folderBrowserDialog.SelectedPath;
- var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
- try
- {
- string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- string _file = _rtn.rtnData.fileUrl.ToString();
- string _folderName = _folder + "\\" + _file.Replace("down/", "");
- string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
- using (WebClient client = new WebClient())
- {
- client.DownloadFile(_url, _folderName);
- }
- ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
- }
- else
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
+ if (btnOutClick != null) btnOutClick(this, e);
+
+ //if (string.IsNullOrEmpty(this.xlsOutParameter))
+ //{
+ // ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+ //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ //{
+ // folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ // DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ // if (dialogResult == DialogResult.OK)
+ // {
+ // string _folder = folderBrowserDialog.SelectedPath;
+ // var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
+ // try
+ // {
+ // string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
+ // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ // if (_rtn.rtnCode > 0)
+ // {
+ // string _file = _rtn.rtnData.fileUrl.ToString();
+ // string _folderName = _folder + "\\" + _file.Replace("down/", "");
+ // string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+ // using (WebClient client = new WebClient())
+ // {
+ // client.DownloadFile(_url, _folderName);
+ // }
+ // ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+ // }
+ // else
+ // {
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ // }
+ // }
+ //}
}
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
@@ -425,10 +360,11 @@
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("纭畾瑕佽鍙栨秷鍚�?"))
@@ -443,20 +379,24 @@
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);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnBoHui.Name);
lst.Add(btnTzbl.Name);
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);
@@ -464,6 +404,11 @@
}
+ /// <summary>
+ /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnSaveClick != null)
@@ -474,18 +419,13 @@
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);
- lst.Add(btnJianYan.Name);
- lst.Add(btnFjianYan.Name);
lst.Add(btnQuery.Name);
lst.Add(btnLog.Name);
- lst.Add(btnZhiLiangChk.Name);
- lst.Add(btnZhiLiangFchk.Name);
lst.Add(btnPiZhun.Name);
- lst.Add(btnBoHui.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnDesign.Name);
lst.Add(btnReport.Name);
lst.Add(btnKg.Name);
@@ -496,6 +436,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);
}
@@ -522,6 +469,8 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
+ lst.Add(btnFont.Name);
+ lst.Add(btnLog.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -684,7 +633,6 @@
JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
-
if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("鏌ヨ"))
{
if (dt == null || dt.Rows.Count <= 0)
@@ -900,6 +848,11 @@
/// </summary>
public event EventHandler btnPiZhunClick;
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ public event EventHandler btnFPiZhunClick;
+
/// <summary>
/// 鏃ュ織
@@ -1007,6 +960,12 @@
/// </summary>
public event EventHandler btnOaClick;
+
+ /// <summary>
+ /// 瀵煎嚭
+ /// </summary>
+ public event EventHandler btnOutClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3