SVN r1049

SVN-Revision: r1049

插件库/Lskj.Model/BaseAuditModel.cs

@@ -28,3 +28,12 @@ namespace Lskj.Model
         /// </summary>
         /// <value>The name of the step over.</value>
         public string StepOverName { get { return this.PrefixKey + "stepover"; } }
+        /// <summary>
+        /// 返退标记
+        /// </summary>
+        /// <value>The back selected.</value>
+        public string BackSelected { get; set; }
+        /// <summary>
+        /// 滚动条显示
+        /// </summary>
+        /// <param name="rowItem"></param

插件库/Lskj.Model/BillAuditModel.cs

@@ -41,4 +41,12 @@ namespace Lskj.Model
         /// 返回标记
         /// </summary>
         /// <value>The back selected.</value>
-        public b
+        public bool SaveRefresh { get; set; }
+        /// <summary>
+        /// 保存成功才刷新
+        /// </summary>
+        public bool SaveSuccessfullyRefresh;
+        /// <summary>
+        /// 审核时保存附加模块
+        /// </summary>
+        public bool ReviewSaveAdditional

插件库/Lskj.Model/BillModel.cs

@@ -411,6 +411,14 @@ namespace Lskj.Model
         ///单据来源控件FieldName（设置后界面上不显示来源和来源明细）
         /// </summary>
         public string BillSourceControlName;
+        /// <summary>
+        ///单据明细拖拽条件（为树表格时推拽改变父节点和来源明细中推拽内容上去）
+        /// </summary>
+        public string TreeTableDragCondition;
+        /// <summary>
+        ///是否固定替换（默认为true，主表中固定后缀的控件会替换为固定的默认值）
+        /// </summary>
+        public bool isReplaceFixed;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BillModel"/> class.
@@ -494,4 +502,6 @@ namespace Lskj.Model
             this.CodeExecuteParameter = rowItem.Table.Columns.Contains("CodeExecuteParameter") ? rowItem["CodeExecuteParameter"] + "" : "";
             //this.CenterMain = rowItem.Table.Columns.Contains("CenterMain") ? "1".Equals(rowItem["CenterMain"] + "") : false;
             this.ScanCodeModuleCode = rowItem.Table.Columns.Contains("ScanCodeModuleCode") ? rowItem["ScanCodeModuleCode"] + "" : "";
-            t
+            this.ScanCodeFixedPrefix = rowItem.Table.Columns.Contains("ScanCodeFixedPrefix") ? rowItem["ScanCodeFixedPrefix"] + "" : "";
+            this.RightModuleCode = rowItem.Table.Columns.Contains("RightModuleCode") ? rowItem["RightModuleCode"] + "" : "";
+            this.RefreshSelectedDe

插件库/Lskj.Model/DynamicModel.cs

@@ -698,6 +698,7 @@ namespace Lskj.Model
         /// </summary>
         public string StepOver;
 
+
         public DynamicPubAccraditionPopModel(string[] args)
             : base(args)
         {
@@ -2645,4 +2646,24 @@ namespace Lskj.Model
             {
                 base.ModuleId = Convert.ToInt32(args[5]);
             }
-            if (args.
+            if (args.Length > 6 && !string.IsNullOrWhiteSpace(args[6]))
+            {
+                base.ModuleCode = args[6];
+            }
+            if (args.Length > 10)
+            {
+                this.Params = new string[args.Length];
+                for (int i = 10; i < args.Length; i++)
+                {
+                    Params[i - 10] = args[i];
+                }
+            }
+            if (!string.IsNullOrEmpty(args[args.Length - 1]))
+            {
+                try
+                {
+                    JObject rowObject = JsonConvert.DeserializeObject<JObject>(args[args.Length - 1]);
+                    JArray jArray = new JArray();
+                    jArray.Add(rowObject);
+                    DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray));
+                

插件库/Lskj.Model/ERPInfo.cs

@@ -264,7 +264,7 @@ namespace Lskj.Model
         /// </summary>
         public string MrpTag = "";
         /// <summary>  
-        /// 记录本机MAC地址（每次获取速度很慢）
+        /// 记录本机MAC地址（只记录初始获取的，每次获取导致速度很慢）
         /// </summary>  
         public string RecordMAC = "";