Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Login.xaml

@@ -16,9 +16,9 @@
         </Rectangle>
         <ComboBox x:Name="User" Height="24" Margin="60,164,10,0" VerticalAlignment="Top" FontSize="14" IsEditable="True" KeyUp="SearchBox_OnKeyDownd"/>
         <PasswordBox x:Name="Pasword" Height="24" Margin="60,210,10,0" VerticalAlignment="Top" FontSize="14" KeyUp="SearchBox_OnKeyDownd"/>
-        <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,166,0,0" TextWrapping="Wrap" Text="账号" VerticalAlignment="Top" Width="41" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
+        <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,163,0,0" TextWrapping="Wrap" Text="账号:" VerticalAlignment="Top" Width="45" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
-        <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,210,0,0" TextWrapping="Wrap" Text="密码" VerticalAlignment="Top" Width="41" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
+        <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,208,0,0" TextWrapping="Wrap" Text="密码:" VerticalAlignment="Top" Width="45" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
-        <Button Content="登录" HorizontalAlignment="Left" Height="23" Margin="60,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click_1" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
+        <Button x:Name="logon" Content="登录" HorizontalAlignment="Left" Height="23" Margin="60,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click_1" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
         <Button Content="退出" HorizontalAlignment="Left" Height="23" Margin="140,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
         <TextBlock Height="30" Margin="15,115,15,0" TextWrapping="Wrap" Text="尚彩科技单据管理系统" VerticalAlignment="Top" FontSize="20"/>
 

Login.xaml.cs

@@ -61,24 +61,23 @@ namespace formula_manage
 
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
-
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;
         string TEXT_SQLUSER;
         string TEXT_SQLPASWOR;
         string Connstr_SC;
-        int i;
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            logon.IsEnabled = false;  //关闭登录按钮
+
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
             TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
             TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
             TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
             TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
             TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
-            int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL3"), out i);   //读数据库状态配置文件
+            if (TEXT_SQMOD == "0")  //判断连接方式
-            if (i == 0)
             {
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
             }
@@ -86,10 +85,13 @@ namespace formula_manage
             {
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
             }
-            SqlConnection conn_DBC = new SqlConnection(Connstr_SC);
+            SqlConnection conn_SC = new SqlConnection(Connstr_SC);
-            conn_DBC.Open();
+            conn_SC.Open();
-            conn_DBC.Close();
+         //   conn_SC.OpenAsync();
+            conn_SC.Close();
+
 
+            logon.IsEnabled = true;  //允许登录按钮
             UserClass.PressKey.PressKeys(Keys.Tab, false);
             UserClass.PressKey.PressKeys(Keys.Tab, true);
         }