From 236874a930147c27e46c673d8c1a607f1260e8aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 31 三月 2025 12:43:43 +0800
Subject: [PATCH] 追溯码
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 75f3b53..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();
@@ -75,22 +76,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();
};
}
@@ -108,8 +117,8 @@
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)
@@ -177,7 +186,6 @@
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
- orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid
};
try
{
@@ -218,6 +226,8 @@
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);
@@ -225,8 +235,6 @@
_itm.Style = ElementStyle.Item;
_itm.Text = _dy2["name"].ToString();
wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
- _itm.Appearance.Normal.Font =
- new Font("Tahoma", 10F);
_itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
@@ -371,7 +379,6 @@
MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
return null;
}
-
newForm.FormBorderStyle = FormBorderStyle.None;
newForm.TopLevel = false;
newForm.ControlBox = false;
@@ -406,21 +413,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