From e6db49c7ec2e2be934c625c48d665fdca04ffaf5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 02 一月 2025 16:49:36 +0800
Subject: [PATCH] 超领取

---
 DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs |  139 +++++++++++++++++++++++-----------------------
 1 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index d4fa2f9..198ea29 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -32,21 +32,20 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin));
             this.lbVersion = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.comOrg = new System.Windows.Forms.ComboBox();
             this.txtUser = new DevExpress.XtraEditors.TextEdit();
-            this.chkSaveLoginInfo = new DevExpress.XtraEditors.CheckEdit();
+            this.ckRemember = new DevExpress.XtraEditors.CheckEdit();
             this.txtPwd = new DevExpress.XtraEditors.TextEdit();
             this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txtDataset = new DevExpress.XtraEditors.LookUpEdit();
             this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.lblLoadingInfo = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.chkSaveLoginInfo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDataset.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // lbVersion
@@ -63,110 +62,112 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Transparent;
+            this.panel1.Controls.Add(this.comOrg);
             this.panel1.Controls.Add(this.txtUser);
-            this.panel1.Controls.Add(this.chkSaveLoginInfo);
+            this.panel1.Controls.Add(this.ckRemember);
             this.panel1.Controls.Add(this.txtPwd);
             this.panel1.Controls.Add(this.btnCancel);
             this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txtDataset);
             this.panel1.Controls.Add(this.btnLogin);
             this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.labelControl1);
-            this.panel1.Font = new System.Drawing.Font("Tahoma", 9F);
-            this.panel1.Location = new System.Drawing.Point(218, 465);
+            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.panel1.Location = new System.Drawing.Point(172, 457);
             this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(392, 276);
+            this.panel1.Size = new System.Drawing.Size(408, 276);
             this.panel1.TabIndex = 243;
+            // 
+            // comOrg
+            // 
+            this.comOrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comOrg.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.comOrg.FormattingEnabled = true;
+            this.comOrg.Location = new System.Drawing.Point(168, 97);
+            this.comOrg.Name = "comOrg";
+            this.comOrg.Size = new System.Drawing.Size(211, 29);
+            this.comOrg.TabIndex = 245;
             // 
             // txtUser
             // 
-            this.txtUser.EditValue = "admin";
-            this.txtUser.Location = new System.Drawing.Point(102, 9);
+            this.txtUser.EditValue = "";
+            this.txtUser.Location = new System.Drawing.Point(168, 9);
             this.txtUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txtUser.Name = "txtUser";
             this.txtUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtUser.Properties.Appearance.Options.UseFont = true;
             this.txtUser.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
-            this.txtUser.Size = new System.Drawing.Size(154, 30);
+            this.txtUser.Size = new System.Drawing.Size(211, 30);
             this.txtUser.TabIndex = 21;
             // 
-            // chkSaveLoginInfo
+            // ckRemember
             // 
-            this.chkSaveLoginInfo.Location = new System.Drawing.Point(102, 139);
-            this.chkSaveLoginInfo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.chkSaveLoginInfo.Name = "chkSaveLoginInfo";
-            this.chkSaveLoginInfo.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
-            this.chkSaveLoginInfo.Properties.Appearance.Options.UseForeColor = true;
-            this.chkSaveLoginInfo.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat;
-            this.chkSaveLoginInfo.Properties.Caption = "淇濆瓨鐧诲綍淇℃伅";
-            this.chkSaveLoginInfo.Size = new System.Drawing.Size(157, 26);
-            this.chkSaveLoginInfo.TabIndex = 17;
+            this.ckRemember.Location = new System.Drawing.Point(168, 139);
+            this.ckRemember.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.ckRemember.Name = "ckRemember";
+            this.ckRemember.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.ckRemember.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
+            this.ckRemember.Properties.Appearance.Options.UseFont = true;
+            this.ckRemember.Properties.Appearance.Options.UseForeColor = true;
+            this.ckRemember.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat;
+            this.ckRemember.Properties.Caption = "淇濆瓨鐧诲綍淇℃伅";
+            this.ckRemember.Size = new System.Drawing.Size(157, 27);
+            this.ckRemember.TabIndex = 17;
             // 
             // txtPwd
             // 
-            this.txtPwd.EditValue = "csframework";
-            this.txtPwd.Location = new System.Drawing.Point(102, 52);
+            this.txtPwd.EditValue = "";
+            this.txtPwd.Location = new System.Drawing.Point(168, 53);
             this.txtPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txtPwd.Name = "txtPwd";
             this.txtPwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtPwd.Properties.Appearance.Options.UseFont = true;
             this.txtPwd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.txtPwd.Properties.PasswordChar = '*';
-            this.txtPwd.Size = new System.Drawing.Size(154, 30);
+            this.txtPwd.Size = new System.Drawing.Size(211, 30);
             this.txtPwd.TabIndex = 22;
             // 
             // btnCancel
             // 
+            this.btnCancel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnCancel.Appearance.Options.UseFont = true;
             this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
-            this.btnCancel.Location = new System.Drawing.Point(223, 193);
+            this.btnCancel.Location = new System.Drawing.Point(276, 192);
             this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(87, 37);
+            this.btnCancel.Size = new System.Drawing.Size(103, 37);
             this.btnCancel.TabIndex = 15;
             this.btnCancel.Text = "鍙栨秷 (&C)";
             // 
             // labelControl3
             // 
+            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.ForeColor = System.Drawing.Color.Black;
+            this.labelControl3.Appearance.Options.UseFont = true;
             this.labelControl3.Appearance.Options.UseForeColor = true;
             this.labelControl3.Appearance.Options.UseTextOptions = true;
             this.labelControl3.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
             this.labelControl3.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
-            this.labelControl3.Location = new System.Drawing.Point(6, 97);
+            this.labelControl3.Location = new System.Drawing.Point(3, 102);
             this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(93, 18);
+            this.labelControl3.Size = new System.Drawing.Size(162, 18);
             this.labelControl3.TabIndex = 233;
             this.labelControl3.Text = "缁勭粐鏈烘瀯锛�";
             // 
-            // txtDataset
-            // 
-            this.txtDataset.Location = new System.Drawing.Point(102, 93);
-            this.txtDataset.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txtDataset.Name = "txtDataset";
-            this.txtDataset.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
-            this.txtDataset.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtDataset.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] {
-            new DevExpress.XtraEditors.Controls.LookUpColumnInfo("DataSetID", "甯愬缂栧彿", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default),
-            new DevExpress.XtraEditors.Controls.LookUpColumnInfo("DataSetName", "甯愬鍚嶇О", 200, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)});
-            this.txtDataset.Properties.NullText = "";
-            this.txtDataset.Properties.PopupWidth = 343;
-            this.txtDataset.Size = new System.Drawing.Size(154, 26);
-            this.txtDataset.TabIndex = 228;
-            // 
             // btnLogin
             // 
+            this.btnLogin.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnLogin.Appearance.Options.UseFont = true;
             this.btnLogin.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.btnLogin.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnLogin.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLogin.ImageOptions.Image")));
-            this.btnLogin.Location = new System.Drawing.Point(102, 193);
+            this.btnLogin.Location = new System.Drawing.Point(159, 192);
             this.btnLogin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnLogin.Name = "btnLogin";
-            this.btnLogin.Size = new System.Drawing.Size(87, 37);
+            this.btnLogin.Size = new System.Drawing.Size(102, 37);
             this.btnLogin.TabIndex = 14;
             this.btnLogin.Text = "鐧诲綍 (&L)";
             // 
@@ -179,10 +180,10 @@
             this.labelControl2.Appearance.Options.UseTextOptions = true;
             this.labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
             this.labelControl2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
-            this.labelControl2.Location = new System.Drawing.Point(6, 58);
+            this.labelControl2.Location = new System.Drawing.Point(3, 59);
             this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(93, 18);
+            this.labelControl2.Size = new System.Drawing.Size(162, 18);
             this.labelControl2.TabIndex = 232;
             this.labelControl2.Text = "瀵嗙爜锛�";
             // 
@@ -195,23 +196,23 @@
             this.labelControl1.Appearance.Options.UseTextOptions = true;
             this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
             this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
-            this.labelControl1.Location = new System.Drawing.Point(6, 15);
+            this.labelControl1.Location = new System.Drawing.Point(3, 15);
             this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(93, 18);
+            this.labelControl1.Size = new System.Drawing.Size(162, 18);
             this.labelControl1.TabIndex = 231;
             this.labelControl1.Text = "鐧诲綍甯愬彿锛�";
             // 
-            // lblLoadingInfo
+            // label1
             // 
-            this.lblLoadingInfo.AutoSize = true;
-            this.lblLoadingInfo.BackColor = System.Drawing.Color.Transparent;
-            this.lblLoadingInfo.ForeColor = System.Drawing.Color.White;
-            this.lblLoadingInfo.Location = new System.Drawing.Point(215, 444);
-            this.lblLoadingInfo.Name = "lblLoadingInfo";
-            this.lblLoadingInfo.Size = new System.Drawing.Size(83, 18);
-            this.lblLoadingInfo.TabIndex = 242;
-            this.lblLoadingInfo.Text = "鍑嗗灏辩华...";
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.label1.Location = new System.Drawing.Point(13, 758);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(163, 21);
+            this.label1.TabIndex = 245;
+            this.label1.Text = "鎶�鏈敮鎸侊細骞挎繁绉戞妧";
             // 
             // FrmLogin
             // 
@@ -219,23 +220,23 @@
             this.Appearance.Options.UseBackColor = true;
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.None;
+            this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Stretch;
             this.BackgroundImageStore = global::Gs.DevApp.Properties.Resources.login_bg6;
-            this.ClientSize = new System.Drawing.Size(782, 806);
+            this.ClientSize = new System.Drawing.Size(782, 793);
+            this.Controls.Add(this.label1);
             this.Controls.Add(this.lbVersion);
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.lblLoadingInfo);
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FrmLogin";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.chkSaveLoginInfo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDataset.Properties)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -246,14 +247,14 @@
         private System.Windows.Forms.Label lbVersion;
         private System.Windows.Forms.Panel panel1;
         private DevExpress.XtraEditors.TextEdit txtUser;
-        private DevExpress.XtraEditors.CheckEdit chkSaveLoginInfo;
+        private DevExpress.XtraEditors.CheckEdit ckRemember;
         private DevExpress.XtraEditors.TextEdit txtPwd;
         private DevExpress.XtraEditors.SimpleButton btnCancel;
         private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.LookUpEdit txtDataset;
         private DevExpress.XtraEditors.SimpleButton btnLogin;
         private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraEditors.LabelControl labelControl1;
-        private System.Windows.Forms.Label lblLoadingInfo;
+        private System.Windows.Forms.ComboBox comOrg;
+        private System.Windows.Forms.Label label1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3