zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Manager/CompletionReportEdit.aspx.cs
+6 -14
View File
@@ -63,12 +63,12 @@ namespace FineUIPro.Web.HSSE.Manager
}
this.txtCompletionReportCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.CompletionReportId);
this.txtCompletionReportName.Text = completionReport.CompletionReportName;
this.txtRemark.Text = completionReport.Remark;
if (!string.IsNullOrEmpty(completionReport.CompileMan))
{
this.drpCompileMan.SelectedValue = completionReport.CompileMan;
}
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", completionReport.CompileDate);
this.txtFileContent.Text = HttpUtility.HtmlDecode(completionReport.FileContent);
}
}
else
@@ -84,11 +84,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.txtCompletionReportCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectCompletionReportMenuId, this.ProjectId, this.CurrUser.UnitId);
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectCompletionReportMenuId;
this.ctlAuditFlow.DataId = this.CompletionReportId;
this.ctlAuditFlow.ProjectId = this.ProjectId;
this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
}
}
#endregion
@@ -134,19 +130,17 @@ namespace FineUIPro.Web.HSSE.Manager
{
ProjectId = this.ProjectId,
CompletionReportCode = this.txtCompletionReportCode.Text.Trim(),
CompletionReportName = this.txtCompletionReportName.Text.Trim()
CompletionReportName = this.txtCompletionReportName.Text.Trim(),
Remark = this.txtRemark.Text.Trim()
};
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
completionReport.CompileMan = this.drpCompileMan.SelectedValue;
}
completionReport.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
completionReport.FileContent = HttpUtility.HtmlEncode(this.txtFileContent.Text);
completionReport.States = BLL.Const.State_0;
if (type == BLL.Const.BtnSubmit)
{
completionReport.States = this.ctlAuditFlow.NextStep;
}
if (!string.IsNullOrEmpty(this.CompletionReportId))
{
completionReport.CompletionReportId = this.CompletionReportId;
@@ -160,8 +154,6 @@ namespace FineUIPro.Web.HSSE.Manager
BLL.CompletionReportService.AddCompletionReport(completionReport);
BLL.LogService.AddSys_Log(this.CurrUser, completionReport.CompletionReportCode, completionReport.CompletionReportId, BLL.Const.ProjectCompletionReportMenuId, BLL.Const.BtnAdd);
}
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectCompletionReportMenuId, this.CompletionReportId, (type == BLL.Const.BtnSubmit ? true : false), completionReport.CompletionReportName, "../Manager/CompletionReportView.aspx?CompletionReportId={0}");
}
#endregion