SVN-Revision: r924
This commit is contained in:
cyf
2025-08-07 09:29:22 +00:00
parent f7a53010be
commit e6ec3e4886
27 changed files with 4288 additions and 277 deletions
+9 -35
View File
@@ -398,8 +398,8 @@ namespace Lskj.Control
dtCustomQueryFields = BaseModuleImpl.GetCustomQueryFields(this.BaseAccraditModelObj.OverBackKey);
}
string tmpsql = this.BaseAccraditModelObj.OverBackSql;
if (!string.IsNullOrWhiteSpace(BaseAccraditModelObj.OverBackOper))
tmpsql = tmpsql + " and charindex('" + ERPInfo.Instance.UserName + ",','" + BaseAccraditModelObj.OverBackOper + ",')>0";
//if (!string.IsNullOrWhiteSpace(BaseAccraditModelObj.OverBackOper))
// tmpsql = tmpsql + " and charindex('" + ERPInfo.Instance.UserName + ",','" + BaseAccraditModelObj.OverBackOper + ",')>0";
this._searchContrl = new MyControl(tmpsql, this.gridFinish);
this.pl_top.Height = this._searchContrl.InitSearchControl(dtCustomQueryFields, this.pl_top);
}
@@ -581,7 +581,7 @@ namespace Lskj.Control
{
accrModel = new AccraditationModel(flowList.Rows[i - 1]);
}
string key = "FLOWSTEP_" + this.SysModel.ModuleCode + "_" + model.StepCode + "_" + accrModel.Id + "";
string key = "FLOWSTEP_" + this.SysModel.ModuleCode + "_" + accrModel.StepCode + "_" + accrModel.Id + "";
gridPanel.Padding = new System.Windows.Forms.Padding(2);
gridPanel.Dock = DockStyle.Right;
gridPanel.BorderStyle = BorderStyles.NoBorder;
@@ -719,7 +719,11 @@ namespace Lskj.Control
DataTable dataSourceTable = BaseImpl.GetDataTableResult(item.AuditModel.StepSql);
item.GridControlObj.SetGridViewDataSource(dataSourceTable);
item.LabelObj.Text = item.AuditModel.CurstepName + " (" + string.Format(ResourceKeys.RowCountRecond, item.GridControlObj.GridView.RowCount) + " )";
item.GridControlObj.GridView.SelectRowHandler(oldRowHandle);
if (!(BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
{
item.GridControlObj.GridView.SelectRowHandler(oldRowHandle);
}
cnt += item.GridControlObj.GridView.RowCount;
}
tab.TabPage.Text = tab.FlowStepModel.StepGroup + "(" + cnt + ")";
@@ -1780,34 +1784,4 @@ namespace Lskj.Control
/// <summary>
/// <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);
}
}
}
}
/// <para>创建日期