lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240607 修改组织机构图

Browse Source
This commit is contained in:
毕文静
2024-06-07 22:07:03 +08:00
parent 75689bb431
commit 1770d114ef
7 changed files with 1446 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+5 -4
View File
@@ -179,8 +179,9 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
//周例会
var list3 = Funs.DB.Meeting_WeekMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.WeekMeetingDate }).ToList();
//月例会
var list4 = Funs.DB.Meeting_MonthMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.MonthMeetingDate }).ToList();
//var list4 = Funs.DB.Meeting_MonthMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.MonthMeetingDate }).ToList();
//安全领导小组会议
var list4 = Funs.DB.Meeting_SafetyLeaderGroupMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.SafetyLeaderGroupMeetingDate }).ToList();
//作业票
var list5 = Funs.DB.View_License_LicenseManager
.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.CompileDate })
@@ -391,7 +392,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
}
allList.Add(model);
//月例会
//安全领导小组会议
model = new Inspection_Summary();
model.ProjectId = pid;
model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
@@ -965,7 +966,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
}
else if (column.ColumnID == "ThisProject" + (i + 1).ToString()) {
//指定哪些列再做二次加载
if (MenuC=="安全巡检"|| MenuC == "周例会" || MenuC == "月例会" || MenuC == "作业票" || MenuC == "工程师日志" || MenuC == "HSE管理月报"
if (MenuC=="安全巡检"|| MenuC == "周例会" || MenuC == "安全领导小组会议" || MenuC == "作业票" || MenuC == "工程师日志" || MenuC == "HSE管理月报"
|| MenuC == "质量巡检"|| MenuC == "设备材料报验" || MenuC == "人员报验" || MenuC == "机具报验"
|| MenuC == "设计变更单管理" || MenuC == "施工方案管理"|| MenuC == "设计交底管理" || MenuC == "NCR" || MenuC == "质量周报"
|| MenuC == "质量月报" || MenuC == "一次共检合格数" || MenuC == "关键事项")