From 72dc506dbd884fac5011b38d94280bf3e807969a Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 04 九月 2025 10:59:07 +0800
Subject: [PATCH] 送货计划增加导出功能
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c3aa09e..3aee6c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -95,6 +95,13 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
+
+ #region 鍔犱笂搴曢儴鎻愰啋
+ string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
+ string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
+ string _version = ConfigurationManager.AppSettings["Version"];
+ toolVersion.Text = "褰撳墠鐗堟湰:" + _version + "锛屾湇鍔″湴鍧�:" + _webApiUrl;
+ #endregion
}
/// <summary>
/// 鏄剧ず鍙抽敭鑿滃崟
@@ -172,7 +179,7 @@
/// </summary>
private void getTree()
{
- toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
+ toolTime.Text = "鐧诲綍鏃堕棿:" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
@@ -335,15 +342,15 @@
{
if (item.Name == name)
{
- //鍚庢潵鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恇eg
- //foreach (Control control in item.Controls)
- //{
- // if (control is Form)
- // {
- // Form myForm = control as Form;
- // myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 纭繚 UI 绾跨▼瀹夊叏鍦伴噴鏀捐祫婧�
- // }
- //}
+ //2025-08-08鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恇eg
+ foreach (Control control in item.Controls)
+ {
+ if (control is Form)
+ {
+ Form myForm = control as Form;
+ myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 纭繚 UI 绾跨▼瀹夊叏鍦伴噴鏀捐祫婧�
+ }
+ }
//鍚庢潵鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恊nd
tabControl.TabPages.Remove(item);
item.Dispose();
@@ -485,7 +492,10 @@
private void GetOrg()
{
string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
- var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
+ System.Text.StringBuilder sbSql= new System.Text.StringBuilder();
+ sbSql.Append(" and IS_STATUS=1");
+ sbSql.Append(" and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where userGuid='"+ LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='缁勭粐' ) ");
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, sbSql.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
--
Gitblit v1.9.3