From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 88 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c16e184..3aee6c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -25,7 +25,7 @@
/// tab涓存椂閫夐」鍗�
/// </summary>
private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>();
-
+ private string OldorgFids = "";
public FrmMain()
{
InitializeComponent();
@@ -61,6 +61,47 @@
}
}
};
+ GetOrg();
+ barOrg.EditValueChanged += (s, e) =>
+ {
+ if (barOrg.EditValue == null)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ string _val = barOrg.EditValue.ToString();
+ if (string.IsNullOrEmpty(_val))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ if (OldorgFids == _val)
+ return;
+ var _obj = new
+ {
+ edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userOrgFids = _val,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ }
+ catch (Exception ex)
+ {
+ 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>
/// 鏄剧ず鍙抽敭鑿滃崟
@@ -138,7 +179,7 @@
/// </summary>
private void getTree()
{
- toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
+ toolTime.Text = "鐧诲綍鏃堕棿:" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
@@ -301,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();
@@ -448,5 +489,30 @@
}
#endregion
+ private void GetOrg()
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ 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
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = _rtn.rtnData.list;
+ repositoryItemCheckedComboBoxEdit1.DataSource = dt;
+ repositoryItemCheckedComboBoxEdit1.DisplayMember = "name";
+ repositoryItemCheckedComboBoxEdit1.ValueMember = "fid";
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ barOrg.EditValue = _obj.rtnData.extendText;
+ OldorgFids = _obj.rtnData.extendText;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3