lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
+1 -1
View File
@@ -215,7 +215,7 @@ namespace FineUIPro.Web.HSSE.Manager
return;
}
var getNMonthReport = Funs.DB.SeDin_MonthReport.FirstOrDefault(x =>x.ProjectId == this.CurrUser.LoginProjectId && x.States != Const.State_3);
var getNMonthReport = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States != Const.State_3);
if (getNMonthReport != null)
{
Alert.ShowInTop("存在未完成月报，请先办理完成！", MessageBoxIcon.Warning);
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
+8 -6
View File
@@ -146,7 +146,7 @@ namespace FineUIPro.Web.HSSE.Manager
SetStep();
if (string.IsNullOrEmpty(this.MonthReportId))
{
ReporMonth.Text= Request.Params["Month"];
ReporMonth.Text = Request.Params["Month"];
}
}
}
@@ -1446,12 +1446,14 @@ namespace FineUIPro.Web.HSSE.Manager
protected void MonthWorkTime_Blur(object sender, EventArgs e)
{
var monthWorkTimeValue = Funs.GetNewDecimalOrZero(this.MonthWorkTime.Text);
decimal hdYearWorkTimeValue =0;
decimal hdSafeWorkTimeValue =0;
DateTime month=Funs.GetNewDateTimeOrNow(this.ReporMonth.Text);
decimal hdYearWorkTimeValue = 0;
decimal hdSafeWorkTimeValue = 0;
DateTime month = Funs.GetNewDateTimeOrNow(this.ReporMonth.Text);
var getMaxMonthReport = (from x in Funs.DB.SeDin_MonthReport where x.ProjectId == this.ProjectId && x.ReporMonth < month
orderby x.ReporMonth descending select x).FirstOrDefault();
var getMaxMonthReport = (from x in Funs.DB.SeDin_MonthReport
where x.ProjectId == this.ProjectId && x.ReporMonth < month
orderby x.ReporMonth descending
select x).FirstOrDefault();
if (getMaxMonthReport != null)
{
var getMonthReport2 = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == getMaxMonthReport.MonthReportId);