diff --git a/Windows/Print.xaml b/Windows/Print.xaml
index b24c359..995afb8 100644
--- a/Windows/Print.xaml
+++ b/Windows/Print.xaml
@@ -5,12 +5,12 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
         mc:Ignorable="d" Loaded="Window_Print" 
-        Title="打印设置" Height="500" Width="500" MaxWidth="500">
+        Title="打印设置" Height="400" 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" VerticalAlignment="Top" Width="285" MaxLines="1" IsReadOnly="True"/>
         <Button Content="浏览路径" HorizontalAlignment="Left" Height="20" Margin="375,35,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click"/>
-        <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,70,0,0" TextWrapping="Wrap" Text="默认打印模板:" VerticalAlignment="Top" Width="90"/>
+        <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,65,0,0" TextWrapping="Wrap" Text="默认打印模板:" VerticalAlignment="Top" Width="90"/>
         <ComboBox HorizontalAlignment="Left" Height="20" Margin="110,65,0,0" VerticalAlignment="Top" Width="180" x:Name="Template_M"/>
         <CheckBox HorizontalAlignment="Left" Height="15" Margin="20,95,0,0" Content="默认打印机:" VerticalAlignment="Top" Width="90"
                   x:Name="TEXT_Print" Checked="Print_Checked" Unchecked="Print_Checked"/>
@@ -23,7 +23,7 @@
         <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,175,0,0" TextWrapping="Wrap" Text="模板路径:" VerticalAlignment="Top" Width="70" FontSize="16"/>
         <TextBox x:Name="Print_path2" HorizontalAlignment="Left" Height="20" Margin="90,175,0,0" VerticalAlignment="Top" Width="285" MaxLines="1"/>
         <Button Content="浏览路径" HorizontalAlignment="Left" Height="20" Margin="375,175,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click1"/>
-        <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,210,0,0" TextWrapping="Wrap" Text="默认打印模板:" VerticalAlignment="Top" Width="90"/>
+        <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,205,0,0" TextWrapping="Wrap" Text="默认打印模板:" VerticalAlignment="Top" Width="90"/>
         <ComboBox HorizontalAlignment="Left" Height="20" Margin="110,205,0,0" VerticalAlignment="Top" Width="180" x:Name="Template_S"/>
         <CheckBox HorizontalAlignment="Left" Height="15" Margin="20,235,0,0" Content="同步推送:" VerticalAlignment="Top" Width="90"
            x:Name="TEXT_Print2" Checked="Print_Checked2" Unchecked="Print_Checked2"/>
@@ -35,6 +35,9 @@
            x:Name="cbxPrinter3" SelectedValuePath="Element[OPTIONCODE].Value" DisplayMemberPath="Element[OPTIONNAME].Value"/>
         <Button Content="预览模板" HorizontalAlignment="Left" Height="20" Margin="375,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_22"/>
         <Button Content="编辑模板" HorizontalAlignment="Left" Height="20" Margin="295,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_12"/>
-
+        <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,305,0,0" TextWrapping="Wrap" Text="管理打印模板:" VerticalAlignment="Top" Width="90"/>
+        <ComboBox HorizontalAlignment="Left" Height="20" Margin="110,305,0,0" VerticalAlignment="Top" Width="180" x:Name="Template" IsEditable="True"/>
+        <Button Content="删除模板" HorizontalAlignment="Left" Height="20" Margin="375,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_3"/>
+        <Button Content="添加模板" HorizontalAlignment="Left" Height="20" Margin="295,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_4"/>
     </Grid>
 </Window>
diff --git a/Windows/Print.xaml.cs b/Windows/Print.xaml.cs
index b02f0a6..fc2437e 100644
--- a/Windows/Print.xaml.cs
+++ b/Windows/Print.xaml.cs
@@ -90,11 +90,18 @@ namespace formula_manage.Windows
             Template_S.DisplayMemberPath = "Name";
             Template_M.Text = Temp_M;//传入保存的默认模板
             Template_S.Text = Temp_S;//
+
+            Template.ItemsSource = files_M;
+            Template.DisplayMemberPath = "Name";
         }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
         {
             MessageBoxResult result = System.Windows.MessageBox.Show("设置完成后请重启程序", "提示", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel);
+            if (result == MessageBoxResult.Cancel) //判断是否确认
+            {
+                e.Cancel = true; // 中断点击事件
+            }
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
             Configini.IniWritevalue("PRINTER", " P1", Printer.ToString());
@@ -221,5 +228,15 @@ namespace formula_manage.Windows
             }
             return list;
         }
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Button_Click_4(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }