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

MainWindow.xaml

@@ -28,6 +28,7 @@
                 <MenuItem Header="_备份/还原" FontSize="16" Name="_SQLBAK" Click="SQLBAK" IsEnabled="False"/>
                 <Separator/>
                 <MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/>
+                <MenuItem Header="_打印设置" FontSize="16" Name="_PRINT_SET" Click="PRINT_SET" IsEnabled="False"/>
                 <MenuItem Header="_用户设置" FontSize="16" Name="_USER_SET" Click="USER_SET" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_管理" FontSize="16" Focusable ="False">

MainWindow.xaml.cs

@@ -90,6 +90,7 @@ namespace formula_manage
                 _SQL.IsEnabled = true;
                 _SQLBAK.IsEnabled = true;
                 _SOFTWARE_SET.IsEnabled = true;
+                _PRINT_SET.IsEnabled = true;
                 _USER_SET.IsEnabled = true;
                 _RECIPE.IsEnabled = true;
                 _PROCESS.IsEnabled = true;
@@ -167,6 +168,7 @@ namespace formula_manage
                 _SQL.IsEnabled = true;
                 _SQLBAK.IsEnabled = true;
                 _SOFTWARE_SET.IsEnabled = true;
+                _PRINT_SET.IsEnabled = true;
                 _USER_SET.IsEnabled = true;
                 _RECIPE.IsEnabled = true;
                 _PROCESS.IsEnabled = true;
@@ -312,6 +314,10 @@ namespace formula_manage
         {
             Windows.User user_set = new Windows.User();
             user_set.ShowDialog();//实例化并置顶打开用户窗口   
+        }
+        private void PRINT_SET(object sender, RoutedEventArgs e)
+        {
+            
         }
         private void HELP(object sender, RoutedEventArgs e)
         {