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

UserClass/PrintHelper.cs

@@ -69,6 +69,36 @@ namespace formula_manage.UserClass
             return new Tuple<bool, string>(flag, msg);
         }
 
+        /// <summary>
+        /// 设计
+        /// </summary>
+        /// <param name="frxPath">模板</param>
+        /// <returns></returns>
+        public static Tuple<bool, string> Design(string frxPath)
+        {
+            bool flag = false;
+            string msg = "";
+            FastReport.Report report = new FastReport.Report();
+            try
+            {
+                report.Load(frxPath);
+                report.DoublePass = true;
+
+                report.Design();
+                flag = true;
+                msg = "Designer Open";
+            }
+            catch (Exception ex)
+            {
+                flag = false;
+                msg = ex.Message;
+            }
+            finally
+            {
+                report.Dispose();
+            }
+            return new Tuple<bool, string>(flag, msg);
+        }
         /// <summary>
         /// 设计
         /// </summary>
@@ -76,7 +106,7 @@ namespace formula_manage.UserClass
         /// <param name="dicParam">字典参数</param>
         /// <param name="dsDataSource">数据源</param>
         /// <returns></returns>
-        public static Tuple<bool, string> Design(string frxPath, Dictionary<string, object> dicParam, DataSet dsDataSource)
+        public static Tuple<bool, string> Designs(string frxPath, Dictionary<string, object> dicParam, DataSet dsDataSource)
         {
             bool flag = false;
             string msg = "";
@@ -103,7 +133,7 @@ namespace formula_manage.UserClass
 
                 report.Design();
                 flag = true;
-                msg = "设计器打开成功";
+                msg = "Designer Open";
             }
             catch (Exception ex)
             {