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

MainWindow.xaml

@@ -29,7 +29,11 @@
                     <MenuItem Header="_客户" FontSize="16"/>
                 </MenuItem>
             </MenuItem>
-            <MenuItem Header="_查询" FontSize="16"/>
+            <MenuItem Header="_查询" FontSize="16">
+                <MenuItem Header="_料单查询" FontSize="16"/>
+                <MenuItem Header="_历史查询" FontSize="16"/>
+                <MenuItem Header="_统计" FontSize="16"/>
+            </MenuItem>
         </Menu>
         <DataGrid x:Name="Selectio" AlternationCount="2" IsReadOnly="False" 
                   Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"

Windows/Sql.xaml

@@ -4,9 +4,26 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
-        mc:Ignorable="d"
+        mc:Ignorable="d" Title="Sql" Loaded="Window_SQL" 
-        Title="Sql" Height="450" Width="800">
+        Height="450" Width="248" MaxHeight="450" MaxWidth="248" ResizeMode="NoResize">
     <Grid>
-        
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,20,0,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" Width="144"/>
+        <ComboBox HorizontalAlignment="Center" Height="20"  Margin="0,50,0,0" VerticalAlignment="Top" Width="144">
+            <ComboBoxItem Content="Windows 身份认证"></ComboBoxItem>
+            <ComboBoxItem Content="SQL SERVER 身份认证"></ComboBoxItem>
+        </ComboBox>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,80,0,0" TextWrapping="Wrap" Text="Dispensing" VerticalAlignment="Top" Width="144"/>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,110,0,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top" Width="144"/>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,140,0,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" Width="144"/>
+        <RadioButton Content="连接对象" HorizontalAlignment="Left" Height="19" Margin="52,170,0,0" VerticalAlignment="Top" Width="115"/>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,190,0,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" Width="144" IsEnabled="False"/>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,250,0,0" TextWrapping="Wrap" Text="BatchDyeingCentral" VerticalAlignment="Top" Width="144"/>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,280,0,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top" Width="144"/>
+        <TextBox HorizontalAlignment="Center" Height="20" Margin="0,310,0,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" Width="144"/>
+        <ComboBox HorizontalAlignment="Center" Height="20"  Margin="0,220,0,0" VerticalAlignment="Top" Width="144">
+            <ComboBoxItem Content="Windows 身份认证"></ComboBoxItem>
+            <ComboBoxItem Content="SQL SERVER 身份认证"></ComboBoxItem>
+        </ComboBox>
+        <Button Content="保存" HorizontalAlignment="Center" Height="34" Margin="0,362,0,0" VerticalAlignment="Top" Width="81" BorderBrush="White"/>
     </Grid>
 </Window>

Windows/Sql.xaml.cs

@@ -11,6 +11,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using System.Data.SqlClient;
 
 namespace formula_manage.Windows
 {
@@ -24,5 +25,10 @@ namespace formula_manage.Windows
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
         }
+
+        private void Window_SQL(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }