SVN r1169

SVN-Revision: r1169

插件库/Lskj.Model/BillAuditModel.cs

@@ -38,7 +38,7 @@ namespace Lskj.Model
         /// <value>The back selected.</value>
         public string BackSelected { get; set; }
         /// <summary>
-        /// 返回标记
+        /// 附加模块保持后刷新主表和主表明细
         /// </summary>
         /// <value>The back selected.</value>
         public bool SaveRefresh { get; set; }

插件库/Lskj.Model/BillModel.cs

@@ -435,8 +435,22 @@ namespace Lskj.Model
         ///新增保存时检查单据号
         /// </summary>
         public bool SaveVerifyBillNo;
-
-
+        /// <summary>
+        ///添加明细行时，不包含在推拽行中的列固定为默认值
+        /// </summary>
+        public bool DragFixedDefault;
+        /// <summary>
+        ///凭证模块 替换csign字段的字段名
+        /// </summary>
+        public string CsignFieldName;
+        /// <summary>
+        ///附加模块修改条件（不配置默认根据单据条件ModifyCond判断）
+        /// </summary>
+        public string AdditionalCond;
+        /// <summary>
+        /// 单据终审后可以添加明细
+        /// </summary>
+        public bool BillFinalReviewAdd;
         /// <summary>
         /// Initializes a new instance of the <see cref="BillModel"/> class.
         /// </summary>
@@ -525,4 +539,12 @@ namespace Lskj.Model
             this.InitialRefreshId = rowItem.Table.Columns.Contains("InitialRefreshId") ? rowItem["InitialRefreshId"] + "" : "";
             this.IgnoreAllocated = rowItem.Table.Columns.Contains("IgnoreAllocated") ? "1".Equals(rowItem["IgnoreAllocated"] + "") : false;
             this.BillSourceControlName = rowItem.Table.Columns.Contains("BillSourceControlName") ? rowItem["BillSourceControlName"] + "" : "";
-            if (!string.IsNullOrWhiteSpace(this.BillSource
+            if (!string.IsNullOrWhiteSpace(this.BillSourceControlName)) 
+            {
+                this.PanelWidth = 0;
+                this.PanelHeight = 0;
+            }
+            this.TreeTableDragCondition = rowItem.Table.Columns.Contains("TreeTableDragCondition") ? rowItem["TreeTableDragCondition"] + "" : "";
+            this.isReplaceFixed = rowItem.Table.Columns.Contains("isReplaceFixed") ? !"1".Equals(rowItem["isReplaceFixed"] + "") : true;
+            this.SaveRefreshAdditional = rowItem.Table.Columns.Contains("SaveRefreshAdditional") ? "1".Equals(rowItem["SaveRefreshAdditional"] + "") : false;
+            this.CancelCopyAssociation

插件库/Lskj.Model/DynamicModel.cs

@@ -1487,7 +1487,7 @@ namespace Lskj.Model
         public double PerWidth;//百分比宽
         public double PerHeight;//百分比高
         public bool isCalSize = false;//是否自定义控件高宽
-
+        //public string Delimiter;//批量下载时，多个url的分割符
 
         public DynamicPubBrowerModel(string[] args)
             : base(args)
@@ -1523,6 +1523,12 @@ namespace Lskj.Model
                 this.postData = args[11];
             }
 
+            //if (args.Length > 12 && !string.IsNullOrEmpty(args[12]))
+            //{
+            //    this.Delimiter = args[12];
+            //}
+
+
             if (args.Length > 14 && !string.IsNullOrEmpty(args[13]) && !string.IsNullOrEmpty(args[14]))
             {
                 PerWidth = (int.Parse(args[13].Replace("%", "")) * 0.01);

插件库/Lskj.Model/ModuleModel.cs

@@ -547,6 +547,9 @@ namespace Lskj.Model
         /// 默认空行
         /// </summary>
         public bool DefaultAddEmptyRow;
+        /// <summary>
+        /// 默认搜索
+        /// </summary>
         public bool CsHasDefultSearch;
         /// <summary>
         /// 基础档案是否为左右结构
@@ -1035,7 +1038,10 @@ namespace Lskj.Model
         ///保存后提交（pubadd中，点击提交保存成功后询问是否提交）
         /// </summary>
         public bool AddAndSubmit;
-
+        /// <summary>
+        ///合计显示条数
+        /// </summary>
+        public bool TotalQuantity;
 
 
         #endregion
@@ -1218,4 +1224,5 @@ namespace Lskj.Model
             this.DetaiTabControl = rowItem.Table.Columns.Contains("DetaiTabControl") ? rowItem["DetaiTabControl"] + "" : "";
             this.AttachmentSelectNode = rowItem.Table.Columns.Contains("AttachmentSelectNode") ? "1".Equals(rowItem["AttachmentSelectNode"] + "") : false;
             this.SweepCodeSql = rowItem.Table.Columns.Contains("SweepCodeSql") ? rowItem["SweepCodeSql"] + "" : "";
-            this.EnterToNextRow = rowItem.Table.Columns.Contains("EnterToNextRow") ? "1".Equals(rowItem["EnterToNextRow"] + "") 
+            this.EnterToNextRow = rowItem.Table.Columns.Contains("EnterToNextRow") ? "1".Equals(rowItem["EnterToNextRow"] + "") : false;
+            this.AggregationFreeze = rowItem.Table.Columns.Contains("AggregationFreeze") ? !"1".Equals(rowItem["AggregationFr