SVN r801
SVN-Revision: r801
This commit is contained in:
@@ -1252,11 +1252,22 @@ namespace Lskj.Control
|
||||
string nextSelectStepOper = string.Empty;
|
||||
try
|
||||
{
|
||||
List<string> Documents = new List<string>();
|
||||
foreach (DataRow item in rowItems)
|
||||
{
|
||||
string stepCode = item[this.BaseAccraditModelObj.TmpStepField] + "";
|
||||
string tmpParmaryField = this.isBill ? this.BaseAccraditModelObj.TmpParmaryField : this.BaseAccraditModelObj.KeyField;
|
||||
string BillDocumentId = item[tmpParmaryField] + "";
|
||||
|
||||
if (Documents.Contains(BillDocumentId))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
Documents.Add(BillDocumentId);
|
||||
}
|
||||
|
||||
//DataRow _baseRowData = BaseAuditImpl.GetCurrentControlData(ReplaceHelper.ReplaceWhereCond(ReplaceHelper.ReplaceUserInfo(this.AuditComModelObj.MenuSql)), this.ModuleModelObj.ParmaryKey, this.SysModel.PrimaryValue);
|
||||
// 判断主表数据是否有未保存列
|
||||
DataRow _baseRowData = BaseAuditImpl.GetCurrentFlowRowData(this.BaseAccraditModelObj.BillTable, tmpParmaryField, item[tmpParmaryField] + "");
|
||||
@@ -1409,6 +1420,7 @@ namespace Lskj.Control
|
||||
try
|
||||
{
|
||||
int ret = 0;
|
||||
List<string> Documents = new List<string>();
|
||||
foreach (DataRow item in rowItems)
|
||||
{
|
||||
//AccraditationModel AccditModelObj = AuditComModelObj.Moduletype == "bill" ? new AccraditationModel(BillAuditImpl.GetBillFlowData(this.SysModel.ModuleCode, item[this.BaseAccraditModelObj.TmpStepField] + "")) : new AccraditationModel(BaseAuditImpl.GetCurrentStepFlow(this.SysModel.ModuleCode, item[this.BaseAccraditModelObj.TmpStepField] + ""));
|
||||
@@ -1419,6 +1431,16 @@ namespace Lskj.Control
|
||||
int beforeId = 0;
|
||||
string stepCode = item[this.BaseAccraditModelObj.TmpStepField] + "";
|
||||
string billDocumentId = item[tmpParmaryField] + "";
|
||||
|
||||
if (Documents.Contains(billDocumentId))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
Documents.Add(billDocumentId);
|
||||
}
|
||||
|
||||
//string billDocumentId = item[this.BaseAccraditModelObj.TmpParmaryField] + "";
|
||||
bool isBack = string.IsNullOrEmpty(this.BaseAccraditModelObj.MenuCond) ||
|
||||
this.SectionAccradit == null ||
|
||||
@@ -1758,4 +1780,34 @@ namespace Lskj.Control
|
||||
/// <summary>
|
||||
/// <para>说明:设置分割条位置</para>
|
||||
/// <para>创建人:龚宇超</para>
|
||||
/// <para>创建日期��
|
||||
/// <para>创建日期:2018-02-01 </para>
|
||||
/// <para>修改人:</para>
|
||||
/// <para>修改日期:</para>
|
||||
/// <para>修改备注:</para>
|
||||
/// <para>版本:1.0</para>
|
||||
/// </summary>
|
||||
protected void InitlizeSpiltLocation()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (splitBelow.PanelVisibility == SplitPanelVisibility.Both)
|
||||
{
|
||||
string width = IniHelper.Read(string.Format("BelowDetai_width_{0}", this.SysModel.ModuleCode));//通过Key获取Value值
|
||||
if (!string.IsNullOrEmpty(width))
|
||||
{
|
||||
this.splitBelow.SplitterPosition = Convert.ToInt32(width);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.Instance.WriteError(ex);
|
||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
||||
MessageUtil.Show(Message, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user