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

MainWindow.xaml

@@ -7,10 +7,31 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="720" Width="1280" BorderBrush="White" Background="#FFE0E0E0">
     <Grid>
+        <Menu>
+            <MenuItem Header="_设置" FontSize="16">
+                <MenuItem Header="_数据库设置" FontSize="16"/>
+                <MenuItem Header="_备份/还原" FontSize="16"/>
+                <MenuItem Header="_料单设置" FontSize="16"/>
+                <MenuItem Header="_用户设置" FontSize="16"/>
+            </MenuItem>
+            <MenuItem Header="_数据" FontSize="16">
+                <MenuItem Header="_染机..." FontSize="16"/>
+                <MenuItem Header="_原料..." FontSize="16"/>
+                <MenuItem Header="_配方..." FontSize="16"/>
+                <MenuItem Header="_工艺..." FontSize="16"/>
+                <Separator />
+                <MenuItem Header="其它...">
+                    <MenuItem Header="_品名" FontSize="16"/>
+                    <MenuItem Header="_色号" FontSize="16"/>
+                    <MenuItem Header="_客户" FontSize="16"/>
+                </MenuItem>
+            </MenuItem>
+            <MenuItem Header="_查询" FontSize="16"/>
+        </Menu>
         <DataGrid x:Name="DataGridMachines" AlternationCount="2" IsReadOnly="True" 
                   Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" 
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
-                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False">
+                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>