修改登录账套

UAS_MES_YDCY/Login.Designer.cs

@@ -37,11 +37,11 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.label4 = new System.Windows.Forms.Label();
             this.Source = new System.Windows.Forms.TextBox();
+            this.DB = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.label3 = new System.Windows.Forms.Label();
             this.LoginButton = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
             this.label5 = new System.Windows.Forms.Label();
-            this.DB = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
@@ -51,7 +51,7 @@
             this.UserName.Location = new System.Drawing.Point(94, 62);
             this.UserName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.UserName.Name = "UserName";
-            this.UserName.Size = new System.Drawing.Size(200, 23);
+            this.UserName.Size = new System.Drawing.Size(200, 39);
             this.UserName.TabIndex = 0;
             this.UserName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.UserName_KeyDown);
             // 
@@ -61,8 +61,9 @@
             this.PassWord.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.PassWord.Name = "PassWord";
             this.PassWord.PasswordChar = '*';
-            this.PassWord.Size = new System.Drawing.Size(200, 23);
+            this.PassWord.Size = new System.Drawing.Size(200, 39);
             this.PassWord.TabIndex = 1;
+            this.PassWord.TextChanged += new System.EventHandler(this.PassWord_TextChanged);
             this.PassWord.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PassWord_KeyDown);
             // 
             // ForGetPwd
@@ -70,7 +71,7 @@
             this.ForGetPwd.AutoSize = true;
             this.ForGetPwd.Location = new System.Drawing.Point(295, 66);
             this.ForGetPwd.Name = "ForGetPwd";
-            this.ForGetPwd.Size = new System.Drawing.Size(68, 17);
+            this.ForGetPwd.Size = new System.Drawing.Size(134, 31);
             this.ForGetPwd.TabIndex = 5;
             this.ForGetPwd.TabStop = true;
             this.ForGetPwd.Text = "忘记密码？";
@@ -81,7 +82,7 @@
             this.label1.AutoSize = true;
             this.label1.Location = new System.Drawing.Point(42, 66);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(44, 17);
+            this.label1.Size = new System.Drawing.Size(86, 31);
             this.label1.TabIndex = 4;
             this.label1.Text = "用户名";
             // 
@@ -90,7 +91,7 @@
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(42, 111);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(44, 17);
+            this.label2.Size = new System.Drawing.Size(83, 31);
             this.label2.TabIndex = 5;
             this.label2.Text = "密   码";
             // 
@@ -118,7 +119,7 @@
             this.label4.AutoSize = true;
             this.label4.Location = new System.Drawing.Point(42, 160);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(44, 17);
+            this.label4.Size = new System.Drawing.Size(83, 31);
             this.label4.TabIndex = 14;
             this.label4.Text = "资   源";
             // 
@@ -127,16 +128,26 @@
             this.Source.Location = new System.Drawing.Point(94, 157);
             this.Source.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Source.Name = "Source";
-            this.Source.Size = new System.Drawing.Size(200, 23);
+            this.Source.Size = new System.Drawing.Size(200, 39);
             this.Source.TabIndex = 2;
+            this.Source.TextChanged += new System.EventHandler(this.Source_TextChanged);
             this.Source.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Source_KeyDown);
             // 
+            // DB
+            // 
+            this.DB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.DB.FormattingEnabled = true;
+            this.DB.Location = new System.Drawing.Point(94, 204);
+            this.DB.Name = "DB";
+            this.DB.Size = new System.Drawing.Size(200, 39);
+            this.DB.TabIndex = 3;
+            // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(42, 209);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(44, 17);
+            this.label3.Size = new System.Drawing.Size(86, 31);
             this.label3.TabIndex = 11;
             this.label3.Text = "数据库";
             // 
@@ -172,22 +183,13 @@
             this.label5.ForeColor = System.Drawing.Color.White;
             this.label5.Location = new System.Drawing.Point(3, 5);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(164, 25);
+            this.label5.Size = new System.Drawing.Size(327, 50);
             this.label5.TabIndex = 0;
             this.label5.Text = "UAS制造执行系统";
             // 
-            // DB
-            // 
-            this.DB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.DB.FormattingEnabled = true;
-            this.DB.Location = new System.Drawing.Point(94, 204);
-            this.DB.Name = "DB";
-            this.DB.Size = new System.Drawing.Size(200, 25);
-            this.DB.TabIndex = 3;
-            // 
             // Login
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.BackgroundImage = global::UAS_MES_NEW.Properties.Resources.LoginBG;
@@ -206,11 +208,11 @@
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Login_Paint);
             this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Login_MouseDown);
             this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.Login_MouseMove);
-            this.panel1.ResumeLayout(true);
+            this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.panel2.ResumeLayout(true);
+            this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
 
         }
 

UAS_MES_YDCY/Login.cs

@@ -11,6 +11,8 @@ using System.Threading;
 using System.Drawing;
 using UAS_MES_NEW.Properties;
 using System.IO;
+using DevExpress.XtraScheduler;
+using DevExpress.XtraPrinting;
 
 namespace UAS_MES_NEW
 {
@@ -185,7 +187,9 @@ namespace UAS_MES_NEW
         private void Source_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
+            {
                 LoginButton.PerformClick();
+            }
         }
 
         private void PassWord_KeyDown(object sender, KeyEventArgs e)
@@ -273,5 +277,18 @@ namespace UAS_MES_NEW
             Point cur = MousePosition;
             this.Location = new Point(cur.X - offset.X, cur.Y - offset.Y);
         }
+
+        private void Source_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void PassWord_TextChanged(object sender, EventArgs e)
+        {
+            //if (dh.getFieldDataByCondition("employee", "em_type", "em_code='" + UserName.Text + "' and em_password='" + PassWord.Text + "'").ToString() == "admin")
+            //{
+            //    Source.Enabled = true;
+            //}
+        }
     }
 }

UAS_MES_YDCY/Main.cs

@@ -289,13 +289,13 @@ namespace UAS_MES_NEW
                                 PaOutBoxCode = Pack.pa_outboxcode.Text;
                             }
                             break;
-                        case "Make!ColorBoxWeigh":
-                            Make.Make_ColorBoxWeigh ColorWeigh = (Make.Make_ColorBoxWeigh)MainTabControl.SelectedTab.Controls[0];
-                            if (ColorWeigh.ob_checkno.Text != "")
-                            {
-                                ObCheckno = ColorWeigh.ob_checkno.Text;
-                            }
-                            break;
+                        //case "Make!ColorBoxWeigh":
+                        //    Make.Make_ColorBoxWeigh ColorWeigh = (Make.Make_ColorBoxWeigh)MainTabControl.SelectedTab.Controls[0];
+                        //    if (ColorWeigh.ob_checkno.Text != "")
+                        //    {
+                        //        ObCheckno = ColorWeigh.ob_checkno.Text;
+                        //    }
+                        //    break;
                     
                         default:
                             break;