diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs index 8f699481..ece32e9a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs @@ -7,6 +7,7 @@ using System.Text; using BLL; using AspNet = System.Web.UI.WebControls; using Newtonsoft.Json.Linq; +using FineUIPro.Web.DataShow; namespace FineUIPro.Web.HSSE.Manager { @@ -97,6 +98,7 @@ namespace FineUIPro.Web.HSSE.Manager protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) { int cm = GetCurMonth(); + var getProject = ProjectService.GetProjectByProjectId(CurrUser.LoginProjectId); for (int i = 1; i <= 12; i++) { @@ -104,7 +106,7 @@ namespace FineUIPro.Web.HSSE.Manager if (i != cm) { DateTime temp = DateTime.Parse(DateTime.Now.Year + "-" + i + "-10"); - if (temp.AddMonths(1) < DateTime.Now) + if (temp.AddMonths(1) < DateTime.Now &&(!getProject.IsHSEReportEditable.HasValue || !getProject.IsHSEReportEditable.Value) ) { string monthC = "Month" + i.ToString(); RenderField month = Grid1.FindColumn(monthC) as RenderField; diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx index d53dccc3..939ce663 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx @@ -23,6 +23,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs index b662c75d..d2e3cb2c 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs @@ -93,6 +93,7 @@ namespace FineUIPro.Web.common.ProjectSet if (getProject != null) { getProject.IsFace = this.ckbIsFace.Checked; + getProject.IsHSEReportEditable = this.ckbIsHSEReportEditable.Checked; Funs.DB.SubmitChanges(); } #endregion diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs index 556db4f5..e8d5e78e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs @@ -77,6 +77,15 @@ namespace FineUIPro.Web.common.ProjectSet /// protected global::FineUIPro.CheckBox ckbIsFace; + /// + /// ckbIsHSEReportEditable 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckbIsHSEReportEditable; + /// /// btnSetMap 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0e057ac8..db187dc1 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -24856,6 +24856,8 @@ namespace Model private System.Nullable _ConstructionNum; + private System.Nullable _IsHSEReportEditable; + private EntitySet _Accident_AccidentHandle; private EntitySet _Accident_AccidentPersonRecord; @@ -25512,6 +25514,8 @@ namespace Model partial void OnProjectAttributeChanged(); partial void OnConstructionNumChanging(System.Nullable value); partial void OnConstructionNumChanged(); + partial void OnIsHSEReportEditableChanging(System.Nullable value); + partial void OnIsHSEReportEditableChanged(); #endregion public Base_Project() @@ -26556,6 +26560,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsHSEReportEditable", DbType="Bit")] + public System.Nullable IsHSEReportEditable + { + get + { + return this._IsHSEReportEditable; + } + set + { + if ((this._IsHSEReportEditable != value)) + { + this.OnIsHSEReportEditableChanging(value); + this.SendPropertyChanging(); + this._IsHSEReportEditable = value; + this.SendPropertyChanged("IsHSEReportEditable"); + this.OnIsHSEReportEditableChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentHandle {