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

Windows/Print.xaml.cs

@@ -121,11 +121,11 @@ namespace formula_manage.Windows
 
         private void Button_Click_1(object sender, RoutedEventArgs e)  //编辑模板
         {
-         /*   if (string.IsNullOrEmpty(Print_path.Text))
+           if (string.IsNullOrEmpty(Print_path.Text))
             {
                 System.Windows.MessageBox.Show("模板不能为空");
                 return;
-            }*/
+            }
             var data = this.CreateBillData();
             if (!data.Item1)
             {
@@ -142,11 +142,11 @@ namespace formula_manage.Windows
 
         private void Button_Click_12(object sender, RoutedEventArgs e)  //编辑模板
         {
-            /*   if (string.IsNullOrEmpty(Print_path.Text))
+            if (string.IsNullOrEmpty(Print_path.Text))
                {
                    System.Windows.MessageBox.Show("模板不能为空");
                    return;
-               }*/
+               }
             var data = this.CreateBillData();
             if (!data.Item1)
             {

formula_manage.csproj

@@ -154,8 +154,12 @@
     <Reference Include="ModernUI.Xceed.Toolkit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.Toolkit.dll</HintPath>
     </Reference>
+    <Reference Include="Smart.FormDesigner, Version=1.4.8302.26895, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Smart.FormDesigner.1.4.3\lib\net40\Smart.FormDesigner.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
     <Reference Include="System.Printing" />

packages.config

@@ -8,6 +8,7 @@
   <package id="ModernUI.WPF" version="1.0.9" targetFramework="net46" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net46" />
   <package id="SamOatesGames.ModernUI.Xceed.Toolkit" version="1.0.1905191936" targetFramework="net46" />
+  <package id="Smart.FormDesigner" version="1.4.3" targetFramework="net462" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />
   <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net46" />
 </packages>