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

Windows/Print.xaml

@@ -5,10 +5,14 @@
         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="500" MaxWidth="500">
     <Grid>
+        <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,35,0,0" TextWrapping="Wrap" Text="打印模板:" VerticalAlignment="Top" Width="70" FontSize="16"/>
         <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"/>
+        <CheckBox HorizontalAlignment="Left" Height="15" Margin="20,60,0,0" Content="默认打印机:" VerticalAlignment="Top" Width="110"/>
+        <Button Content="编辑模板"  HorizontalAlignment="Right" Height="20" Margin="0,60,150,0" VerticalAlignment="Top" Width="85" Background="#FFE6E6E6" Click="Button_Click_1"/>
+        <Button Content="预览" HorizontalAlignment="Right" Height="20" Margin="0,60,50,0" VerticalAlignment="Top" Width="85" Background="#FFE6E6E6" Click="Button_Click_2"/>
 
     </Grid>
 </Window>

Windows/Print.xaml.cs

@@ -36,5 +36,7 @@ namespace formula_manage.Windows
                 Print_path.Text = Dilog.SelectedPath;   //返回选择的字符串
             }
         }
+
+
     }
 }