diff --git a/插件库/Lskj.Model/BaseAuditModel.cs b/插件库/Lskj.Model/BaseAuditModel.cs
index c41607b..9efbfac 100644
--- a/插件库/Lskj.Model/BaseAuditModel.cs
+++ b/插件库/Lskj.Model/BaseAuditModel.cs
@@ -28,3 +28,12 @@ namespace Lskj.Model
///
/// The name of the step over.
public string StepOverName { get { return this.PrefixKey + "stepover"; } }
+ ///
+ /// 返退标记
+ ///
+ /// The back selected.
+ public string BackSelected { get; set; }
+ ///
+ /// 滚动条显示
+ ///
+ ///
/// The back selected.
- public b
\ No newline at end of file
+ public bool SaveRefresh { get; set; }
+ ///
+ /// 保存成功才刷新
+ ///
+ public bool SaveSuccessfullyRefresh;
+ ///
+ /// 审核时保存附加模块
+ ///
+ public bool ReviewSaveAdditional
\ No newline at end of file
diff --git a/插件库/Lskj.Model/BillModel.cs b/插件库/Lskj.Model/BillModel.cs
index 427995b..2af79ab 100644
--- a/插件库/Lskj.Model/BillModel.cs
+++ b/插件库/Lskj.Model/BillModel.cs
@@ -411,6 +411,14 @@ namespace Lskj.Model
///单据来源控件FieldName(设置后界面上不显示来源和来源明细)
///
public string BillSourceControlName;
+ ///
+ ///单据明细拖拽条件(为树表格时推拽改变父节点和来源明细中推拽内容上去)
+ ///
+ public string TreeTableDragCondition;
+ ///
+ ///是否固定替换(默认为true,主表中固定后缀的控件会替换为固定的默认值)
+ ///
+ public bool isReplaceFixed;
///
/// Initializes a new instance of the 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
\ No newline at end of file
+ this.ScanCodeFixedPrefix = rowItem.Table.Columns.Contains("ScanCodeFixedPrefix") ? rowItem["ScanCodeFixedPrefix"] + "" : "";
+ this.RightModuleCode = rowItem.Table.Columns.Contains("RightModuleCode") ? rowItem["RightModuleCode"] + "" : "";
+ this.RefreshSelectedDe
\ No newline at end of file
diff --git a/插件库/Lskj.Model/DynamicModel.cs b/插件库/Lskj.Model/DynamicModel.cs
index 5e87611..eb1a711 100644
--- a/插件库/Lskj.Model/DynamicModel.cs
+++ b/插件库/Lskj.Model/DynamicModel.cs
@@ -698,6 +698,7 @@ namespace Lskj.Model
///
public string StepOver;
+
public DynamicPubAccraditionPopModel(string[] args)
: base(args)
{
@@ -2645,4 +2646,24 @@ namespace Lskj.Model
{
base.ModuleId = Convert.ToInt32(args[5]);
}
- if (args.
\ No newline at end of file
+ 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(args[args.Length - 1]);
+ JArray jArray = new JArray();
+ jArray.Add(rowObject);
+ DataTable dataTable = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(jArray));
+
\ No newline at end of file
diff --git a/插件库/Lskj.Model/ERPInfo.cs b/插件库/Lskj.Model/ERPInfo.cs
index b4b525c..fd1048a 100644
--- a/插件库/Lskj.Model/ERPInfo.cs
+++ b/插件库/Lskj.Model/ERPInfo.cs
@@ -264,7 +264,7 @@ namespace Lskj.Model
///
public string MrpTag = "";
///
- /// 记录本机MAC地址(每次获取速度很慢)
+ /// 记录本机MAC地址(只记录初始获取的,每次获取导致速度很慢)
///
public string RecordMAC = "";