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

MainWindow.xaml

@@ -71,7 +71,7 @@
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,140,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,175,0,0" TextWrapping="Wrap" Text="表单:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
         <ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="38,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True" Grid.Column="1"/>
-        <TextBox x:Name="Number" HorizontalAlignment="Left" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="Number" HorizontalAlignment="Left" ToolTip="当前配方的物料单" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" Grid.ColumnSpan="2"/>
         <TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <TextBox x:Name="ReDye" HorizontalAlignment="Left" Height="30" Margin="38,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" 
                  MaxLines="1" MaxLength="2" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Focusable ="False" Grid.Column="1"/>

MainWindow.xaml.cs

@@ -317,7 +317,8 @@ namespace formula_manage
         }
         private void PRINT_SET(object sender, RoutedEventArgs e)
         {
-            
+            Windows.Print print = new Windows.Print();
+            print.ShowDialog();//实例化并置顶打开打印窗口
         }
         private void HELP(object sender, RoutedEventArgs e)
         {

Windows/Print.xaml

@@ -5,8 +5,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
         mc:Ignorable="d"
-        Title="打印预览窗口" Height="450" Width="800">
+        Title="打印设置" Height="450" Width="800">
     <Grid>
-        <DocumentViewer Name="docViewer"></DocumentViewer>
+        <TextBox x:Name="Print_path" HorizontalAlignment="Left" Height="20" Margin="90,35,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="285"/>
+        <Button x:Name="Print_path_select" Content="浏览路径" HorizontalAlignment="Left" Height="20" Margin="375,35,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click"/>
+
     </Grid>
 </Window>

Windows/Print.xaml.cs

@@ -7,6 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -24,5 +25,16 @@ namespace formula_manage.Windows
             InitializeComponent();
         }
 
+        private void Button_Click(object sender, RoutedEventArgs e)  //SQL_DISPEN_bak路径选择按钮
+        {
+            FolderBrowserDialog Dilog = new FolderBrowserDialog();
+            Dilog.SelectedPath = Print_path.Text;  //打开目录
+            Dilog.ShowNewFolderButton = false;   //不显示新建文件夹按钮
+                                                 //
+            if (Dilog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                Print_path.Text = Dilog.SelectedPath;   //返回选择的字符串
+            }
+        }
     }
 }