From 0b7a0d158a6bd7d8c257e8f20433d6366199e279 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 15 五月 2025 17:02:52 +0800
Subject: [PATCH] 导入
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 8 +++++++-
DevApp/Gs.DevApp/UserControl/ShowUp.cs | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
index a6fd13a..cdf9bcf 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowUp.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
@@ -60,13 +60,13 @@
lst.Add(new
{
btnTxt = "妫�楠岄」鐩甛nXLS妯℃澘",
- xls = "001妫�楠岄」鐩�.xls"//001
+ xls = "002妫�楠岄」鐩�.xls"//001
});
lst.Add(new
{
btnTxt = "鐗╂枡妫�楠岄」鐩甛nXLS妯℃澘",
- xls = "001鐗╂枡妫�楠岄」鐩�.xls"
+ xls = "003鐗╂枡妫�楠岄」鐩�.xls"
});
foreach (var obj in lst)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5429567..ad54961 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -295,9 +295,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 +318,7 @@
try
{
string strJson = UtilityHelper.HttpPost("",
- "XlsInOut/" + xlsInService,
+ "XlsInOut/" + strService,
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
--
Gitblit v1.9.3