Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_RePrintLabel.Designer.cs

@@ -150,7 +150,6 @@
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(222, 26);
             this.PrintLabel.TabIndex = 189;
-            this.PrintLabel.TextChanged += new System.EventHandler(this.PrintLabel_TextChanged);
             // 
             // label6
             // 
@@ -234,6 +233,7 @@
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 31);
             this.pr_code.TabIndex = 200;
+            this.pr_code.TextChanged += new System.EventHandler(this.PrintLabel_TextChanged);
             // 
             // ms_makecode
             // 
@@ -368,9 +368,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_RePrintLabel_FormClosing);
             this.Load += new System.EventHandler(this.Make_RePrintLabel_Load);
             this.SizeChanged += new System.EventHandler(this.Make_RePrintLabel_SizeChanged);
-            this.panel1.ResumeLayout(true);
+            this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/PublicForm/ChangePwd.Designer.cs

@@ -145,6 +145,7 @@
             this.newpwd.Str1 = null;
             this.newpwd.Str2 = null;
             this.newpwd.TabIndex = 19;
+            this.newpwd.TextChanged += new System.EventHandler(this.checkpwd_TextChanged);
             // 
             // pwd
             // 

UAS-MES/PublicForm/ChangePwd.cs

@@ -47,8 +47,12 @@ namespace UAS_MES.PublicForm
             if (LogicHandler.CheckUserLogin(UserName.Text, pwd.Text, out ErrorMessage))
             {
                 ErrorMessage = "";
-                string SQL = "update  employee set em_password = '"+newpwd.Text+"' where em_code='"+UserName.Text+"' ";
-                dh.ExecuteSql(SQL, "update");
+                String[] password = new string[1];
+                String[] username = new string[1];
+                password[0] = newpwd.Text;
+                username[0] = UserName.Text;
+                string SQL1 = "update  employee set em_password = :passowrd where em_code= :emcode ";
+                dh.BatchInsert(SQL1, new string[] { "passowrd", "emcode" }, password, username);
                 MessageBox.Show("修改密码成功");
                 Close();
             }