From bc3adbd73a55d8382fbd02b2fd090a05ec13a7d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 13 三月 2025 10:07:17 +0800
Subject: [PATCH] 提交OA
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 75f3b53..49d6849 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -24,7 +24,7 @@
{
private static readonly Dictionary<string, XtraTabPage> TabPageDic =
new Dictionary<string, XtraTabPage>();
-
+ private string OldorgFids = "";
public FrmMain()
{
InitializeComponent();
@@ -75,22 +75,30 @@
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
return;
}
+ if (OldorgFids == _val)
+ return;
var _obj = new
{
+ edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
- ortFids = _val,
+ userOrgFids = _val,
};
try
{
- var strJson = UtilityHelper.HttpPost("", "User/UserOrg",
+ var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ };
+ barMenu.ItemClick += (s, e) =>
+ {
+ Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
+ frm.ShowDialog();
};
}
@@ -177,7 +185,6 @@
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
- orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid
};
try
{
@@ -371,7 +378,6 @@
MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
return null;
}
-
newForm.FormBorderStyle = FormBorderStyle.None;
newForm.TopLevel = false;
newForm.ControlBox = false;
@@ -406,21 +412,25 @@
{
DialogResult = DialogResult.Cancel;
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return -1;
+ return 1;
}
}
private void GetOrg()
{
- var pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
+ 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)
{
--
Gitblit v1.9.3