~tjx/GsMesClient.git

			@@ -5,7 +5,6 @@
			using System.Data;
			using System.Drawing;
			using System.Reflection;
			using System.Threading.Tasks;
			using System.Windows.Forms;
			using DevExpress.XtraBars;
			using DevExpress.XtraBars.FluentDesignSystem;
			@@ -16,7 +15,6 @@
			using Gs.DevApp.DevFrm.User;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;

			@@ -26,7 +24,7 @@
			{
			private static readonly Dictionary<string, XtraTabPage> TabPageDic =
			new Dictionary<string, XtraTabPage>();

			private string OldorgFids = "";
			public FrmMain()
			{
			InitializeComponent();
			@@ -38,6 +36,82 @@
			FormClosing += FrmMain_FormClosing;
			barEasy.ItemClick += BarEasy_ItemClick;
			getTree();
			tab.MouseDown += Tab_MouseDown;
			tabCloseCurrent.Click += (s, e) =>
			{
			string name = tab.SelectedTabPage.Tooltip;
			RemoveTabPage(tab, name);
			};
			tabCloseAll.Click += (s, e) =>
			{
			string _name = tab.SelectedTabPage.Tooltip;
			int _tabCount = tab.TabPages.Count;
			for (int i = _tabCount; i >= 0; i--)
			{
			try
			{
			string name = tab.TabPages[i].Tooltip;
			if (name != _name)
			{
			RemoveTabPage(tab, name);
			}
			}
			catch (Exception)
			{
			}
			}
			};
			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)
			{
			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 = cms1;
			}
			}

			private void BarEasy_ItemClick(object sender, ItemClickEventArgs e)
			@@ -105,23 +179,20 @@
			{
			getTree();
			}

			private async void getTree()
			private void getTree()
			{
			UcLoading _loading = new UcLoading();
			toolTime.Text = "登录时间" + LoginInfoModel.CurrentUser.LoginTime;
			var _obj = new
			{
			userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
			orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid
			};
			try
			{
			var strJson = await UtilityHelper.HttpPostAsync("",
			var strJson = UtilityHelper.HttpPost("",
			"User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
			DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("拼命加载中，请稍后......", "友情提示");
			var _job = JObject.Parse(strJson);
			var rtnCode = _job["rtnCode"].ToString();

			if (int.Parse(rtnCode) > 0)
			{
			acrd.Clear();
			@@ -138,6 +209,7 @@
			int gdx = 0, idx = 0;
			foreach (var _dy in drGrp)
			{
			wdf.SetCaption("加载进度:" + _dy["name"].ToString());
			var _grp = acrd.AddGroup();
			_grp.ImageOptions.Image =
			UtilityHelper.GetImgFromResource(
			@@ -159,6 +231,7 @@
			_itm.Name = _dy2["guid"].ToString();
			_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(); //存路径，类名
			@@ -183,12 +256,14 @@
			{
			MsgHelper.ShowError("提示：初始化失败，请联系管理员！");
			}
			wdf.SetCaption("加载进度（90/100）");
			wdf.Close();
			}
			catch (Exception ex)
			{

			MsgHelper.ShowError("提示：" + ex.Message);
			}
			_loading.Stop();
			}

			/// <summary>
			@@ -214,7 +289,9 @@
			/// <param name="e"></param>
			private void Tab_CloseButtonClick(object sender, EventArgs e)
			{
			RemoveTabPage(tab, e);
			var args = (ClosePageButtonEventArgs)e;
			var name = args.Page.Tooltip;
			RemoveTabPage(tab, name);
			}

			/// <summary>
			@@ -250,16 +327,13 @@
			/// <param name="tabControl"></param>
			/// <param name="tabPageName"></param>
			/// <param name="e"></param>
			public void RemoveTabPage(XtraTabControl tabControl, EventArgs e)
			public void RemoveTabPage(XtraTabControl tabControl, string name)
			{
			if (TabPageDic.Count <= 1)
			{
			MsgHelper.Warning("请至少保留一个功能！");
			return;
			}

			var args = (ClosePageButtonEventArgs)e;
			var name = args.Page.Tooltip;
			foreach (XtraTabPage item in tabControl.TabPages)
			if (item.Name == name)
			{
			@@ -304,7 +378,6 @@
			MsgHelper.ShowError("请检查是否开通了该模块！");
			return null;
			}

			newForm.FormBorderStyle = FormBorderStyle.None;
			newForm.TopLevel = false;
			newForm.ControlBox = false;
			@@ -319,7 +392,6 @@

			return null;
			}

			private int _userOut()
			{
			var _obj = new
			@@ -340,7 +412,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);
			}
			}
			}