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

20230607新增月报费用取值，上报集团报表（月报）默认自动取值功能新增

Browse Source
This commit is contained in:
杨红卫
2023-06-07 18:01:30 +08:00
parent e4871bc690
commit c7994e1a5c
21 changed files with 914 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx
+4 -4
View File
@@ -640,10 +640,10 @@
<table class="table">
<tr>
<td></td>
<td>安全防护投入</td>
<td>劳动保护及职业健康投入</td>
<td>安全技术进步投入</td>
<td>安全教育培训投入</td>
<td runat="server" id="txtCost1">安全施工(元)</td>
<td runat="server" id="txtCost2">职业健康(元)</td>
<td runat="server" id="txtCost3">环境保护(元)</td>
<td runat="server" id="txtCost4">文明施工(元)</td>
<td>合计</td>
<td>完成合同额</td>
</tr>
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
+15
View File
@@ -90,6 +90,21 @@ namespace FineUIPro.Web.HSSE.Manager
var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == this.MonthReportId);
if (getMont != null)
{
if (getMont.ReporMonth < Funs.GetNewDateTime("2023-06-01"))
{
this.txtCost1.InnerText = "安全防护投入(元)";
this.txtCost2.InnerText = "劳动保护及职业健康投入(元)";
this.txtCost3.InnerText = "安全技术进步投入(元)";
this.txtCost4.InnerText = "安全教育培训投入(元)";
}
else
{
this.txtCost1.InnerText = "安全施工(元)";
this.txtCost2.InnerText = "职业健康(元)";
this.txtCost3.InnerText = "环境保护(元)";
this.txtCost4.InnerText = "文明施工(元)";
}
this.CompileManId.SelectedValue = getMont.CompileManId;
this.AuditManId.SelectedValue = getMont.AuditManId;
this.ApprovalManId.SelectedValue = getMont.ApprovalManId;
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.designer.cs
Generated
+321 -283
View File
File diff suppressed because it is too large Load Diff