From 648c93e2892d14e401993f5a98cd98a1007a4575 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 4 Jun 2026 14:34:48 +0800 Subject: [PATCH] 123 --- .../DataIn/安全危害因素数据导入模板.xlsx | Bin 10565 -> 10460 bytes .../DataIn/职业健康危害因素数据导入模板.xlsx | Bin 10563 -> 10459 bytes .../HazardFactorOccHealthEdit.aspx | 10 ++++++++-- .../HazardFactorOccHealthEdit.aspx.cs | 16 +++++++++++++--- ...HazardFactorOccHealthEdit.aspx.designer.cs | 4 ++-- .../HazardFactorOccHealthIn.aspx.cs | 16 ++++++++++++---- .../HazardFactorOccHealthView.aspx | 10 ++++++++-- .../HazardFactorOccHealthView.aspx.cs | 6 +++++- ...HazardFactorOccHealthView.aspx.designer.cs | 4 ++-- .../HazardFactor/HazardFactorSafetyEdit.aspx | 10 ++++++++-- .../HazardFactorSafetyEdit.aspx.cs | 13 +++++++++++-- .../HazardFactorSafetyEdit.aspx.designer.cs | 4 ++-- .../HazardFactor/HazardFactorSafetyIn.aspx.cs | 14 +++++++++++--- .../HazardFactor/HazardFactorSafetyView.aspx | 10 ++++++++-- .../HazardFactorSafetyView.aspx.cs | 6 +++++- .../HazardFactorSafetyView.aspx.designer.cs | 4 ++-- 16 files changed, 97 insertions(+), 30 deletions(-) diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx index 996225cd30f3e93da17fd7595a322d3cac426fa7..22ec12ecb1bd1679f9117985a569e0ded28d8641 100644 GIT binary patch delta 2306 zcmV+d3H|oPQruCnzX5;v+F@E)0RRAC0ssIJ0001FZ(~q$Z*X%jV{dY0E_iKheUi^g z!!R7j?}G18a&MD%e~{32pt6$#!HVK7B)@INHZ4iC+s(5c_7eIIdmslshH1Oi4n@eN z`F`{1CqEKSR(a+;gVJdsBjkGoIUsoC;R?O2l3l$Q}&8dFk?HD5x`v}YUAhVw$@%-B!0z$N34YymhRWQ=n#OfbW6 z4Rp(ni1tXqJ7oE!vIZbHh759$Mq}Ue@lV%)%JrWInxxmvQ?oAZo%XtYw%~2pwO2ar zid9v4)u7R^{yu-cpIzNFS9Mca&x!+zL%}Imz)Ydy-TUTi^BUsbRz1FqX*08vo~Izr z*YW4}?Q{FG+kAxhcW7~qeai&lSRdNjACkMl#bq)@aX^BBOGd6AB)(7m5hdiI{`b-O z+OOTn_XhtH$1bsJn2<3IhIBaU5f6a4@jiYN@i$OQ0|b+hCK|I<1F``M-B875>jVG* zHV=~#1s{J`-E!hK6u$3F-@)VA=@pBS`3o+vlR!wan`E;gKf8P97y+Kxme&?>vQN>= zK0$B$RPA&0lVl9GC`~Uq(_s>Oiw2d0s7H=4Nti|D|7p{e<9_~Q@#j3tlhl2U(ez(SM`%q8csV_B)Uq@kPESxh6$ z%vln;9K&Q`rEx;tnOqbGmfdJ{tkCr%Q(175*Vth5x$n_2^Hw2^xH6K^z~zWPUHWml zw)Q-GmAzTwX4vaGo~;naYNoJ9T3URe?*|Z@X$6fAt`r0&C;!BgS!t?8c>hZ8MI;=LIV$sJqqF(poTCm3Bsi7 zasP>qXb=p{NfR>qCY|6B4y?k%_Ve1?M5=%0Dluks?ydqpV!^#XkJc$y9tc+{)ICe z{Y@GW59`Dn)SI2n2jS?6v6PUcXhjtb`w7bobQqjEdS7w&O1Kgb!fe8eGFC_x{MZ%! zk~nr3_2LODhsq3GV^Iq9Y1rsnPbhy4FJ~Mn22xZoNSQIx8Fra5))~z*<5*|3%8ZH5 zXqOo$I-^r&oGJ#iTPICmU zZgV7+iaFcGsnpE-oKrg5O4WSW#i`WIx#E;6yizz9xtU&(p35BBw~3FtIF(IY<(z$+ z__T{t*~GQt?AydtQ8uM~Qw4u+b4Obu*N}S+`K%#dG~}y>i2IJz@|MWe-9)wdkR}Ux zhe-{Ots*Fe*yzs%tS(Nc#6kZ-l~nLc;-DAkxVUJ^=1}1u5eFrp^GC!%A?Wy+I4B1l zKPC=}LdPe>L22mt32{&$I(|VMXimqc#KAG@_ziJzn!v4MW4M0J@PmJO=LSB$#VviE z$R_ewo-+7LjH_4Rr`$B$AYj>1;6{(~=QLfi>@12`{DP*by8ulzEP%&J!jclG?wMz{ z0p$<-;tgaKxMcX#w-w_*lbT&?)>^f;8uqPXzHgPI`A?&}v<-*`JxB|%QTv~Sc=86S zctaYkgLb!LoMVK)d~|<}5&qOj-@~83{$Bgzm)~BI;!4h;mKcY7;U)_oN(ty371yZa z7MrN6zI^5^mMGfH1LJtHS&x=@zoht)Zq(7p=8W<60Fo4TrDG+;a^Zo0|W{H00000hfa|U60@NSHVFkHK`NsJ zliU+41I99rlL{0wf6jJUYJ318DQ6zCx+XG!g*>8cT->fXzcsV~lO9Tx%7+-sFoBH7F3*AKlbDN)D4mK8mbm~D$pk=UDYi}X1ZRXY zR4WWc8x0=EG=wP+w;3>1iwH=G((TKH=CVvflU?P{@kYOn6YzrSKXgrE( z3ai=!gXH-Y$@EKiDKb(b)hwb4A`kU+$_sb~9At=X?r&+TPu-qrBRoFZaxHXH`m>@? z$Y;Dvje@d>7dJFgiHGb{*U_%m*ejr$MCn1;_LCeHD}SW=LtI2wrPfG zTBhxm4A`klsj6sf1@+KJ-x>I3&$T=KzzRBj%QZW`f70(b)1c>^TGR8H6MSlH-<68- z(e-8KT<4mSL8!EiAxpK_@F zAMv$b^E4D%l7m%C;`!BlId93moGstq1Z~Naxj&t>=T8=k$-Cw3ZF2?wr=eKSTrXNP zdEETj<6pD;6;}@dCzDepKmm}GlqE9)v>=noC6WdB+F@E)lVB!P0XUPjCO`+R1ONbd zY%i0oC>)a*Ck_JKA(JR4H30*YUMEKaYY>y~5EhfYCn^DwljtWp0UMJeC^i8?lUgVy z8zMm}qXYr~038GX01p5F000000096X0001Clba|!0nU@yC?Ol&P{n5J1ONaw4*&od c000000000103ZMW0Q!>@DJurQBme*a0RMMVHUIzs delta 2399 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 delta 1886 zcmV-k2ch`eQNvQOzX1grl27DUlf(flf419@&~~7*lLNtu;w>cKwql!>B--ufSr2;& zeTO}e10Tb*-DZa(~Op9zhOBUW!c4V|1HN+%x28!=zw& zDIrEH&}f{ToMG4hR|H0t^$(Fx&v$>Oe$0q~Hf+^`!C^AUK8`3Xn!)-}CWL*MKVYp9k8c*DNx# zs_dP1x_!3bU3h3Ob#^G$b?wz*t6}|pd_TRqX|L*LvY8bJlthA4u7H_RCENG)*ZMWW zy{%?^In!opCq2tRoUfA4&D-bZN@ctLi16>w;#&KT3Bs{Hw6otQcj3ilIzdT5g3u*H z*AG(Pr~Z%<^3eSI=zQbXZ4^6$|A`})*fmH=NCQI2phw&TlGgk9O(fs5I0MiD4%$zk z`cee|08 zhapFn-EGlD7j4>IHbvVsXn~?YS|E$U=;v5TKBI>-LrUa0sDow+;-9Q%_tmq~> z=wRSFWR*H2p9D-OiHK)2*dGtwFiy3d_iv=HAK7F0n%XmC;;LB5^qF3-B7=^;WLis0RUHeQa^#Y6Jaexx`*@#t z#9^e5TG6$n297B`O^BO-Dv5GVNL1PmbI-^M@w|?{R!13sJ>{F=78@AZ4zu^^ZarQ# zyOGu>1AFAL73w{7`)t_J7xfg|qvH+Yo(vgGfp$7#o*R%Yaz;EXCH7$(hkDS7znbqR z^{s2ZeJ*Sl`pjCnQJ?uF)qdfj(5t%U@Sw?!Q*}ZSR=J`Yf*=%Cp?i)1EaU>XN&&M` zZdGSKbHy8fQXJP*yk4#>PCxT^Z%T1oQ}IT*)|`G|)*RzoQXJP*yj~339C3^g?mKcP z#c?OYT$5Rn`9VBIf@T8SEYJ8^f#{sAl1dN?rjdH@W>^qh+@yZBKESUkh9y^!+@uO_ z5Ew&LCGUWwCA;m2jx~%cBoTu&OQq-n4kT4x!!E*q^{no}5A9_5npU-i=5rD)OF|7I z0ihV^S+~+Q&d_I$WGo8?LXKA4&*-U)MxL>*GMahDhG3ww zGhbSH#-?Djc%>x)x+{Q%47gVWwu->E08l8|E(`fxb_Byjk}}F-o^oGO#3)HD*;SAS z3bH4E5k8lBg7+nY9?7;c3n@Ohj#EhTq2%y^%rze=$U_Brq#%zK71&sXM^}3s$QyTWLaI7NHarLBr+|9RfV&rAUy?HSC9>fVAM@hQs|h?>o|p; zxhpxj)E2tt-gTTp-)sp^uEPtBvn|yuX5ra?k;ptJ?qA0#II$}^^PG5a9jD;Lp5V-L zVqZ|Et$a`f4&_EOMXn$Z737hEJXVk=3X&Y2crDKqxj5*EG4GS;gdd1v&7q?Jm10&g zpEFpT!Zu6`^9Nm0z;{dwvp~g@QyU)+1^%*Wp#@a_ifN${RD9L6&<-lTW?EqQl#lTAGe`4a=EmYAhvr=DZ zw3@1&SC^NQZ=YZN_44ZS$I`pkFRm_sdGpoxlb3&#-hTaR^5XNiKfIoN_pCJe;sxQ+XubgZMq8AxAMbk14}jU-~q}%QwNHqf*9T9#G2C2eeqCcb~9PsD*Y& zqJ8%>^aM^jG;;Bp&0DRbhcsf5?XsjNg|Z&klC)^{?||;#kRG!)3b7gij+5ymKmqrY zDkU=l8zGZlC6Wail27DUllCQ40XLINCO`qKlZ+-X0z)E`z9uySY9f;!A{>(uCn^Ea zlRPIu0r``DCprOvles500jQJkCqMzmlQAef0nL+cC?Ol#PoVlz1pok35C8xe00000 Y0000103ZMW0Qr-uC@TggB>(^b0HT9~UH||9 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 控件。