20230607新增月报费用取值,上报集团报表(月报)默认自动取值功能新增
This commit is contained in:
parent
e4871bc690
commit
c7994e1a5c
|
|
@ -689,7 +689,7 @@ namespace BLL
|
|||
//RoleIds = Funs.GetStringByArray(this.drpProjectRole.SelectedValueArray),
|
||||
PhotoUrl = person.PhotoUrl,
|
||||
IDCardUrl = person.AttachUrl1,
|
||||
QRCodeAttachUrl = person.AttachUrl5,
|
||||
//QRCodeAttachUrl = person.AttachUrl5,
|
||||
IDCardBackUrl = person.AttachUrl5,
|
||||
};
|
||||
string rootUrl = ConfigurationManager.AppSettings["localRoot"];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
|
|
@ -451,31 +452,94 @@ namespace BLL
|
|||
/// <returns></returns>
|
||||
public static Model.SeDinMonthReport6Item getSeDinMonthReportNullPage6(string projectId, string month, string startDate, string endDate)
|
||||
{
|
||||
var startDateD = Funs.GetNewDateTime(startDate);
|
||||
var endDateD = Funs.GetNewDateTime(endDate);
|
||||
var getLists = new Model.SeDinMonthReport6Item
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
SafetyMonth = 0,
|
||||
SafetyYear = 0,
|
||||
SafetyTotal = 0,
|
||||
LaborMonth = 0,
|
||||
LaborYear = 0,
|
||||
LaborTotal = 0,
|
||||
ProgressMonth = 0,
|
||||
ProgressYear = 0,
|
||||
ProgressTotal = 0,
|
||||
EducationMonth = 0,
|
||||
EducationYear = 0,
|
||||
EducationTotal = 0,
|
||||
SumMonth = 0,
|
||||
SumYear = 0,
|
||||
SumTotal = 0,
|
||||
ContractMonth = 0,
|
||||
ContractYear = 0,
|
||||
ContractTotal = 0,
|
||||
ConstructionCost = 0,
|
||||
};
|
||||
return getLists;
|
||||
var startDateD = Funs.GetNewDateTime(startDate);
|
||||
var endDateD = Funs.GetNewDateTime(endDate);
|
||||
DateTime monthD = Funs.GetNewDateTimeOrNow(month);
|
||||
var getLists = new Model.SeDinMonthReport6Item();
|
||||
///当月费用
|
||||
var getCostManage = from x in db.CostGoods_CostManageItem
|
||||
join y in db.CostGoods_CostManage on x.CostManageId equals y.CostManageId
|
||||
where y.ProjectId ==projectId && y.CostManageDate >= startDateD && y.CostManageDate < endDateD.Value.AddDays(1)
|
||||
&& y.States == Const.State_2
|
||||
select x;
|
||||
if (getCostManage.Count() > 0)
|
||||
{
|
||||
var getData1 = getCostManage.Where(x => x.SupSortIndex == 1);
|
||||
if (getData1.Count() > 0)
|
||||
{
|
||||
getLists.SafetyMonth = getLists.SafetyYear = getLists.SafetyTotal = getData1.Sum(x => x.PriceMoney ?? 0);
|
||||
}
|
||||
var getData2 = getCostManage.Where(x => x.SupSortIndex == 2);
|
||||
if (getData2.Count() > 0)
|
||||
{
|
||||
getLists.LaborMonth = getLists.LaborYear = getLists.LaborTotal = getData2.Sum(x => x.PriceMoney ?? 0);
|
||||
}
|
||||
var getData3 = getCostManage.Where(x => x.SupSortIndex == 3);
|
||||
if (getData3.Count() > 0)
|
||||
{
|
||||
getLists.ProgressMonth = getLists.ProgressYear = getLists.ProgressTotal = getData3.Sum(x => x.PriceMoney ?? 0);
|
||||
}
|
||||
var getData4 = getCostManage.Where(x => x.SupSortIndex == 4);
|
||||
if (getData4.Count() > 0)
|
||||
{
|
||||
getLists.EducationMonth = getLists.EducationYear = getLists.EducationTotal = getData4.Sum(x => x.PriceMoney ?? 0);
|
||||
}
|
||||
|
||||
getLists.SumMonth = getLists.SumYear = getLists.SumTotal = getLists.SafetyMonth + getLists.LaborMonth + getLists.ProgressMonth + getLists.EducationMonth;
|
||||
}
|
||||
|
||||
///上月费用
|
||||
var getMonthReport = db.SeDin_MonthReport.FirstOrDefault(x => x.ProjectId == projectId && x.ReporMonth == monthD.AddMonths(-1));
|
||||
if (getMonthReport != null)
|
||||
{
|
||||
var getLastMonthReport6 = db.SeDin_MonthReport6.FirstOrDefault(x => x.MonthReportId == getMonthReport.MonthReportId);
|
||||
if (getLastMonthReport6 != null)
|
||||
{
|
||||
if (getMonthReport.ReporMonth.Value.Year == monthD.Year)
|
||||
{
|
||||
if (monthD >= Funs.GetNewDateTime("2023-07-01"))
|
||||
{
|
||||
getLists.SafetyYear += getLastMonthReport6.SafetyYear;
|
||||
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
|
||||
getLists.ProgressYear += getLastMonthReport6.ProgressYear;
|
||||
getLists.ProgressTotal += getLastMonthReport6.ProgressTotal;
|
||||
getLists.EducationYear += getLastMonthReport6.EducationYear;
|
||||
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
|
||||
}
|
||||
else
|
||||
{
|
||||
getLists.SafetyYear += (getLastMonthReport6.SafetyYear + getLastMonthReport6.ProgressYear + getLastMonthReport6.EducationYear);
|
||||
getLists.SafetyTotal += (getLastMonthReport6.SafetyTotal + getLastMonthReport6.ProgressTotal + getLastMonthReport6.EducationTotal);
|
||||
}
|
||||
getLists.LaborYear += getLastMonthReport6.LaborYear;
|
||||
getLists.LaborTotal += getLastMonthReport6.LaborTotal;
|
||||
getLists.SumYear += getLastMonthReport6.SumYear;
|
||||
getLists.SumTotal += getLastMonthReport6.SumTotal;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (monthD >= Funs.GetNewDateTime("2023-07-01"))
|
||||
{
|
||||
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
|
||||
getLists.ProgressTotal += getLastMonthReport6.ProgressTotal;
|
||||
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
getLists.SafetyTotal += (getLastMonthReport6.SafetyTotal + getLastMonthReport6.ProgressTotal + getLastMonthReport6.EducationTotal);
|
||||
|
||||
}
|
||||
getLists.LaborTotal += getLastMonthReport6.LaborTotal;
|
||||
getLists.SumTotal += getLastMonthReport6.SumTotal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return getLists;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
#region 获取赛鼎月报初始化页面 --7、项目HSE培训统计
|
||||
|
|
|
|||
|
|
@ -1035,7 +1035,7 @@ namespace BLL
|
|||
// newPerson.JobNum = person.JobNum;
|
||||
newPerson.PersonName = person.PersonName;
|
||||
newPerson.Account = person.Account;
|
||||
newPerson.IsOffice = person.IsOffice;
|
||||
//newPerson.IsOffice = person.IsOffice;
|
||||
// newPerson.RoleIds = person.RoleIds;
|
||||
//if (newPerson.IdentityCard != person.IdentityCard)
|
||||
//{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
<head runat="server">
|
||||
<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
|
||||
<title>安全风险</title>
|
||||
</head>
|
||||
<body>
|
||||
|
|
@ -25,8 +24,8 @@
|
|||
<Items>
|
||||
<f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
|
||||
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
|
||||
</f:DropDownList>
|
||||
<%-- <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
|
||||
</f:DropDownList>
|
||||
<%-- <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
|
||||
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
|
||||
</f:DatePicker>
|
||||
<f:Label ID="Label3" runat="server" Text="至">
|
||||
|
|
@ -34,7 +33,7 @@
|
|||
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
|
||||
Width="130px">
|
||||
</f:DatePicker>--%>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
|
||||
</f:Button>
|
||||
</Items>
|
||||
|
|
@ -52,23 +51,23 @@
|
|||
</f:RenderField>
|
||||
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
</f:RenderField>
|
||||
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="一般风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="一般风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="较大风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
</f:TemplateField>
|
||||
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="较大风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
</f:TemplateField>
|
||||
<f:TemplateField ColumnID="Count4" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
|
|
@ -91,7 +90,7 @@
|
|||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
|
||||
Width="1200px" Height="620px" Maximized="true">
|
||||
Width="1200px" Height="620px" Maximized="true">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<Items>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using BLL;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
|
|
@ -39,10 +40,10 @@ namespace FineUIPro.Web.DataShow
|
|||
string cpara = string.Empty;
|
||||
if (this.drpProject.SelectedValue != Const._Null)
|
||||
{
|
||||
strSql += " AND projectId = @projectId"; ///状态为已完成
|
||||
strSql += " AND projectId = @projectId";
|
||||
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
|
||||
}
|
||||
|
||||
|
||||
//if (!string.IsNullOrEmpty(this.txtStartTime.Text))
|
||||
//{
|
||||
// strSql += " AND h.RegisterDate >=@StartTime";
|
||||
|
|
@ -57,7 +58,7 @@ namespace FineUIPro.Web.DataShow
|
|||
|
||||
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
|
||||
//}
|
||||
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid1.RecordCount = tb.Rows.Count;
|
||||
|
|
@ -165,7 +166,7 @@ namespace FineUIPro.Web.DataShow
|
|||
/// </summary>
|
||||
/// <param name="state"></param>
|
||||
/// <returns></returns>
|
||||
protected int Count1(object projectId)
|
||||
public int Count1(object projectId)
|
||||
{
|
||||
int cout1 = 0;
|
||||
if (projectId != null)
|
||||
|
|
@ -180,14 +181,14 @@ namespace FineUIPro.Web.DataShow
|
|||
/// </summary>
|
||||
/// <param name="state"></param>
|
||||
/// <returns></returns>
|
||||
protected int Count2(object projectId)
|
||||
public int Count2(object projectId)
|
||||
{
|
||||
int cout1 = 0;
|
||||
int cout4 = 0;
|
||||
if (projectId != null)
|
||||
{
|
||||
cout1 = getcount(projectId.ToString(),2);
|
||||
cout4 = getcount(projectId.ToString(),2);
|
||||
}
|
||||
return cout1;
|
||||
return cout4;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -195,36 +196,26 @@ namespace FineUIPro.Web.DataShow
|
|||
/// </summary>
|
||||
/// <param name="state"></param>
|
||||
/// <returns></returns>
|
||||
protected int Count3(object projectId)
|
||||
public int Count3(object projectId)
|
||||
{
|
||||
int cout1 = 0;
|
||||
int cout3 = 0;
|
||||
if (projectId != null)
|
||||
{
|
||||
cout1= getcount(projectId.ToString(), 3);
|
||||
cout3 = getcount(projectId.ToString(), 3);
|
||||
}
|
||||
return cout1;
|
||||
return cout3;
|
||||
}
|
||||
|
||||
protected int Count4(object projectId)
|
||||
public int Count4(object projectId)
|
||||
{
|
||||
int cout1 = 0;
|
||||
int cout4 = 0;
|
||||
if (projectId != null)
|
||||
{
|
||||
cout1 = getcount(projectId.ToString(), 4);
|
||||
cout4 = getcount(projectId.ToString(), 4);
|
||||
}
|
||||
return cout1;
|
||||
return cout4;
|
||||
}
|
||||
/// <summary>
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.Hazard_HazardList> getDataLists = from x in Funs.DB.Hazard_HazardList
|
||||
select x;
|
||||
/// <summary>
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.Hazard_HazardSelectedItem> getDataItemLists = from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
where x.IsStart == true
|
||||
select x;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
|
@ -237,7 +228,18 @@ namespace FineUIPro.Web.DataShow
|
|||
var getlevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x => x.RiskLevel == level);
|
||||
if (getlevel != null)
|
||||
{
|
||||
count = getDataItemLists.Where(x => x.ProjectId == projectId && x.HazardLevel == getlevel.RiskLevelId).Count();
|
||||
count = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
|
||||
where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2
|
||||
|
||||
select x).Count();
|
||||
}
|
||||
else
|
||||
{
|
||||
count = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
|
||||
where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2
|
||||
select x).Count();
|
||||
}
|
||||
return count;
|
||||
|
||||
|
|
|
|||
|
|
@ -88,23 +88,23 @@
|
|||
<f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
|
||||
HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
|
||||
HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
<f:RenderField Width="60px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
|
||||
HeaderText="(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
|
||||
HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
<f:RenderField Width="60px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
|
||||
HeaderText="(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
|
||||
HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
<f:RenderField Width="60px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
|
||||
HeaderText="(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
|
||||
HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
|
||||
<f:RenderField Width="60px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
|
||||
HeaderText="(D)" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
|
||||
HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
|
||||
<f:RenderField Width="100px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
|
||||
HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
|
||||
FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
|
||||
FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ namespace FineUIPro.Web.DataShow
|
|||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"select Item.HazardId AS HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
|
||||
string strSql = @"select (Item.HazardId+'-'+ Item.HazardListId) as HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
|
||||
, Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
|
||||
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
|
||||
,level.RiskLevelName,Item.ControlMeasures
|
||||
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E,Item.HazardJudge_D,Item.ControlMeasures
|
||||
,(CASE WHEN level.RiskLevelName IS NULL THEN Item.HazardLevel ELSE level.RiskLevelName END) AS RiskLevelName
|
||||
from Hazard_HazardSelectedItem AS Item
|
||||
LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId
|
||||
LEFT JOIN Base_RiskLevel as level on level.RiskLevelId = Item.HazardLevel
|
||||
|
|
|
|||
|
|
@ -9104,6 +9104,7 @@
|
|||
</Compile>
|
||||
<Compile Include="HSSE\ActionPlan\ProjectManageRuleView.aspx.cs">
|
||||
<DependentUpon>ProjectManageRuleView.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HSSE\ActionPlan\ProjectManageRuleView.aspx.designer.cs">
|
||||
<DependentUpon>ProjectManageRuleView.aspx</DependentUpon>
|
||||
|
|
@ -13869,7 +13870,7 @@
|
|||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>0</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:14646/</IISUrl>
|
||||
<IISUrl>http://localhost:1541/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -89,12 +89,13 @@
|
|||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<f:FormRow ColumnWidths="50% 35% 15%">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
<f:RadioButtonList ID="rbPersonType" runat="server" Label="员工类别">
|
||||
</f:RadioButtonList>
|
||||
<f:CheckBox runat="server" ID="ckIsOffice" Label="本部"></f:CheckBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
|
|
|
|||
|
|
@ -109,7 +109,12 @@ namespace FineUIPro.Web.Person
|
|||
if (person.IsForeign.HasValue)
|
||||
{
|
||||
this.ckIsForeign.Checked = person.IsForeign.Value;
|
||||
}
|
||||
if (person.IsOffice.HasValue)
|
||||
{
|
||||
this.ckIsOffice.Checked = person.IsOffice.Value;
|
||||
}
|
||||
|
||||
this.rbPersonType.SelectedValue = person.PersonType;
|
||||
if (!string.IsNullOrEmpty(person.IdcardType))
|
||||
{
|
||||
|
|
@ -534,17 +539,10 @@ namespace FineUIPro.Web.Person
|
|||
SignatureUrl = this.SignatureUrl,
|
||||
IsPost = this.ckIsPost.Checked,
|
||||
MultiProject=this.ckIsMultiProject.Checked,
|
||||
IsOffice = this.ckIsOffice.Checked,
|
||||
};
|
||||
newPerson.HomePageType = this.rblHomePageType.SelectedValue;
|
||||
newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
|
||||
if (!string.IsNullOrEmpty(newPerson.RoleIds))
|
||||
{
|
||||
newPerson.IsOffice = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
newPerson.IsOffice = false;
|
||||
}
|
||||
newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
|
||||
if (!string.IsNullOrEmpty(imgPhoto.ImageUrl) && imgPhoto.ImageUrl != "~/res/images/blank.png")
|
||||
{
|
||||
newPerson.PhotoUrl = imgPhoto.ImageUrl.Replace("~/", "");
|
||||
|
|
|
|||
|
|
@ -7,11 +7,13 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.Person {
|
||||
|
||||
|
||||
public partial class PersonEdit {
|
||||
|
||||
namespace FineUIPro.Web.Person
|
||||
{
|
||||
|
||||
|
||||
public partial class PersonEdit
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// _form1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -20,7 +22,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm _form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -29,7 +31,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panel1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -38,7 +40,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panel1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -47,7 +49,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
|
|
@ -56,7 +58,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnArrowRefresh 控件。
|
||||
/// </summary>
|
||||
|
|
@ -65,7 +67,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnArrowRefresh;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
|
|
@ -74,7 +76,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -83,7 +85,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtPersonName 控件。
|
||||
/// </summary>
|
||||
|
|
@ -92,7 +94,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtPersonName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtJobNum 控件。
|
||||
/// </summary>
|
||||
|
|
@ -101,7 +103,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtJobNum;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpUnit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -110,7 +112,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpDepart 控件。
|
||||
/// </summary>
|
||||
|
|
@ -119,7 +121,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpDepart;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// trRole 控件。
|
||||
/// </summary>
|
||||
|
|
@ -128,7 +130,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FormRow trRole;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtAccount 控件。
|
||||
/// </summary>
|
||||
|
|
@ -137,7 +139,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtAccount;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpRole 控件。
|
||||
/// </summary>
|
||||
|
|
@ -146,7 +148,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpRole;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpWorkPost 控件。
|
||||
/// </summary>
|
||||
|
|
@ -155,7 +157,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWorkPost;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rbPersonType 控件。
|
||||
/// </summary>
|
||||
|
|
@ -164,7 +166,16 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rbPersonType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckIsOffice 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsOffice;
|
||||
|
||||
/// <summary>
|
||||
/// drpIdcardType 控件。
|
||||
/// </summary>
|
||||
|
|
@ -173,7 +184,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpIdcardType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtIdentityCard 控件。
|
||||
/// </summary>
|
||||
|
|
@ -182,7 +193,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtIdentityCard;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtIdcardAddress 控件。
|
||||
/// </summary>
|
||||
|
|
@ -191,7 +202,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtIdcardAddress;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblIdcardForever 控件。
|
||||
/// </summary>
|
||||
|
|
@ -200,7 +211,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rblIdcardForever;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckIsForeign 控件。
|
||||
/// </summary>
|
||||
|
|
@ -209,7 +220,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsForeign;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtIdcardStartDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -218,7 +229,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtIdcardStartDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtIdcardEndDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -227,7 +238,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtIdcardEndDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblSex 控件。
|
||||
/// </summary>
|
||||
|
|
@ -236,7 +247,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rblSex;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckIsPost 控件。
|
||||
/// </summary>
|
||||
|
|
@ -245,7 +256,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsPost;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckIsMultiProject 控件。
|
||||
/// </summary>
|
||||
|
|
@ -254,7 +265,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsMultiProject;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtBirthday 控件。
|
||||
/// </summary>
|
||||
|
|
@ -263,7 +274,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtBirthday;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtAge 控件。
|
||||
/// </summary>
|
||||
|
|
@ -272,7 +283,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtAge;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtTelephone 控件。
|
||||
/// </summary>
|
||||
|
|
@ -281,7 +292,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtTelephone;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// imgPhoto 控件。
|
||||
/// </summary>
|
||||
|
|
@ -290,7 +301,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Image imgPhoto;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// filePhoto 控件。
|
||||
/// </summary>
|
||||
|
|
@ -299,7 +310,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FileUpload filePhoto;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// imgQR 控件。
|
||||
/// </summary>
|
||||
|
|
@ -308,7 +319,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Image imgQR;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnQR 控件。
|
||||
/// </summary>
|
||||
|
|
@ -317,7 +328,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnQR;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// imgIDCard 控件。
|
||||
/// </summary>
|
||||
|
|
@ -326,7 +337,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Image imgIDCard;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// fuIDCard 控件。
|
||||
/// </summary>
|
||||
|
|
@ -335,7 +346,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FileUpload fuIDCard;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnReadIdentityCard 控件。
|
||||
/// </summary>
|
||||
|
|
@ -344,7 +355,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnReadIdentityCard;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// imgIDCardBack 控件。
|
||||
/// </summary>
|
||||
|
|
@ -353,7 +364,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Image imgIDCardBack;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// fuIDCardBack 控件。
|
||||
/// </summary>
|
||||
|
|
@ -362,7 +373,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FileUpload fuIDCardBack;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// TabStrip1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -371,7 +382,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TabStrip TabStrip1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Tab1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -380,7 +391,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab Tab1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -389,7 +400,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtIntoDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -398,7 +409,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtIntoDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWorkDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -407,7 +418,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtWorkDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtRetirementDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -416,7 +427,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtRetirementDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtValidityDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -425,7 +436,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtValidityDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpPosition 控件。
|
||||
/// </summary>
|
||||
|
|
@ -434,7 +445,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpPosition;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpPostTitle 控件。
|
||||
/// </summary>
|
||||
|
|
@ -443,7 +454,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpPostTitle;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtPostTitleDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -452,7 +463,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtPostTitleDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtGraduate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -461,7 +472,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtGraduate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtMajor 控件。
|
||||
/// </summary>
|
||||
|
|
@ -470,7 +481,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtMajor;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtForeignLanguage 控件。
|
||||
/// </summary>
|
||||
|
|
@ -479,7 +490,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtForeignLanguage;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpCountryCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -488,7 +499,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCountryCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpProvinceCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -497,7 +508,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpProvinceCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpNation 控件。
|
||||
/// </summary>
|
||||
|
|
@ -506,7 +517,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpNation;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpPoliticsStatus 控件。
|
||||
/// </summary>
|
||||
|
|
@ -515,7 +526,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpPoliticsStatus;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpEduLevel 控件。
|
||||
/// </summary>
|
||||
|
|
@ -524,7 +535,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpEduLevel;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpMaritalStatus 控件。
|
||||
/// </summary>
|
||||
|
|
@ -533,7 +544,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpMaritalStatus;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtRelativeName 控件。
|
||||
/// </summary>
|
||||
|
|
@ -542,7 +553,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtRelativeName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtRelativeTel 控件。
|
||||
/// </summary>
|
||||
|
|
@ -551,7 +562,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtRelativeTel;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtAddress 控件。
|
||||
/// </summary>
|
||||
|
|
@ -560,7 +571,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtAddress;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Image2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -569,7 +580,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Image Image2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// fileSignature 控件。
|
||||
/// </summary>
|
||||
|
|
@ -578,7 +589,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FileUpload fileSignature;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnRet 控件。
|
||||
/// </summary>
|
||||
|
|
@ -587,7 +598,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnRet;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbSignature 控件。
|
||||
/// </summary>
|
||||
|
|
@ -596,7 +607,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbSignature;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblHomePageType 控件。
|
||||
/// </summary>
|
||||
|
|
@ -605,7 +616,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rblHomePageType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lb1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -614,7 +625,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lb1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lb2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -623,7 +634,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lb2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lb3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -632,7 +643,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lb3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// TabCertificate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -641,7 +652,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab TabCertificate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// GridCertificate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -650,7 +661,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid GridCertificate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -659,7 +670,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnCertificateNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -668,7 +679,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnCertificateNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbImageUrl 控件。
|
||||
/// </summary>
|
||||
|
|
@ -677,7 +688,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lbImageUrl;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -686,7 +697,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -695,7 +706,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSizeGridCertificate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -704,7 +715,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSizeGridCertificate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Train 控件。
|
||||
/// </summary>
|
||||
|
|
@ -713,7 +724,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab Train;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// GridTrain 控件。
|
||||
/// </summary>
|
||||
|
|
@ -722,7 +733,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid GridTrain;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -731,7 +742,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnTrainNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -740,7 +751,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnTrainNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -749,7 +760,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -758,7 +769,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSizeGridTrain 控件。
|
||||
/// </summary>
|
||||
|
|
@ -767,7 +778,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSizeGridTrain;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Duty 控件。
|
||||
/// </summary>
|
||||
|
|
@ -776,7 +787,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab Duty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// GridDuty 控件。
|
||||
/// </summary>
|
||||
|
|
@ -785,7 +796,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid GridDuty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Label2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -794,7 +805,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -803,7 +814,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText3 控件。
|
||||
/// </summary>
|
||||
|
|
@ -812,7 +823,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText3;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSizeGridDuty 控件。
|
||||
/// </summary>
|
||||
|
|
@ -821,7 +832,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSizeGridDuty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// InOut 控件。
|
||||
/// </summary>
|
||||
|
|
@ -830,7 +841,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tab InOut;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// GridInOut 控件。
|
||||
/// </summary>
|
||||
|
|
@ -839,7 +850,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid GridInOut;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar4 控件。
|
||||
/// </summary>
|
||||
|
|
@ -848,7 +859,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar4;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnInOutNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -857,7 +868,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnInOutNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator4 控件。
|
||||
/// </summary>
|
||||
|
|
@ -866,7 +877,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator4;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText4 控件。
|
||||
/// </summary>
|
||||
|
|
@ -875,7 +886,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText4;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSizeGridInOut 控件。
|
||||
/// </summary>
|
||||
|
|
@ -884,7 +895,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSizeGridInOut;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -893,7 +904,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// MenuCertificate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -902,7 +913,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu MenuCertificate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnCertificateEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -911,7 +922,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnCertificateEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnCertificateDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -920,7 +931,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnCertificateDelete;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// MenuTrain 控件。
|
||||
/// </summary>
|
||||
|
|
@ -929,7 +940,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu MenuTrain;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnTrainEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -938,7 +949,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnTrainEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnTrainDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -947,7 +958,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnTrainDelete;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// MenuDuty 控件。
|
||||
/// </summary>
|
||||
|
|
@ -956,7 +967,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu MenuDuty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnDutyEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -965,7 +976,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnDutyEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// MenuInOut 控件。
|
||||
/// </summary>
|
||||
|
|
@ -974,7 +985,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu MenuInOut;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnInOutEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -983,7 +994,7 @@ namespace FineUIPro.Web.Person {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnInOutEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnInOutDelete 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -72,11 +72,12 @@
|
|||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<f:FormRow ColumnWidths="50% 35% 15%">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpWorkPost" runat="server" Readonly="true" Label="岗位" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
<f:TextBox runat="server" Readonly="true" ID="txtPersonType" Label="类型"></f:TextBox>
|
||||
<f:CheckBox runat="server" ID="ckIsOffice" Label="本部" Readonly="true"></f:CheckBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
|
|
|
|||
|
|
@ -60,6 +60,10 @@ namespace FineUIPro.Web.Person
|
|||
{
|
||||
this.ckIsForeign.Checked = person.IsForeign.Value;
|
||||
}
|
||||
if (person.IsOffice.HasValue)
|
||||
{
|
||||
this.ckIsOffice.Checked = person.IsOffice.Value;
|
||||
}
|
||||
this.txtPersonType.Text = DropListService.getPersonTypeNameByValue(person.PersonType);
|
||||
if (!string.IsNullOrEmpty(person.IdcardType))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -131,6 +131,15 @@ namespace FineUIPro.Web.Person
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtPersonType;
|
||||
|
||||
/// <summary>
|
||||
/// ckIsOffice 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsOffice;
|
||||
|
||||
/// <summary>
|
||||
/// drpIdcardType 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@
|
|||
</f:RegionPanel>
|
||||
<f:Window ID="Window1" runat="server" Hidden="true"
|
||||
IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
|
||||
Title="编辑企业安全数据统计月报" CloseAction="HidePostBack" EnableIFrame="true" Height="650px"
|
||||
Title="编辑企业安全数据统计月报" CloseAction="HidePostBack" EnableIFrame="true" Height="650px" Maximized="true"
|
||||
Width="1200px">
|
||||
</f:Window>
|
||||
<f:Window ID="Window2" runat="server" Hidden="true"
|
||||
|
|
|
|||
|
|
@ -172,7 +172,6 @@
|
|||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
|
||||
<f:NumberBox ID="txtCommissionerNum" runat="server" Label="总监(人)" LabelAlign="Right" NoDecimal="true"
|
||||
NoNegative="true" EmptyText="0">
|
||||
</f:NumberBox>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
using BLL;
|
||||
using FineUIPro.Web.BaseInfo;
|
||||
using FineUIPro.Web.InformationProject;
|
||||
using Model;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
|
|
@ -57,125 +59,11 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
string months = Request.QueryString["Months"];
|
||||
MillionsMonthlyReportId = Request.QueryString["MillionsMonthlyReportId"];
|
||||
if (!String.IsNullOrEmpty(MillionsMonthlyReportId))
|
||||
{
|
||||
items = BLL.MillionsMonthlyReportItemService.GetItemsNoSum(MillionsMonthlyReportId);
|
||||
this.Grid1.DataSource = items;
|
||||
this.Grid1.DataBind();
|
||||
{
|
||||
var report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByMillionsMonthlyReportId(MillionsMonthlyReportId);
|
||||
if (report != null)
|
||||
{
|
||||
this.btnSave.Hidden = true;
|
||||
this.btnSubmit.Hidden = true;
|
||||
this.btnCopy.Hidden = true;
|
||||
if (report.HandleState == BLL.Const.HandleState_4)
|
||||
{
|
||||
this.btnUpdata.Hidden = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (report.HandleMan == this.CurrUser.PersonId || this.CurrUser.PersonId == BLL.Const.sysglyId)
|
||||
{
|
||||
this.btnSave.Hidden = false;
|
||||
this.btnSubmit.Hidden = false;
|
||||
}
|
||||
}
|
||||
if (report.UpState == BLL.Const.UpState_3)
|
||||
{
|
||||
this.btnSave.Hidden = true;
|
||||
this.btnUpdata.Hidden = true;
|
||||
}
|
||||
drpMonth.SelectedValue = report.Month.ToString();
|
||||
drpYear.SelectedValue = report.Year.ToString();
|
||||
drpUnit.SelectedValue = report.UnitId;
|
||||
if (report.FillingDate != null)
|
||||
{
|
||||
txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", report.FillingDate);
|
||||
}
|
||||
txtDutyPerson.Text = report.DutyPerson;
|
||||
if (report.RecordableIncidentRate != null)
|
||||
{
|
||||
txtRecordableIncidentRate.Text = report.RecordableIncidentRate.ToString();
|
||||
}
|
||||
if (report.LostTimeRate != null)
|
||||
{
|
||||
txtLostTimeRate.Text = report.LostTimeRate.ToString();
|
||||
}
|
||||
if (report.LostTimeInjuryRate != null)
|
||||
{
|
||||
txtLostTimeInjuryRate.Text = report.LostTimeInjuryRate.ToString();
|
||||
}
|
||||
if (report.DeathAccidentFrequency != null)
|
||||
{
|
||||
txtDeathAccidentFrequency.Text = report.DeathAccidentFrequency.ToString();
|
||||
}
|
||||
if (report.AccidentMortality != null)
|
||||
{
|
||||
txtAccidentMortality.Text = report.AccidentMortality.ToString();
|
||||
}
|
||||
if (report.InputCosts != null)
|
||||
{
|
||||
this.txtInputCosts.Text = Convert.ToString(report.InputCosts);
|
||||
}
|
||||
if (report.TrainNum != null)
|
||||
{
|
||||
this.txtTrainNum.Text = Convert.ToString(report.TrainNum);
|
||||
}
|
||||
if (report.GeneralHazardNum != null)
|
||||
{
|
||||
this.txtGeneralHazardNum.Text = Convert.ToString(report.GeneralHazardNum);
|
||||
}
|
||||
if (report.MajorHazardNum != null)
|
||||
{
|
||||
this.txtMajorHazardNum.Text = Convert.ToString(report.MajorHazardNum);
|
||||
}
|
||||
if (report.NotProofLargeProjectNum != null)
|
||||
{
|
||||
this.txtNotProofLargeProjectNum.Text = Convert.ToString(report.NotProofLargeProjectNum);
|
||||
}
|
||||
if (report.ProofLargeProjectNum != null)
|
||||
{
|
||||
this.txtProofLargeProjectNum.Text = Convert.ToString(report.ProofLargeProjectNum);
|
||||
}
|
||||
if (report.FireLicenseNum != null)
|
||||
{
|
||||
this.txtFireLicenseNum.Text = Convert.ToString(report.FireLicenseNum);
|
||||
}
|
||||
if (report.LimitLicenseNum != null)
|
||||
{
|
||||
this.txtLimitLicenseNum.Text = Convert.ToString(report.LimitLicenseNum);
|
||||
}
|
||||
if (report.HighLicenseNum != null)
|
||||
{
|
||||
this.txtHighLicenseNum.Text = Convert.ToString(report.HighLicenseNum);
|
||||
}
|
||||
if (report.HoistingLicenseNum != null)
|
||||
{
|
||||
this.txtHoistingLicenseNum.Text = Convert.ToString(report.HoistingLicenseNum);
|
||||
}
|
||||
if (report.BreakGroundLicenseNum != null)
|
||||
{
|
||||
this.txtBreakGroundLicenseNum.Text = Convert.ToString(report.BreakGroundLicenseNum);
|
||||
}
|
||||
if (report.ElectricityLicenseNum != null)
|
||||
{
|
||||
this.txtElectricityLicenseNum.Text = Convert.ToString(report.ElectricityLicenseNum);
|
||||
}
|
||||
if (report.RTLicenseNum != null)
|
||||
{
|
||||
this.txtRTLicenseNum.Text = Convert.ToString(report.RTLicenseNum);
|
||||
}
|
||||
if (report.NightLicenseNum != null)
|
||||
{
|
||||
this.txtNightLicenseNum.Text = Convert.ToString(report.NightLicenseNum);
|
||||
}
|
||||
if (report.CommissionerNum != null)
|
||||
{
|
||||
this.txtCommissionerNum.Text = Convert.ToString(report.CommissionerNum);
|
||||
}
|
||||
if (report.SoleDutyNum != null)
|
||||
{
|
||||
this.txtSoleDutyNum.Text = Convert.ToString(report.SoleDutyNum);
|
||||
}
|
||||
setPageInfo(report);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -186,9 +74,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
|
||||
txtDutyPerson.Text = this.CurrUser.PersonName;
|
||||
//增加明细集合
|
||||
GetNewItems(year, months);
|
||||
this.Grid1.DataSource = items;
|
||||
this.Grid1.DataBind();
|
||||
GetNewItems(year, months);
|
||||
this.txtRecordableIncidentRate.Text = "0";
|
||||
this.txtLostTimeRate.Text = "0";
|
||||
this.txtLostTimeInjuryRate.Text = "0";
|
||||
|
|
@ -197,6 +83,133 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#region 初始化页面信息
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="report"></param>
|
||||
private void setPageInfo(Model.Information_MillionsMonthlyReport report)
|
||||
{
|
||||
this.btnSave.Hidden = true;
|
||||
this.btnSubmit.Hidden = true;
|
||||
this.btnCopy.Hidden = true;
|
||||
if (report.HandleState == BLL.Const.HandleState_4)
|
||||
{
|
||||
this.btnUpdata.Hidden = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (report.HandleMan == this.CurrUser.PersonId || this.CurrUser.PersonId == BLL.Const.sysglyId)
|
||||
{
|
||||
this.btnSave.Hidden = false;
|
||||
this.btnSubmit.Hidden = false;
|
||||
}
|
||||
}
|
||||
if (report.UpState == BLL.Const.UpState_3)
|
||||
{
|
||||
this.btnSave.Hidden = true;
|
||||
this.btnUpdata.Hidden = true;
|
||||
}
|
||||
drpMonth.SelectedValue = report.Month.ToString();
|
||||
drpYear.SelectedValue = report.Year.ToString();
|
||||
drpUnit.SelectedValue = report.UnitId;
|
||||
if (report.FillingDate != null)
|
||||
{
|
||||
txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", report.FillingDate);
|
||||
}
|
||||
txtDutyPerson.Text = report.DutyPerson;
|
||||
if (report.RecordableIncidentRate != null)
|
||||
{
|
||||
txtRecordableIncidentRate.Text = report.RecordableIncidentRate.ToString();
|
||||
}
|
||||
if (report.LostTimeRate != null)
|
||||
{
|
||||
txtLostTimeRate.Text = report.LostTimeRate.ToString();
|
||||
}
|
||||
if (report.LostTimeInjuryRate != null)
|
||||
{
|
||||
txtLostTimeInjuryRate.Text = report.LostTimeInjuryRate.ToString();
|
||||
}
|
||||
if (report.DeathAccidentFrequency != null)
|
||||
{
|
||||
txtDeathAccidentFrequency.Text = report.DeathAccidentFrequency.ToString();
|
||||
}
|
||||
if (report.AccidentMortality != null)
|
||||
{
|
||||
txtAccidentMortality.Text = report.AccidentMortality.ToString();
|
||||
}
|
||||
if (report.InputCosts != null)
|
||||
{
|
||||
this.txtInputCosts.Text = Convert.ToString(report.InputCosts);
|
||||
}
|
||||
if (report.TrainNum != null)
|
||||
{
|
||||
this.txtTrainNum.Text = Convert.ToString(report.TrainNum);
|
||||
}
|
||||
if (report.GeneralHazardNum != null)
|
||||
{
|
||||
this.txtGeneralHazardNum.Text = Convert.ToString(report.GeneralHazardNum);
|
||||
}
|
||||
if (report.MajorHazardNum != null)
|
||||
{
|
||||
this.txtMajorHazardNum.Text = Convert.ToString(report.MajorHazardNum);
|
||||
}
|
||||
if (report.NotProofLargeProjectNum != null)
|
||||
{
|
||||
this.txtNotProofLargeProjectNum.Text = Convert.ToString(report.NotProofLargeProjectNum);
|
||||
}
|
||||
if (report.ProofLargeProjectNum != null)
|
||||
{
|
||||
this.txtProofLargeProjectNum.Text = Convert.ToString(report.ProofLargeProjectNum);
|
||||
}
|
||||
if (report.FireLicenseNum != null)
|
||||
{
|
||||
this.txtFireLicenseNum.Text = Convert.ToString(report.FireLicenseNum);
|
||||
}
|
||||
if (report.LimitLicenseNum != null)
|
||||
{
|
||||
this.txtLimitLicenseNum.Text = Convert.ToString(report.LimitLicenseNum);
|
||||
}
|
||||
if (report.HighLicenseNum != null)
|
||||
{
|
||||
this.txtHighLicenseNum.Text = Convert.ToString(report.HighLicenseNum);
|
||||
}
|
||||
if (report.HoistingLicenseNum != null)
|
||||
{
|
||||
this.txtHoistingLicenseNum.Text = Convert.ToString(report.HoistingLicenseNum);
|
||||
}
|
||||
if (report.BreakGroundLicenseNum != null)
|
||||
{
|
||||
this.txtBreakGroundLicenseNum.Text = Convert.ToString(report.BreakGroundLicenseNum);
|
||||
}
|
||||
if (report.ElectricityLicenseNum != null)
|
||||
{
|
||||
this.txtElectricityLicenseNum.Text = Convert.ToString(report.ElectricityLicenseNum);
|
||||
}
|
||||
if (report.RTLicenseNum != null)
|
||||
{
|
||||
this.txtRTLicenseNum.Text = Convert.ToString(report.RTLicenseNum);
|
||||
}
|
||||
if (report.NightLicenseNum != null)
|
||||
{
|
||||
this.txtNightLicenseNum.Text = Convert.ToString(report.NightLicenseNum);
|
||||
}
|
||||
if (report.CommissionerNum != null)
|
||||
{
|
||||
this.txtCommissionerNum.Text = Convert.ToString(report.CommissionerNum);
|
||||
}
|
||||
if (report.SoleDutyNum != null)
|
||||
{
|
||||
this.txtSoleDutyNum.Text = Convert.ToString(report.SoleDutyNum);
|
||||
}
|
||||
|
||||
items = BLL.MillionsMonthlyReportItemService.GetItemsNoSum(MillionsMonthlyReportId);
|
||||
this.Grid1.DataSource = items;
|
||||
this.Grid1.DataBind();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
#region 关闭窗口
|
||||
|
|
@ -721,29 +734,95 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
#region 获取明细
|
||||
private void GetNewItems(string year, string months)
|
||||
{
|
||||
//获取项目集合
|
||||
List<Model.InformationProject_MillionsMonthlyReport> millionsMonthlyReports = (from x in Funs.DB.InformationProject_MillionsMonthlyReport where x.Year.ToString() == year && x.Month.ToString() == months && x.States == BLL.Const.State_2 select x).ToList();
|
||||
this.txtInputCosts.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.InputCosts ?? 0));
|
||||
this.txtTrainNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.TrainNum ?? 0));
|
||||
this.txtGeneralHazardNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.GeneralHazardNum ?? 0));
|
||||
this.txtMajorHazardNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.MajorHazardNum ?? 0));
|
||||
this.txtNotProofLargeProjectNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.NotProofLargeProjectNum ?? 0));
|
||||
this.txtProofLargeProjectNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.ProofLargeProjectNum ?? 0));
|
||||
this.txtFireLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.FireLicenseNum ?? 0));
|
||||
this.txtLimitLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.LimitLicenseNum ?? 0));
|
||||
this.txtHighLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.HighLicenseNum ?? 0));
|
||||
this.txtHoistingLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.HoistingLicenseNum ?? 0));
|
||||
this.txtBreakGroundLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.BreakGroundLicenseNum ?? 0));
|
||||
this.txtElectricityLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.ElectricityLicenseNum ?? 0));
|
||||
this.txtRTLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.RTLicenseNum ?? 0));
|
||||
this.txtNightLicenseNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.NightLicenseNum ?? 0));
|
||||
this.txtCommissionerNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.CommissionerNum ?? 0));
|
||||
this.txtSoleDutyNum.Text = Convert.ToString(millionsMonthlyReports.Sum(x => x.SoleDutyNum ?? 0));
|
||||
List<string> projectIds = millionsMonthlyReports.Select(x => x.ProjectId).ToList();
|
||||
var getCosts = from x in Funs.DB.CostGoods_CostManageItem
|
||||
join y in Funs.DB.CostGoods_CostManage on x.CostManageId equals y.CostManageId
|
||||
where y.CostManageDate.Value.Year.ToString() == year && y.CostManageDate.Value.Month.ToString() == months
|
||||
select x;
|
||||
if (getCosts.Count() > 0)
|
||||
{
|
||||
this.txtInputCosts.Text = getCosts.Sum(x => x.PriceMoney ?? 0).ToString();
|
||||
}
|
||||
this.txtTrainNum.Text = Funs.DB.EduTrain_TrainRecord.Where(x => x.TrainStartDate.Value.Year.ToString() == year && x.TrainStartDate.Value.Month.ToString() == months).Count().ToString();
|
||||
|
||||
int HazardAll = 0, RectifyAll = 0;
|
||||
int HazardMajor = 0, RectifyMajor = 0;
|
||||
var getHazardRegister = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.RegisterDate.Value.Year.ToString() == year && x.RegisterDate.Value.Month.ToString() == months && x.States == Const.State_3);
|
||||
HazardAll = getHazardRegister.Count();
|
||||
if (HazardAll > 0)
|
||||
{
|
||||
HazardMajor = getHazardRegister.Where(x => x.HazardValue == "2").Count();
|
||||
}
|
||||
|
||||
var getRectifyNotices = Funs.DB.Check_RectifyNotices.Where(x => x.CheckedDate.Value.Year.ToString() == year && x.CheckedDate.Value.Month.ToString() == months && x.States == Const.State_5);
|
||||
RectifyAll = getRectifyNotices.Count();
|
||||
if (RectifyAll > 0)
|
||||
{
|
||||
RectifyMajor = getRectifyNotices.Where(x => x.HiddenHazardType == "3").Count();
|
||||
}
|
||||
this.txtGeneralHazardNum.Text = ((HazardAll - HazardMajor) + (RectifyAll - RectifyMajor)).ToString();
|
||||
this.txtMajorHazardNum.Text = (HazardMajor + RectifyMajor).ToString();
|
||||
|
||||
var getLarger = from x in Funs.DB.Solution_LargerHazardListItem
|
||||
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
|
||||
where y.States == Const.State_1 && y.RecordTime.Value.Year.ToString() == year && y.RecordTime.Value.Month.ToString() == months
|
||||
select x;
|
||||
if (getLarger.Count() > 0)
|
||||
{
|
||||
this.txtNotProofLargeProjectNum.Text = Convert.ToString(getLarger.Where(x => x.IsArgument == false).Count());
|
||||
this.txtProofLargeProjectNum.Text = Convert.ToString(getLarger.Where(x => x.IsArgument == true).Count());
|
||||
}
|
||||
|
||||
var getLicense = from x in Funs.DB.License_LicenseManager
|
||||
join y in Funs.DB.Base_LicenseType on x.LicenseTypeId equals y.LicenseTypeId
|
||||
where x.States != Const.State_R && x.StartDate.Value.Year.ToString() == year && x.StartDate.Value.Month.ToString() == months
|
||||
select new { x.LicenseManagerId,x.StartDate,x.EndDate,x.States,y.LicenseTypeId,y.LicenseTypeCode,y.LicenseTypeName};
|
||||
|
||||
int fire1 = Funs.DB.License_FireWork.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int fire2 = getLicense.Where(x => x.LicenseTypeName.Contains("动火")).Count();
|
||||
this.txtFireLicenseNum.Text =(fire1+ fire2) .ToString();
|
||||
|
||||
int limit1 = Funs.DB.License_LimitedSpace.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int limit2 = getLicense.Where(x => x.LicenseTypeName.Contains("受限空间")).Count();
|
||||
this.txtLimitLicenseNum.Text = (limit1+ limit2).ToString();
|
||||
|
||||
int High1 = Funs.DB.License_HeightWork.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int High2 = getLicense.Where(x => x.LicenseTypeName.Contains("登高")).Count();
|
||||
this.txtHighLicenseNum.Text =(High1+ High2).ToString();
|
||||
|
||||
int Hoisting1 = Funs.DB.License_LiftingWork.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int Hoisting2 = getLicense.Where(x => x.LicenseTypeName.Contains("吊装")).Count();
|
||||
this.txtHoistingLicenseNum.Text =(Hoisting1+ Hoisting2).ToString();
|
||||
|
||||
int Break1 = Funs.DB.License_BreakGround.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int Break2 = getLicense.Where(x => x.LicenseTypeName.Contains("动土")).Count();
|
||||
this.txtBreakGroundLicenseNum.Text = (Break1+ Break2).ToString();
|
||||
|
||||
this.txtElectricityLicenseNum.Text = getLicense.Where(x=>x.LicenseTypeName.Contains("临电")).Count().ToString();
|
||||
|
||||
int rt1 = Funs.DB.License_RadialWork.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int rt2 = getLicense.Where(x => x.LicenseTypeName.Contains("射线")).Count();
|
||||
this.txtRTLicenseNum.Text =(rt1+ rt2).ToString();
|
||||
|
||||
int night1 = Funs.DB.License_NightWork.Where(x => x.ApplyDate.Value.Year.ToString() == year && x.ApplyDate.Value.Month.ToString() == months && (x.States == Const.State_2 || x.States == Const.State_3)).Count();
|
||||
int night2 = getLicense.Where(x => x.LicenseTypeName.Contains("夜间")).Count();
|
||||
this.txtNightLicenseNum.Text =(night1+ night2).ToString();
|
||||
|
||||
var getPersons = from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.States == Const.ProjectPersonStates_1 && y.IsHsse == true
|
||||
select new { x.ProjectId,y.WorkPostName} ;
|
||||
int isHsse = getPersons.Count();
|
||||
if (isHsse > 0)
|
||||
{
|
||||
this.txtCommissionerNum.Text = Convert.ToString(getPersons.Where(x => x.WorkPostName.Contains("安全总监")).Count());
|
||||
}
|
||||
|
||||
this.txtSoleDutyNum.Text = isHsse.ToString();
|
||||
|
||||
//增加明细集合
|
||||
Model.Information_MillionsMonthlyReportItem item1 = new Information_MillionsMonthlyReportItem
|
||||
{
|
||||
MillionsMonthlyReportItemId = SQLHelper.GetNewID(typeof(Model.Information_MillionsMonthlyReportItem)),
|
||||
MillionsMonthlyReportItemId = SQLHelper.GetNewID(),
|
||||
Affiliation = "机关后勤服务",
|
||||
Name = "总部",
|
||||
SortIndex = 10,
|
||||
|
|
@ -779,7 +858,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
items.Add(item1);
|
||||
Model.Information_MillionsMonthlyReportItem item2 = new Information_MillionsMonthlyReportItem
|
||||
{
|
||||
MillionsMonthlyReportItemId = SQLHelper.GetNewID(typeof(Model.Information_MillionsMonthlyReportItem)),
|
||||
MillionsMonthlyReportItemId = SQLHelper.GetNewID(),
|
||||
Affiliation = "机关后勤服务",
|
||||
Name = "二级单位",
|
||||
SortIndex = 20,
|
||||
|
|
@ -812,21 +891,16 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
LossDayNum = 0,
|
||||
};
|
||||
items.Add(item2);
|
||||
var projects = (from x in Funs.DB.Base_Project
|
||||
where projectIds.Contains(x.ProjectId)
|
||||
select x).ToList();
|
||||
|
||||
if (this.CurrUser.UnitId == Const.UnitId_SEDIN)
|
||||
{
|
||||
projects = BLL.ProjectService.GetProjectWorkList();
|
||||
}
|
||||
|
||||
var projects = BLL.ProjectService.GetProjectWorkList();
|
||||
int i = 20;
|
||||
foreach (var p in projects)
|
||||
{
|
||||
i += 10;
|
||||
Model.Information_MillionsMonthlyReportItem item = new Information_MillionsMonthlyReportItem
|
||||
{
|
||||
MillionsMonthlyReportItemId = SQLHelper.GetNewID(typeof(Model.Information_MillionsMonthlyReportItem)),
|
||||
MillionsMonthlyReportItemId = SQLHelper.GetNewID(),
|
||||
Affiliation = "项目现场",
|
||||
Name = p.ProjectName,
|
||||
SortIndex = i
|
||||
|
|
@ -841,70 +915,45 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
item.Name = "[" + p.ProjectCode + "]" + p.ProjectName;
|
||||
}
|
||||
}
|
||||
var getSitePersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == p.ProjectId && x.States == Const.ProjectPersonStates_1);
|
||||
//var getZSOerson = from x in getSitePersons
|
||||
// join y in Funs.DB.Person_Persons on x.PersonId equals y.PersonId
|
||||
// where y.PersonType == "1" && x.UnitId == Const.UnitId_SEDIN
|
||||
// select x;
|
||||
var getAllSedinPerson= getSitePersons.Where(x => x.UnitId == Const.UnitId_SEDIN).Count();
|
||||
|
||||
Model.InformationProject_MillionsMonthlyReport report = millionsMonthlyReports.FirstOrDefault(x => x.ProjectId == p.ProjectId);
|
||||
if (report != null)
|
||||
{
|
||||
item.PostPersonNum = report.PostPersonNum;
|
||||
item.SnapPersonNum = report.SnapPersonNum;
|
||||
item.ContractorNum = report.ContractorNum;
|
||||
item.SumPersonNum = report.SumPersonNum;
|
||||
item.TotalWorkNum = report.TotalWorkNum;
|
||||
item.SeriousInjuriesNum = report.SeriousInjuriesNum;
|
||||
item.SeriousInjuriesPersonNum = report.SeriousInjuriesPersonNum;
|
||||
item.SeriousInjuriesLossHour = report.SeriousInjuriesLossHour;
|
||||
item.MinorAccidentNum = report.MinorAccidentNum;
|
||||
item.MinorAccidentPersonNum = report.MinorAccidentPersonNum;
|
||||
item.MinorAccidentLossHour = report.MinorAccidentLossHour;
|
||||
item.DeathAccidentNum = report.DeathAccidentNum;
|
||||
item.DeathAccidentPersonNum = report.DeathAccidentPersonNum;
|
||||
item.DeathAccidentLossHour = report.DeathAccidentLossHour;
|
||||
item.RestrictedWorkPersonNum = report.RestrictedWorkPersonNum;
|
||||
item.RestrictedWorkLossHour = report.RestrictedWorkLossHour;
|
||||
item.MedicalTreatmentPersonNum = report.MedicalTreatmentPersonNum;
|
||||
item.MedicalTreatmentLossHour = report.MedicalTreatmentLossHour;
|
||||
item.FireNum = report.FireNum;
|
||||
item.EnvironmenNum = report.EnvironmenNum;
|
||||
item.TrafficNum = report.TrafficNum;
|
||||
item.EquipmentNum = report.EquipmentNum;
|
||||
item.QualityNum = report.QualityNum;
|
||||
item.OtherNum = report.OtherNum;
|
||||
item.FirstAidDressingsNum = report.FirstAidDressingsNum;
|
||||
item.AttemptedEventNum = report.AttemptedEventNum;
|
||||
item.LossDayNum = report.LossDayNum;
|
||||
}
|
||||
else
|
||||
{
|
||||
item.PostPersonNum = 0;
|
||||
item.SnapPersonNum = 0;
|
||||
item.ContractorNum = 0;
|
||||
item.SumPersonNum = 0;
|
||||
item.TotalWorkNum = 0;
|
||||
item.SeriousInjuriesNum = 0;
|
||||
item.SeriousInjuriesPersonNum = 0;
|
||||
item.SeriousInjuriesLossHour = 0;
|
||||
item.MinorAccidentNum = 0;
|
||||
item.MinorAccidentPersonNum = 0;
|
||||
item.MinorAccidentLossHour = 0;
|
||||
item.DeathAccidentNum = 0;
|
||||
item.DeathAccidentPersonNum = 0;
|
||||
item.DeathAccidentLossHour = 0;
|
||||
item.RestrictedWorkPersonNum = 0;
|
||||
item.RestrictedWorkLossHour = 0;
|
||||
item.MedicalTreatmentPersonNum = 0;
|
||||
item.MedicalTreatmentLossHour = 0;
|
||||
item.FireNum = 0;
|
||||
item.EnvironmenNum = 0;
|
||||
item.TrafficNum = 0;
|
||||
item.EquipmentNum = 0;
|
||||
item.QualityNum = 0;
|
||||
item.OtherNum = 0;
|
||||
item.FirstAidDressingsNum = 0;
|
||||
item.AttemptedEventNum = 0;
|
||||
item.LossDayNum = 0;
|
||||
}
|
||||
item.PostPersonNum = getAllSedinPerson;
|
||||
item.SnapPersonNum = 0;
|
||||
item.ContractorNum = getSitePersons.Where(x => x.UnitId != Const.UnitId_SEDIN).Count();
|
||||
item.SumPersonNum = getSitePersons.Count();
|
||||
item.TotalWorkNum = 0;
|
||||
item.SeriousInjuriesNum = 0;
|
||||
item.SeriousInjuriesPersonNum = 0;
|
||||
item.SeriousInjuriesLossHour = 0;
|
||||
item.MinorAccidentNum = 0;
|
||||
item.MinorAccidentPersonNum = 0;
|
||||
item.MinorAccidentLossHour = 0;
|
||||
item.DeathAccidentNum = 0;
|
||||
item.DeathAccidentPersonNum = 0;
|
||||
item.DeathAccidentLossHour = 0;
|
||||
item.RestrictedWorkPersonNum = 0;
|
||||
item.RestrictedWorkLossHour = 0;
|
||||
item.MedicalTreatmentPersonNum = 0;
|
||||
item.MedicalTreatmentLossHour = 0;
|
||||
item.FireNum = 0;
|
||||
item.EnvironmenNum = 0;
|
||||
item.TrafficNum = 0;
|
||||
item.EquipmentNum = 0;
|
||||
item.QualityNum = 0;
|
||||
item.OtherNum = 0;
|
||||
item.FirstAidDressingsNum = 0;
|
||||
item.AttemptedEventNum = 0;
|
||||
item.LossDayNum = 0;
|
||||
items.Add(item);
|
||||
}
|
||||
|
||||
this.Grid1.DataSource = items;
|
||||
this.Grid1.DataBind();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全防护投入-年
|
||||
/// </summary>
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全防护投入-总
|
||||
/// </summary>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 劳动保护及职业健康投入-月
|
||||
/// </summary>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 劳动保护及职业健康投入-年
|
||||
/// </summary>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 劳动保护及职业健康投入-总
|
||||
/// </summary>
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全技术进步投入-月
|
||||
/// </summary>
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全技术进步投入-年
|
||||
/// </summary>
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全技术进步投入-总
|
||||
/// </summary>
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全教育培训投入-月
|
||||
/// </summary>
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全教育培训投入-年
|
||||
/// </summary>
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 安全教育培训投入-总
|
||||
/// </summary>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 合计-月
|
||||
/// </summary>
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 合计-年
|
||||
/// </summary>
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 合计-总
|
||||
/// </summary>
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 完成合同额-月
|
||||
/// </summary>
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 完成合同额-年度
|
||||
/// </summary>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 完成合同额-累计
|
||||
/// </summary>
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
/// <summary>
|
||||
/// 工程造价占比
|
||||
/// </summary>
|
||||
|
|
@ -172,6 +172,6 @@
|
|||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
} = 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue