From 01738c21cdb08fee76aa53ff870a38a00b4f5df4 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 13 九月 2024 12:01:18 +0800
Subject: [PATCH] 基础资料

---
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs |   87 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 142ff73..ff926b4 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -2,8 +2,9 @@
 using Newtonsoft.Json;
 using System;
 using System.Windows.Forms;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
 using Newtonsoft.Json.Linq;
+using System.Data;
 
 namespace Gs.DevApp.DevFrm
 {
@@ -12,12 +13,36 @@
         public FrmLogin()
         {
             InitializeComponent();
-            this.Text=lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+            this.Text = lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
             btnLogin.Click += BtnLogin_Click;
             btnCancel.Click += BtnCancel_Click;
-            UtilityHelper.SetFont(panel1);
+            getTree();
+            getRemember();
         }
-
+        /// <summary>
+        /// 璇诲彇缁勭粐
+        /// </summary>
+        private void getTree()
+        {
+            PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", "and isStatus=1");
+            string json = JsonConvert.SerializeObject(pgq);
+            string strReturn = "";
+            try
+            {
+                strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+                ReturnModel<PageListModel> rtn = UtilityHelper.GetTableByJson(strReturn);
+                DataTable dt = rtn.rtnData.list;
+                comOrg.DataSource = dt;
+                comOrg.DisplayMember = "name";
+                comOrg.ValueMember = "guid";
+                comOrg.SelectedIndex = 0;
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                this.Close();
+            }
+        }
         private void BtnCancel_Click(object sender, EventArgs e)
         {
             if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
@@ -28,15 +53,30 @@
 
         private void BtnLogin_Click(object sender, EventArgs e)
         {
-            int i = 100;
-            Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝e湪楠岃瘉鎮ㄧ殑韬唤锛�");
+            if (string.IsNullOrEmpty(txtUser.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+                txtUser.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+                txtUser.Focus();
+                return;
+            }
+            if (comOrg.SelectedValue == null || string.IsNullOrEmpty(comOrg.SelectedValue.ToString().Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("缁勭粐鏈烘瀯涓嶈兘涓虹┖锛�");
+                txtUser.Focus();
+                return;
+            }
             var _obj = new
             {
-                accountPwd = txtUser.Text.Trim(),
-                accountNo = txtPwd.Text.Trim(),
-                orgGuid = Guid.NewGuid()
+                accountPwd = txtPwd.Text.Trim(),
+                accountNo = txtUser.Text.Trim(),
+                orgGuid = comOrg.SelectedValue.ToString().Trim()
             };
-            sdf.SetCaption("鎵ц杩涘害锛�" + (i - 80) + "/" + i.ToString() + "锛�");
             try
             {
                 string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
@@ -44,24 +84,41 @@
                 JObject _login = _rtn.rtnData;
                 if (_rtn.rtnCode > 0)
                 {
+                    Properties.Settings.Default.userName = (ckRemember.Checked ? txtUser.Text.Trim() : "");
+                    Properties.Settings.Default.userPwd = (ckRemember.Checked ? txtPwd.Text.Trim() : "");
+                    Properties.Settings.Default.orgGuid = (ckRemember.Checked ? comOrg.SelectedValue.ToString() : "");
+                    Properties.Settings.Default.remember = ckRemember.Checked;
+                    Properties.Settings.Default.Save();
                     LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
                     LoginInfoModel.CurrentUser.LoginOrgGuid = _login["loginOrgGuid"].ToString();
                     LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
+                    LoginInfoModel.CurrentUser.LoginFactory = _login["loginFactory"].ToString();
+                    this.DialogResult = DialogResult.OK;
                 }
                 else
                 {
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    this.DialogResult = DialogResult.None;
                 }
-                sdf.SetCaption("鎵ц杩涘害锛�" + (i - 10) + "/" + i.ToString() + "锛�");
             }
             catch (Exception ex)
             {
-                sdf.Close();
+                this.DialogResult = DialogResult.Cancel;
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                return;
             }
-            sdf.Close();
-            this.DialogResult = DialogResult.OK;
+        }
+        /// <summary>
+        /// 璇诲彇璁颁綇瀵嗙爜
+        /// </summary>
+        private void getRemember()
+        {
+            if (Properties.Settings.Default.remember)
+            {
+                txtUser.Text = Properties.Settings.Default.userName;
+                txtPwd.Text = Properties.Settings.Default.userPwd;
+                comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
+                ckRemember.Checked = true;
+            }
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3