From f121cd2803748763d7abb9509e049bd6e62e8844 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 15:00:24 +0800
Subject: [PATCH] 投入
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 88 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 3126b9e..f04e95d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -9,6 +9,7 @@
using DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
using DevExpress.XtraBars.Navigation;
+using DevExpress.XtraReports.Expressions.Native;
using DevExpress.XtraTab;
using DevExpress.XtraTab.ViewInfo;
using Gs.DevApp.DevFrm.Sys;
@@ -24,7 +25,7 @@
{
private static readonly Dictionary<string, XtraTabPage> TabPageDic =
new Dictionary<string, XtraTabPage>();
-
+ private string OldorgFids = "";
public FrmMain()
{
InitializeComponent();
@@ -61,6 +62,45 @@
}
}
};
+ 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);
+ }
+ };
+ barMenu.ItemClick += (s, e) =>
+ {
+ Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
+ frm.ShowDialog();
+ };
}
private void Tab_MouseDown(object sender, MouseEventArgs e)
@@ -71,15 +111,14 @@
//TreeListHitInfo hInfo = treeList1.CalcHitInfo(new Point(e.X, e.Y));
//TreeListNode node = hInfo.Node;
//treeList1.FocusedNode = node;
- tab.ContextMenuStrip = contextMenuStrip1;
-
+ tab.ContextMenuStrip = cms1;
}
}
private void BarEasy_ItemClick(object sender, ItemClickEventArgs e)
{
- var frm = new EasyCode();
- frm.ShowDialog();
+ //var frm = new EasyCode();
+ //frm.ShowDialog();
}
private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -141,15 +180,12 @@
{
getTree();
}
-
- private void getTree()
+ private void getTree()
{
-
toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
- orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid
};
try
{
@@ -190,14 +226,15 @@
foreach (var _dy2 in drItem)
{
var _itm = acrd.AddItem();
+ _itm.Appearance.Hovered.Options.UseFont = true;
+ _itm.Appearance.Normal.Options.UseFont = true;
_itm.ImageOptions.Image =
UtilityHelper.GetImgFromResource(
_dy2["icon"].ToString(), 2);
_itm.Name = _dy2["guid"].ToString();
_itm.Style = ElementStyle.Item;
_itm.Text = _dy2["name"].ToString();
- _itm.Appearance.Normal.Font =
- new Font("Tahoma", 10F);
+ wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
_itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
@@ -225,10 +262,9 @@
}
catch (Exception ex)
{
-
+
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -343,7 +379,6 @@
MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
return null;
}
-
newForm.FormBorderStyle = FormBorderStyle.None;
newForm.TopLevel = false;
newForm.ControlBox = false;
@@ -358,7 +393,6 @@
return null;
}
-
private int _userOut()
{
var _obj = new
@@ -379,7 +413,29 @@
{
DialogResult = DialogResult.Cancel;
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return -1;
+ return 1;
+ }
+ }
+ private void GetOrg()
+ {
+ 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;
+ 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);
}
}
}
--
Gitblit v1.9.3