Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Login.xaml.cs

@@ -44,14 +44,24 @@ namespace formula_manage
         {
             if ((Name.Text == "engineer" || Name.Text == "ENGINEER") && (Pasword.Password == "engineer" || Pasword.Password == "ENGINEER"))
             {
+                Window window = Window.GetWindow(this);
                 MainWindow Main = new MainWindow();
+                window.Close();
                 Main.ShowDialog();//实例化并置顶打开信息窗口
-                this.Close();
             }
             else
             {
                 System.Windows.MessageBox.Show("账号或密码错误");
             }
         }
+
+        private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                SendKeys.SendWait("{tab}");
+            }
+        }
+
     }
 }