提交当前本机整理版本
This commit is contained in:
@@ -144,4 +144,16 @@ namespace Lskj.Model
|
||||
this.FormKey=rowItem["formkey"]+"";
|
||||
this.OverBackOper = rowItem["overbackoper"] + "";
|
||||
this.OverBackCond = rowItem["overbackcond"] + "";
|
||||
this.OverBackSql = rowItem["overba
|
||||
this.OverBackSql = rowItem["overbacksql"] + "";
|
||||
this.OverBackKey = rowItem["overbackkey"] + "";
|
||||
this.Prefix = rowItem.Table.Columns.Contains("prefix") ? rowItem["prefix"] + "" : "";
|
||||
this.CondSql = string.Format("select * from p_systembillsourcecond where formKey='{0}' order by orderid", OverBackKey);
|
||||
this.FilePreviewCode = rowItem.Table.Columns.Contains("FilePreviewCode") ? rowItem["FilePreviewCode"] + "": "";
|
||||
this.BelowDetailLine = rowItem.Table.Columns.Contains("BelowDetailLine") ? rowItem["BelowDetailLine"] + "" : "";
|
||||
this.BelowDetailSql = rowItem.Table.Columns.Contains("BelowDetailSql") ? rowItem["BelowDetailSql"] + "" : "";
|
||||
this.MuitlAuditBackFlag = rowItem.Table.Columns.Contains("MuitlAuditBackFlag") ? rowItem["MuitlAuditBackFlag"] + "" == "1" : this.MuitlAuditFlag;
|
||||
this.DisableAutomaticRefresh = rowItem.Table.Columns.Contains("DisableAutomaticRefresh") ? rowItem["DisableAutomaticRefresh"] + "" == "1" : false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,4 +36,25 @@ namespace Lskj.Model
|
||||
/// <summary>
|
||||
/// 滚动条显示
|
||||
/// </summary>
|
||||
/// <param name="rowItem"></param
|
||||
/// <param name="rowItem"></param>
|
||||
public bool DisplayScroll;
|
||||
/// <summary>
|
||||
/// 保存成功才刷新
|
||||
/// </summary>
|
||||
public bool SaveSuccessfullyRefresh;
|
||||
/// <summary>
|
||||
/// 审核时保存附加模块
|
||||
/// </summary>
|
||||
public bool ReviewSaveAdditional;
|
||||
|
||||
public BaseAuditModel(DataRow rowItem)
|
||||
: base(rowItem)
|
||||
{
|
||||
if (rowItem == null) return;
|
||||
this.BackSelected = rowItem.Table.Columns.Contains("backSelected") ? rowItem["backSelected"] + "" : "0";
|
||||
this.DisplayScroll= rowItem.Table.Columns.Contains("DisplayScroll") ?"1".Equals( rowItem["DisplayScroll"] + "") : false;
|
||||
this.SaveSuccessfullyRefresh = rowItem.Table.Columns.Contains("SaveSuccessfullyRefresh") ? "1".Equals(rowItem["SaveSuccessfullyRefresh"] + "") : false;
|
||||
this.ReviewSaveAdditional = rowItem.Table.Columns.Contains("ReviewSaveAdditional") ? "1".Equals(rowItem["ReviewSaveAdditional"] + "") : false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -59,4 +59,17 @@ namespace Lskj.Model
|
||||
/// 单据审批模型
|
||||
/// </summary>
|
||||
/// <param name="rowItem">The row item.</param>
|
||||
public BillA
|
||||
public BillAuditModel(DataRow rowItem)
|
||||
: base(rowItem)
|
||||
{
|
||||
if (rowItem == null) return;
|
||||
DataColumnCollection columns = rowItem.Table.Columns;
|
||||
this.BackSelected = columns.Contains("backSelected") ? rowItem["backSelected"] + "" : "0";
|
||||
this.AuditLoadDetailFlag = columns.Contains("AuditLoadDetailFlag") ? rowItem["AuditLoadDetailFlag"] + "" : "";
|
||||
this.SaveRefresh = columns.Contains("SaveRefresh") ? "1".Equals(rowItem["SaveRefresh"] + "") : false;
|
||||
this.SaveSuccessfullyRefresh = rowItem.Table.Columns.Contains("SaveSuccessfullyRefresh") ? "1".Equals(rowItem["SaveSuccessfullyRefresh"] + "") : false;
|
||||
this.ReviewSaveAdditional = rowItem.Table.Columns.Contains("ReviewSaveAdditional") ? "1".Equals(rowItem["ReviewSaveAdditional"] + "") : false;
|
||||
this.HighlightChangeControl = rowItem.Table.Columns.Contains("HighlightChangeControl") ? "1".Equals(rowItem["HighlightChangeControl"] + "") : false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -564,4 +564,13 @@ namespace Lskj.Model
|
||||
this.SaveRefreshAdditional = rowItem.Table.Columns.Contains("SaveRefreshAdditional") ? "1".Equals(rowItem["SaveRefreshAdditional"] + "") : false;
|
||||
this.CancelCopyAssociation = rowItem.Table.Columns.Contains("CancelCopyAssociation") ? !"1".Equals(rowItem["CancelCopyAssociation"] + "") : true;
|
||||
this.PrintingConditions = rowItem.Table.Columns.Contains("PrintingConditions") ? rowItem["PrintingConditions"] + "" : "";
|
||||
this.SaveVerifyBillNo = ro
|
||||
this.SaveVerifyBillNo = rowItem.Table.Columns.Contains("SaveVerifyBillNo") ? "1".Equals(rowItem["SaveVerifyBillNo"] + "") : false;
|
||||
this.DragFixedDefault = rowItem.Table.Columns.Contains("DragFixedDefault") ? "1".Equals(rowItem["DragFixedDefault"] + "") : false;
|
||||
this.CsignFieldName = rowItem.Table.Columns.Contains("CsignFieldName")&&!string.IsNullOrWhiteSpace(rowItem["CsignFieldName"] + "") ? rowItem["CsignFieldName"] + "" : "csign";
|
||||
this.AdditionalCond = rowItem.Table.Columns.Contains("AdditionalCond") ? rowItem["AdditionalCond"] + "" : "";
|
||||
this.BillFinalReviewAdd = rowItem.Table.Columns.Contains("BillFinalReviewAdd") ? "1".Equals(rowItem["BillFinalReviewAdd"] + "") : false;
|
||||
this.SourceMainPushPullHide = rowItem.Table.Columns.Contains("SourceMainPushPullHide") ? "1".Equals(rowItem["SourceMainPushPullHide"] + "") : false;
|
||||
this.SelectSourceColor = rowItem.Table.Columns.Contains("SelectSourceColor") ? rowItem["SelectSourceColor"] + "" : "";
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -28,3 +28,44 @@ namespace Lskj.Model
|
||||
/// <summary>
|
||||
/// 模块名称
|
||||
/// </summary>
|
||||
public string Name;
|
||||
/// <summary>
|
||||
/// 模块句柄
|
||||
/// </summary>
|
||||
public IntPtr ModuleInPtr;
|
||||
/// <summary>
|
||||
/// 模块句柄
|
||||
/// </summary>
|
||||
public Process ModuleProcess;
|
||||
/// <summary>
|
||||
/// C#调用模块Form
|
||||
/// </summary>
|
||||
public object ModuleForm;
|
||||
/// <summary>
|
||||
/// 模块标记
|
||||
/// </summary>
|
||||
public string Tag;
|
||||
/// <summary>
|
||||
/// DLL名称
|
||||
/// </summary>
|
||||
public string DllName;
|
||||
/// <summary>
|
||||
/// 返回结果
|
||||
/// </summary>
|
||||
public StringBuilder Result;
|
||||
/// <summary>
|
||||
/// 上一次选中page
|
||||
/// </summary>
|
||||
public XtraTabPage BeforePage;
|
||||
|
||||
/// <summary>
|
||||
/// 是否关闭
|
||||
/// </summary>
|
||||
public bool IsClose = true;
|
||||
/// <summary>
|
||||
/// 模块编号
|
||||
/// </summary>
|
||||
public string Code;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2693,4 +2693,44 @@ namespace Lskj.Model
|
||||
JArray jArray = new JArray();
|
||||
jArray.Add(rowObject);
|
||||
DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray));
|
||||
|
||||
this.MaintabFocusedRow = dataTable.Rows[0];
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 导入dll
|
||||
/// </summary>
|
||||
public class DynamicImport : DynamicModel
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键名称
|
||||
/// </summary>
|
||||
public string PrimaryKey { get; set; }
|
||||
public DynamicImport(string[] args)
|
||||
: base(args)
|
||||
{
|
||||
// 右键菜单打开的模块没有moduleId,部分特殊模块没有moduleId比如添加界面.
|
||||
if (!string.IsNullOrEmpty(args[5]))
|
||||
{
|
||||
base.ModuleId = Convert.ToInt32(args[5]);
|
||||
}
|
||||
if (args.Length > 6 && !string.IsNullOrWhiteSpace(args[6]))
|
||||
{
|
||||
base.ModuleCode = args[6];
|
||||
}
|
||||
if (args.Length > 7 )
|
||||
{
|
||||
this.PrimaryKey = args[7];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -499,4 +499,41 @@ namespace Lskj.Model
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 页面水印层
|
||||
/// </summary>
|
||||
public Form WatermarkForm;
|
||||
|
||||
/// <summary>
|
||||
/// 单据水印 草稿替换值
|
||||
/// </summary>
|
||||
public string DraftReplacementValue="";
|
||||
|
||||
/// <summary>
|
||||
/// 是否有可翻译的文本
|
||||
/// </summary>
|
||||
public bool Translatable;
|
||||
/// <summary>
|
||||
/// 翻译文本存放字典
|
||||
/// </summary>
|
||||
public Dictionary<string, string> ContrastiveLanguage;
|
||||
|
||||
/// <summary>
|
||||
/// 传入文本,获取对应语言的翻译文本
|
||||
/// </summary>
|
||||
/// <param name="text"></param>
|
||||
/// <returns></returns>
|
||||
public string GetTranslatedText(string text)
|
||||
{
|
||||
string value = text;
|
||||
if (this.ContrastiveLanguage.ContainsKey(text))
|
||||
{
|
||||
value = this.ContrastiveLanguage[text];
|
||||
}
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -74,4 +74,30 @@ namespace Lskj.Model
|
||||
/// <summary>
|
||||
/// 单据审核弹出框附加信息表格
|
||||
/// </summary>
|
||||
p
|
||||
public static string AuditPopupAttachGridView = "AuditPopupAttachGridView_";
|
||||
/// <summary>
|
||||
/// 单据已完成单据主表格
|
||||
/// </summary>
|
||||
public static string AuditOverMainGridView = "AuditOverMainGridView_";
|
||||
/// <summary>
|
||||
/// 单据已完成单据明细表格
|
||||
/// </summary>
|
||||
public static string AuditOverDetailGridView = "AuditOverDetailGridView_";
|
||||
/// <summary>
|
||||
/// 附件表格
|
||||
/// </summary>
|
||||
public static string AttachGridView = "AttachGridView_";
|
||||
/// <summary>
|
||||
/// 单据详情表格
|
||||
/// </summary>
|
||||
public static string BillInfoGridView = "BillInfoGridView_";
|
||||
/// <summary>
|
||||
/// 配置文件内置表
|
||||
/// </summary>
|
||||
public static string BaseCadGridView = "BaseCadGridView_";
|
||||
/// <summary>
|
||||
/// pubspec主表
|
||||
/// </summary>
|
||||
public static string PubSpecMainGridView = "PubSpecMainGridView_";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1235,4 +1235,14 @@ namespace Lskj.Model
|
||||
this.EnterToNextRow = rowItem.Table.Columns.Contains("EnterToNextRow") ? "1".Equals(rowItem["EnterToNextRow"] + "") : false;
|
||||
this.AggregationFreeze = rowItem.Table.Columns.Contains("AggregationFreeze") ? !"1".Equals(rowItem["AggregationFreeze"] + "") : true;
|
||||
this.LeafNodeRefresh = rowItem.Table.Columns.Contains("LeafNodeRefresh") ? "1".Equals(rowItem["LeafNodeRefresh"] + "") : false;
|
||||
this.DragToLeft = rowItem.Table.Columns.Contains("DragToLeft") ? "1".Equals(rowItem["DragToLeft
|
||||
this.DragToLeft = rowItem.Table.Columns.Contains("DragToLeft") ? "1".Equals(rowItem["DragToLeft"] + "") : false;
|
||||
this.CancelDefaultConditions = rowItem.Table.Columns.Contains("CancelDefaultConditions") ? "1".Equals(rowItem["CancelDefaultConditions"] + "") : false;
|
||||
this.AutoImportCalMode = rowItem.Table.Columns.Contains("AutoImportCalMode") ? "1".Equals(rowItem["AutoImportCalMode"] + "") : false;
|
||||
this.AssociateLeft = rowItem.Table.Columns.Contains("AssociateLeft") ? "1".Equals(rowItem["AssociateLeft"] + "") : false;
|
||||
this.AddAndSubmit = rowItem.Table.Columns.Contains("AddAndSubmit") ? "1".Equals(rowItem["AddAndSubmit"] + "") : false;
|
||||
this.TotalQuantity = rowItem.Table.Columns.Contains("TotalQuantity") ? "1".Equals(rowItem["TotalQuantity"] + "") : false;
|
||||
this.HeaderSortCriteria = rowItem.Table.Columns.Contains("HeaderSortCriteria") ? rowItem["HeaderSortCriteria"] + "" : "";
|
||||
this.HideReviewBut = rowItem.Table.Columns.Contains("HideReviewBut") ? "1".Equals(rowItem["HideReviewBut"] + "") : false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,4 +89,24 @@ namespace Lskj.Model
|
||||
// 设置打印文本
|
||||
if (columns.Contains(prefix + "printCount"))
|
||||
{
|
||||
this.Print = "打印" + (string.IsNullOrEmpty(rowItem[prefix + "printCount"] + "") ? "0次" : rowItem[prefix + "printCount"] + "
|
||||
this.Print = "打印" + (string.IsNullOrEmpty(rowItem[prefix + "printCount"] + "") ? "0次" : rowItem[prefix + "printCount"] + "次");
|
||||
if (ERPInfo.Instance.Translatable)
|
||||
{
|
||||
string quantity = string.IsNullOrEmpty(rowItem[prefix + "printCount"] + "") ? "0" : rowItem[prefix + "printCount"]+"";
|
||||
this.Print = ERPInfo.Instance.GetTranslatedText("打印") + quantity + ERPInfo.Instance.GetTranslatedText("次");
|
||||
}
|
||||
}
|
||||
// 设置收款文本
|
||||
if (columns.Contains(prefix + "collectMoneyFlag") && "1".Equals(rowItem[prefix + "collectMoneyFlag"] + ""))
|
||||
{
|
||||
this.Collect = "已收款";
|
||||
}
|
||||
}
|
||||
if (ERPInfo.Instance.Translatable)
|
||||
{
|
||||
if(!string.IsNullOrWhiteSpace(this.Text))this.Text = ERPInfo.Instance.GetTranslatedText(this.Text);
|
||||
if (!string.IsNullOrWhiteSpace(this.Collect)) this.Collect = ERPInfo.Instance.GetTranslatedText(this.Collect);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user