diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx index 996225cd..22ec12ec 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx index 34934a3c..52cbee4a 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx index 4b19d0a2..9fb36e52 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx @@ -41,12 +41,18 @@ <%-- --%> - + <%-- - + --%> + + + + + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs index 813e96eb..44c8426b 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs @@ -3,6 +3,7 @@ using FineUIPro.Web.DataShow; using Model; using System; using System.Linq; +using System.Web.UI.WebControls; namespace FineUIPro.Web.ReportManage.HazardFactor { @@ -78,8 +79,12 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; //this.txtConsequence.Text = model.Consequence; - this.rblConsequence.SelectedValue = model.Consequence; - this.txtAccidentType.Text = model.AccidentType; + //this.rblConsequence.SelectedValue = model.Consequence; + if (!string.IsNullOrWhiteSpace(model.Consequence)) + { + this.cblConsequence.SelectedValueArray = model.Consequence.Split('、'); + } + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); @@ -163,7 +168,12 @@ namespace FineUIPro.Web.ReportManage.HazardFactor model.JobStep = this.txtJobStep.Text.Trim(); model.Hazard = this.txtHazard.Text.Trim(); //model.Consequence = this.txtConsequence.Text.Trim(); - model.Consequence = this.rblConsequence.SelectedValue; + //model.Consequence = this.rblConsequence.SelectedValue; + if (this.cblConsequence.SelectedValueArray.Length > 0) + { + string selConsequences = String.Join("、", cblConsequence.SelectedValueArray); + model.Consequence = selConsequences; + } model.AccidentType = this.txtAccidentType.Text.Trim(); model.Illegality = this.rblIllegality.SelectedValue == "1"; model.BaseRiskSeverity = int.Parse(this.txtBaseRiskSeverity.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs index 985836da..a3a8017f 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs @@ -96,13 +96,13 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// rblConsequence 控件。 + /// cblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList rblConsequence; + protected global::FineUIPro.CheckBoxList cblConsequence; /// /// txtAccidentType 控件。 diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs index 5965d66a..598482de 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs @@ -355,11 +355,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor if (!string.IsNullOrEmpty(rData4)) { //Consequence = rData4; - if (!validConsequenceStrings.Any(x => x == rData4)) + rData4 = rData4.Replace(",", "、").Replace(",", "、").Replace(";", "、"); + int err = 0; + var Consequences = rData4.Split('、'); + foreach (var obj in Consequences) { - lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]!" }); + string item = obj.ToString().Trim(); + if (!validConsequenceStrings.Any(x => x == item)) + { + err++; + lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = $"[{item}]错误,只能是[人员伤亡/财产损失/环境破坏/公司声誉]!" }); + } } - else + if (err == 0) { Consequence = rData4; } @@ -475,7 +483,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor var entity = new Model.HazardFactor_OccHealth { ID = SQLHelper.GetNewID(typeof(Model.HazardFactor_OccHealth)), - CompileDate=DateTime.Now, + CompileDate = DateTime.Now, CompileMan = this.CompileMan, CompileManName = this.CompileManName, State = int.Parse(BLL.Const.State_1),//默认已提交 diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx index 5c845ad8..77bc272c 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx @@ -47,12 +47,18 @@ <%-- --%> - + <%-- - + --%> + + + + + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs index bec0ce47..78fcc61d 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs @@ -64,7 +64,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; //this.txtConsequence.Text = model.Consequence; - this.rblConsequence.SelectedValue = model.Consequence; + //this.rblConsequence.SelectedValue = model.Consequence; + if (!string.IsNullOrWhiteSpace(model.Consequence)) + { + this.cblConsequence.SelectedValueArray = model.Consequence.Split('、'); + } this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs index 4c97647a..b56a6621 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs @@ -105,13 +105,13 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// rblConsequence 控件。 + /// cblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList rblConsequence; + protected global::FineUIPro.CheckBoxList cblConsequence; /// /// txtAccidentType 控件。 diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx index 3a3274c3..0f88fd8d 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx @@ -41,12 +41,18 @@ <%-- --%> - + <%-- - + --%> + + + + + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs index 9011ff0d..8daff3f9 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs @@ -77,7 +77,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; //this.txtConsequence.Text = model.Consequence; - this.rblConsequence.SelectedValue = model.Consequence; + //this.rblConsequence.SelectedValue = model.Consequence; + if (!string.IsNullOrWhiteSpace(model.Consequence)) + { + this.cblConsequence.SelectedValueArray = model.Consequence.Split('、'); + } this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); @@ -162,7 +166,12 @@ namespace FineUIPro.Web.ReportManage.HazardFactor model.JobStep = this.txtJobStep.Text.Trim(); model.Hazard = this.txtHazard.Text.Trim(); //model.Consequence = this.txtConsequence.Text.Trim(); - model.Consequence = this.rblConsequence.SelectedValue; + //model.Consequence = this.rblConsequence.SelectedValue; + if (this.cblConsequence.SelectedValueArray.Length > 0) + { + string selConsequences = String.Join("、", cblConsequence.SelectedValueArray); + model.Consequence = selConsequences; + } model.AccidentType = this.txtAccidentType.Text.Trim(); model.Illegality = this.rblIllegality.SelectedValue == "1"; model.BaseRiskSeverity = int.Parse(this.txtBaseRiskSeverity.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs index ca400157..98a6fbe8 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs @@ -96,13 +96,13 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// rblConsequence 控件。 + /// cblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList rblConsequence; + protected global::FineUIPro.CheckBoxList cblConsequence; /// /// txtAccidentType 控件。 diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs index 9a3726f2..605785b7 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs @@ -355,11 +355,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor if (!string.IsNullOrEmpty(rData4)) { //Consequence = rData4; - if (!validConsequenceStrings.Any(x => x == rData4)) + rData4 = rData4.Replace(",", "、").Replace(",", "、").Replace(";", "、"); + int err = 0; + var Consequences = rData4.Split('、'); + foreach (var obj in Consequences) { - lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]!" }); + string item = obj.ToString().Trim(); + if (!validConsequenceStrings.Any(x => x == item)) + { + err++; + lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = $"[{item}]错误,只能是[人员伤亡/财产损失/环境破坏/公司声誉]!" }); + } } - else + if (err == 0) { Consequence = rData4; } diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx index feccd925..b58e2fa1 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx @@ -47,12 +47,18 @@ <%-- --%> - + <%-- - + --%> + + + + + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs index 17631420..8c5ce3f7 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs @@ -63,7 +63,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; //this.txtConsequence.Text = model.Consequence; - this.rblConsequence.SelectedValue = model.Consequence; + //this.rblConsequence.SelectedValue = model.Consequence; + if (!string.IsNullOrWhiteSpace(model.Consequence)) + { + this.cblConsequence.SelectedValueArray = model.Consequence.Split('、'); + } this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs index 08bac186..33d9faf3 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs @@ -105,13 +105,13 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// rblConsequence 控件。 + /// cblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList rblConsequence; + protected global::FineUIPro.CheckBoxList cblConsequence; /// /// txtAccidentType 控件。