From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 23:58:51 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/FrmMain.cs |   92 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 4047dce..81fbc63 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,25 +62,60 @@
                     }
                 }
             };
+            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();
+            };
+          //  tab.ContextMenuStrip = cms1;
         }
 
         private void Tab_MouseDown(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Right)
             {
-                tab.ContextMenuStrip = null;
-                //TreeListHitInfo hInfo = treeList1.CalcHitInfo(new Point(e.X, e.Y));
-                //TreeListNode node = hInfo.Node;
-                //treeList1.FocusedNode = node;
-                tab.ContextMenuStrip = contextMenuStrip1;
-
+                cms1.Show(tab, e.Location);
             }
         }
 
         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 +177,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,6 +223,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);
@@ -197,8 +232,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);
@@ -226,10 +259,9 @@
             }
             catch (Exception ex)
             {
-                
+
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
-           
         }
 
         /// <summary>
@@ -344,7 +376,6 @@
                     MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
                     return null;
                 }
-
                 newForm.FormBorderStyle = FormBorderStyle.None;
                 newForm.TopLevel = false;
                 newForm.ControlBox = false;
@@ -359,7 +390,6 @@
 
             return null;
         }
-
         private int _userOut()
         {
             var _obj = new
@@ -380,7 +410,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