提交集团数据穿透修改
This commit is contained in:
@@ -92,6 +92,10 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
{
|
||||
this.drpInjury.SelectedValue = accidentPersonRecord.Injury;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(accidentPersonRecord.IsAttempt)&& accidentPersonRecord.IsAttempt=="1")
|
||||
{
|
||||
this.ckIsAttempt.Checked = true;
|
||||
}
|
||||
this.txtInjuryPart.Text = accidentPersonRecord.InjuryPart;
|
||||
this.txtHssePersons.Text = accidentPersonRecord.HssePersons;
|
||||
this.txtInjuryResult.Text = accidentPersonRecord.InjuryResult;
|
||||
@@ -110,11 +114,6 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
// this.txtFileContents.Text = HttpUtility.HtmlDecode(codeTemplateRule.Template);
|
||||
//}
|
||||
}
|
||||
///初始化审核菜单
|
||||
this.ctlAuditFlow.MenuId = BLL.Const.ProjectAccidentPersonRecordMenuId;
|
||||
this.ctlAuditFlow.DataId = this.AccidentPersonRecordId;
|
||||
this.ctlAuditFlow.ProjectId = this.ProjectId;
|
||||
this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -124,13 +123,13 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
/// </summary>
|
||||
private void InitDropDownList()
|
||||
{
|
||||
AccidentTypeService.InitAccidentTypeDropDownList(this.drpAccidentTypeId,true);
|
||||
AccidentTypeService.InitAccidentTypeDropDownList(this.drpAccidentTypeId, true);
|
||||
UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.ProjectId, true);
|
||||
PersonService.InitPersonByProjectUnitDropDownList(this.drpPersonId, this.ProjectId, string.Empty, true);
|
||||
BLL.ConstValue.InitConstValueDropDownList(this.drpInjury, ConstValue.Group_Accident, true);
|
||||
}
|
||||
|
||||
#region 保存、提交
|
||||
#region 保存
|
||||
/// <summary>
|
||||
/// 保存按钮
|
||||
/// </summary>
|
||||
@@ -157,37 +156,6 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 提交按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnSubmit_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (this.drpAccidentTypeId.SelectedValue == BLL.Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择事故类别!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (this.drpWorkAreaId.SelectedValue == BLL.Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择单位工程!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (this.drpPersonId.SelectedValue == BLL.Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择人员姓名!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
|
||||
{
|
||||
ShowNotify("请选择下一步办理人!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
this.SaveData(BLL.Const.BtnSubmit);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 保存数据
|
||||
/// </summary>
|
||||
@@ -218,7 +186,14 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
{
|
||||
accidentPersonRecord.Injury = this.drpInjury.SelectedValue;
|
||||
}
|
||||
|
||||
if (this.ckIsAttempt.Checked==true)
|
||||
{
|
||||
accidentPersonRecord.IsAttempt = "1";
|
||||
}
|
||||
else
|
||||
{
|
||||
accidentPersonRecord.IsAttempt = "0";
|
||||
}
|
||||
accidentPersonRecord.InjuryPart = this.txtInjuryPart.Text.Trim();
|
||||
accidentPersonRecord.HssePersons = this.txtHssePersons.Text.Trim();
|
||||
accidentPersonRecord.InjuryResult = this.txtInjuryResult.Text.Trim();
|
||||
@@ -227,19 +202,7 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
accidentPersonRecord.FileContent = HttpUtility.HtmlEncode(this.txtFileContents.Text);
|
||||
accidentPersonRecord.CompileMan = this.CurrUser.UserId;
|
||||
accidentPersonRecord.CompileDate = DateTime.Now;
|
||||
accidentPersonRecord.States = BLL.Const.State_0;
|
||||
if (type == BLL.Const.BtnSubmit)
|
||||
{
|
||||
var flowOperate = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == this.AccidentPersonRecordId && x.State == BLL.Const.State_2 && x.IsClosed == true);
|
||||
if (flowOperate != null)
|
||||
{
|
||||
accidentPersonRecord.States = BLL.Const.State_2;
|
||||
}
|
||||
else
|
||||
{
|
||||
accidentPersonRecord.States = this.ctlAuditFlow.NextStep;
|
||||
}
|
||||
}
|
||||
accidentPersonRecord.States = BLL.Const.State_2;
|
||||
if (!string.IsNullOrEmpty(this.AccidentPersonRecordId))
|
||||
{
|
||||
accidentPersonRecord.AccidentPersonRecordId = this.AccidentPersonRecordId;
|
||||
@@ -253,8 +216,7 @@ namespace FineUIPro.Web.HSSE.Accident
|
||||
BLL.AccidentPersonRecordService.AddAccidentPersonRecord(accidentPersonRecord);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, this.AccidentPersonRecordId, BLL.Const.ProjectAccidentPersonRecordMenuId, Const.BtnAdd);
|
||||
}
|
||||
////保存流程审核数据
|
||||
this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectAccidentPersonRecordMenuId, this.AccidentPersonRecordId, (type == BLL.Const.BtnSubmit ? true : false), this.drpPersonId.SelectedText, "../Accident/AccidentPersonRecordView.aspx?AccidentPersonRecordId={0}");
|
||||
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user