xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安全报表增加系统外工时统计

This commit is contained in:
geh 2026-01-26 17:34:39 +08:00
parent 7dff01059b
commit fd322d4c7f
25 changed files with 841 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataBase/版本日志/SUBQHSE_V2026-01-22-gf(安全报表增加系统外工时统计).sql Normal file
View File

@ -0,0 +1,6 @@
alter table Project_ProjectUnit add IsOutSideUnit bit null
GO
alter table InformationProject_MillionsMonthlyReport add OutSideUnitWorkNum decimal(18,4) null
GO
alter table Information_MillionsMonthlyReportItem add OutSideUnitWorkNum decimal(18,4) null
GO

2
SUBQHSE/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs
View File

@ -45,6 +45,7 @@ namespace BLL
ContractorNum = millionsMonthlyReport.ContractorNum,
SumPersonNum = millionsMonthlyReport.SumPersonNum,
TotalWorkNum = millionsMonthlyReport.TotalWorkNum,
OutSideUnitWorkNum = millionsMonthlyReport.OutSideUnitWorkNum,
DeathAccidentNum = millionsMonthlyReport.DeathAccidentNum,
DeathAccidentPersonNum = millionsMonthlyReport.DeathAccidentPersonNum,
DeathAccidentLossHour = millionsMonthlyReport.DeathAccidentLossHour,
@ -115,6 +116,7 @@ namespace BLL
newMillionsMonthlyReport.ContractorNum = millionsMonthlyReport.ContractorNum;
newMillionsMonthlyReport.SumPersonNum = millionsMonthlyReport.SumPersonNum;
newMillionsMonthlyReport.TotalWorkNum = millionsMonthlyReport.TotalWorkNum;
newMillionsMonthlyReport.OutSideUnitWorkNum = millionsMonthlyReport.OutSideUnitWorkNum;
newMillionsMonthlyReport.DeathAccidentNum = millionsMonthlyReport.DeathAccidentNum;
newMillionsMonthlyReport.DeathAccidentPersonNum = millionsMonthlyReport.DeathAccidentPersonNum;
newMillionsMonthlyReport.DeathAccidentLossHour = millionsMonthlyReport.DeathAccidentLossHour;

2
SUBQHSE/BLL/ProjectData/ProjectUnitService.cs
View File

@ -79,6 +79,7 @@
ContractRange = projectUnit.ContractRange,
RealNamePushTime = projectUnit.RealNamePushTime,
IsSynchro = projectUnit.IsSynchro,
IsOutSideUnit=projectUnit.IsOutSideUnit,
};
db.Project_ProjectUnit.InsertOnSubmit(newProjectUnit);
db.SubmitChanges();
@ -102,6 +103,7 @@
newProjectUnit.ContractRange = projectUnit.ContractRange;
newProjectUnit.RealNamePushTime = projectUnit.RealNamePushTime;
newProjectUnit.IsSynchro = projectUnit.IsSynchro;
newProjectUnit.IsOutSideUnit = projectUnit.IsOutSideUnit;
db.SubmitChanges();
}
}

66
SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -163,7 +163,7 @@
UnitId = x.UnitId,
Year = x.Year,
Month = x.Month,
FillingMan = x.FillingMan+"|"+(x.KeyWorkNum??0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
FillingMan = x.FillingMan + "|" + (x.KeyWorkNum ?? 0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
FillingDate = x.FillingDate,
DutyPerson = x.DutyPerson,
RecordableIncidentRate = x.RecordableIncidentRate,
@ -203,6 +203,7 @@
ContractorNum = x.ContractorNum,
SumPersonNum = x.SumPersonNum,
TotalWorkNum = x.TotalWorkNum,
OutSideUnitWorkNum = x.OutSideUnitWorkNum,
SeriousInjuriesNum = x.SeriousInjuriesNum,
SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum,
SeriousInjuriesLossHour = x.SeriousInjuriesLossHour,
@ -225,6 +226,8 @@
FirstAidDressingsNum = x.FirstAidDressingsNum,
AttemptedEventNum = x.AttemptedEventNum,
LossDayNum = x.LossDayNum,
UnitId = x.UnitId,
ProjectId = x.ProjectId,
};
//老接口Serveice
@ -261,6 +264,7 @@
return code;
}
}
/// <summary>
/// UpApiMillionsMonthlyReportApi调用
/// </summary>
@ -2535,6 +2539,12 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<int> MedicalTreatmentPersonNumField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private string UnitIdField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private string ProjectIdField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private string MillionsMonthlyReportIdField;
@ -2598,6 +2608,9 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<decimal> TotalWorkNumField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<decimal> OutSideUnitWorkNumField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<int> TrafficNumField;
@ -2784,6 +2797,40 @@
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public string UnitId
{
get
{
return this.UnitIdField;
}
set
{
if ((object.ReferenceEquals(this.UnitIdField, value) != true))
{
this.UnitIdField = value;
this.RaisePropertyChanged("UnitId");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public string ProjectId
{
get
{
return this.ProjectIdField;
}
set
{
if ((object.ReferenceEquals(this.ProjectIdField, value) != true))
{
this.ProjectIdField = value;
this.RaisePropertyChanged("ProjectId");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public string MillionsMonthlyReportId
{
@ -3141,6 +3188,23 @@
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public System.Nullable<decimal> OutSideUnitWorkNum
{
get
{
return this.OutSideUnitWorkNumField;
}
set
{
if ((this.OutSideUnitWorkNumField.Equals(value) != true))
{
this.OutSideUnitWorkNumField = value;
this.RaisePropertyChanged("OutSideUnitWorkNum");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public System.Nullable<int> TrafficNum
{

6
SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs
View File

@ -103,12 +103,15 @@ namespace BLL
MillionsMonthlyReportId = MillionsMonthlyReportItem.MillionsMonthlyReportId,
SortIndex = MillionsMonthlyReportItem.SortIndex,
Affiliation = MillionsMonthlyReportItem.Affiliation,
UnitId = MillionsMonthlyReportItem.UnitId,
Name = MillionsMonthlyReportItem.Name,
ProjectId = MillionsMonthlyReportItem.ProjectId,
PostPersonNum = MillionsMonthlyReportItem.PostPersonNum,
SnapPersonNum = MillionsMonthlyReportItem.SnapPersonNum,
ContractorNum = MillionsMonthlyReportItem.ContractorNum,
SumPersonNum = MillionsMonthlyReportItem.SumPersonNum,
TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum,
OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum,
DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum,
DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum,
DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour,
@ -150,12 +153,15 @@ namespace BLL
Model.Information_MillionsMonthlyReportItem newMillionsMonthlyReportItem = Funs.DB.Information_MillionsMonthlyReportItem.FirstOrDefault(e => e.MillionsMonthlyReportItemId == MillionsMonthlyReportItem.MillionsMonthlyReportItemId);
newMillionsMonthlyReportItem.SortIndex = MillionsMonthlyReportItem.SortIndex;
newMillionsMonthlyReportItem.Affiliation = MillionsMonthlyReportItem.Affiliation;
newMillionsMonthlyReportItem.UnitId = MillionsMonthlyReportItem.UnitId;
newMillionsMonthlyReportItem.Name = MillionsMonthlyReportItem.Name;
newMillionsMonthlyReportItem.ProjectId = MillionsMonthlyReportItem.ProjectId;
newMillionsMonthlyReportItem.PostPersonNum = MillionsMonthlyReportItem.PostPersonNum;
newMillionsMonthlyReportItem.SnapPersonNum = MillionsMonthlyReportItem.SnapPersonNum;
newMillionsMonthlyReportItem.ContractorNum = MillionsMonthlyReportItem.ContractorNum;
newMillionsMonthlyReportItem.SumPersonNum = MillionsMonthlyReportItem.SumPersonNum;
newMillionsMonthlyReportItem.TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum;
newMillionsMonthlyReportItem.OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum;
newMillionsMonthlyReportItem.DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum;
newMillionsMonthlyReportItem.DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum;
newMillionsMonthlyReportItem.DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour;

19
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
View File

@ -1,6 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MillionsMonthlyReport.aspx.cs"
Inherits="FineUIPro.Web.InformationProject.MillionsMonthlyReport" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
@ -8,10 +7,16 @@
<head runat="server">
<title>企业安全数据统计月报</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style>
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server"/>
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
@ -20,7 +25,7 @@
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree"/>
</f:ContentPanel>
</Items>
</f:Panel>
@ -52,7 +57,7 @@
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="40px" HeaderTextAlign="Center"
TextAlign="Center" />
TextAlign="Center"/>
<f:RenderField Width="100px" ColumnID="YearAndMonth" DataField="YearAndMonth" SortField="YearAndMonth"
FieldType="String" HeaderText="月报日期" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@ -81,6 +86,9 @@
<f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
HeaderText="去除系统内单位的总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
<Columns>
<f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
@ -219,7 +227,7 @@
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu"/>
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@ -235,6 +243,7 @@
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑企业安全数据统计月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
Height="560px">

14
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs
View File

@ -75,14 +75,10 @@ namespace FineUIPro.Web.InformationProject
{
this.ProjectId = this.ucTree.ProjectId;
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
}
this.GetButtonPower();
this.BindGrid();
}
/// <summary>
/// 绑定数据
/// </summary>
@ -92,7 +88,6 @@ namespace FineUIPro.Web.InformationProject
{
return;
}
string strSql = @"SELECT MillionsMonthlyReport.MillionsMonthlyReportId,"
+ @"MillionsMonthlyReport.ProjectId,"
+ @"MillionsMonthlyReport.Year,"
@ -108,6 +103,7 @@ namespace FineUIPro.Web.InformationProject
+ @"MillionsMonthlyReport.ContractorNum,"
+ @"MillionsMonthlyReport.SumPersonNum,"
+ @"MillionsMonthlyReport.TotalWorkNum,"
+ @"MillionsMonthlyReport.OutSideUnitWorkNum,"
+ @"MillionsMonthlyReport.DeathAccidentNum,"
+ @"MillionsMonthlyReport.DeathAccidentPersonNum,"
+ @"MillionsMonthlyReport.DeathAccidentLossHour,"
@ -327,6 +323,12 @@ namespace FineUIPro.Web.InformationProject
this.btnMenuDelete.Hidden = false;
}
}
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
btnMenuDelete.Hidden = true;
btnMenuEdit.Hidden = true;
}
}
#endregion
}

4
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx
View File

@ -24,7 +24,7 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="20% 20% 25% 35%">
<Items>
<f:DropDownList ID="drpYear" runat="server" Label="年度" EnableEdit="true" LabelAlign="Right"
Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpYear_SelectedIndexChanged">
@ -37,6 +37,8 @@
</f:NumberBox>--%>
<f:TextBox ID="txtTotalWorkNum" runat="server" Label="总工时数（万）" LabelWidth="140px" LabelAlign="Right" EmptyText="0">
</f:TextBox>
<f:TextBox ID="txtOutSideUnitWorkNum" runat="server" Label="去除系统内单位的总工时数（万）" LabelWidth="240px" Readonly="true" LabelAlign="Right" EmptyText="0">
</f:TextBox>
</Items>
</f:FormRow>
<%-- <f:FormRow>

23
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs
View File

@ -87,6 +87,10 @@ namespace FineUIPro.Web.InformationProject
{
this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
}
if (millionsMonthlyReport.OutSideUnitWorkNum != null)
{
this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
}
if (millionsMonthlyReport.PostPersonNum != null)
{
this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);
@ -366,6 +370,7 @@ namespace FineUIPro.Web.InformationProject
millionsMonthlyReport.ContractorNum = Funs.GetNewIntOrZero(this.txtContractorNum.Text.Trim());
millionsMonthlyReport.SumPersonNum = millionsMonthlyReport.PostPersonNum + millionsMonthlyReport.SnapPersonNum + millionsMonthlyReport.ContractorNum;
millionsMonthlyReport.TotalWorkNum = Funs.GetNewDecimalOrZero(this.txtTotalWorkNum.Text.Trim());
millionsMonthlyReport.OutSideUnitWorkNum = Funs.GetNewDecimalOrZero(this.txtOutSideUnitWorkNum.Text.Trim());
millionsMonthlyReport.SeriousInjuriesNum = Funs.GetNewInt(this.txtSeriousInjuriesNum.Text.Trim());
millionsMonthlyReport.SeriousInjuriesPersonNum = Funs.GetNewInt(this.txtSeriousInjuriesPersonNum.Text.Trim());
millionsMonthlyReport.SeriousInjuriesLossHour = Funs.GetNewInt(this.txtSeriousInjuriesLossHour.Text.Trim());
@ -474,7 +479,18 @@ namespace FineUIPro.Web.InformationProject
using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
{
int? sumTotalPanhours = 0;
int? sumOutSideTotalPanhours = 0;
List<string> outSideUnitIds = new List<string>();
var projectUnits = from x in db.Project_ProjectUnit
where x.ProjectId == this.ProjectId
select x;
foreach (var projectUnit in projectUnits)
{
if (projectUnit.UnitType == BLL.Const.ProjectUnitType_1 || projectUnit.IsOutSideUnit == true)
{
outSideUnitIds.Add(projectUnit.UnitId);
}
}
//获取当期人工时日报
List<Model.SitePerson_DayReport> dayReports = BLL.SitePerson_DayReportService.GetDayReportsByCompileDate(startTime, endTime, this.ProjectId);
if (dayReports.Count > 0)
@ -482,10 +498,15 @@ namespace FineUIPro.Web.InformationProject
foreach (var dayReport in dayReports)
{
sumTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail where y.DayReportId == dayReport.DayReportId select y.PersonWorkTime as decimal?).Sum());
sumOutSideTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail
where y.DayReportId == dayReport.DayReportId && outSideUnitIds.Contains(y.UnitId)
select y.PersonWorkTime as decimal?).Sum());
}
//总工时数（万）
this.txtTotalWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumTotalPanhours), 4) / 10000, 4).ToString();
//去除系统内单位的总工时数（万）
this.txtOutSideUnitWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumOutSideTotalPanhours), 4) / 10000, 4).ToString();
//在岗员工
//获取单位集合
var unitIds = (from x in dayReports

9
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.designer.cs generated
View File

@ -84,6 +84,15 @@ namespace FineUIPro.Web.InformationProject {
/// </remarks>
protected global::FineUIPro.TextBox txtTotalWorkNum;
/// <summary>
/// txtOutSideUnitWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOutSideUnitWorkNum;
/// <summary>
/// GroupPanel1 控件。
/// </summary>

4
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx
View File

@ -24,7 +24,7 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="20% 20% 25% 35%">
<Items>
<f:TextBox ID="txtYear" runat="server" Label="年度" LabelAlign="Right" Readonly="true">
</f:TextBox>
@ -32,6 +32,8 @@
</f:TextBox>
<f:TextBox ID="txtTotalWorkNum" runat="server" Label="总工时数（万）" Readonly="true" LabelWidth="140px" LabelAlign="Right" EmptyText="0">
</f:TextBox>
<f:TextBox ID="txtOutSideUnitWorkNum" runat="server" Label="去除系统内单位的总工时数（万）" LabelWidth="240px" Readonly="true" LabelAlign="Right" EmptyText="0">
</f:TextBox>
</Items>
</f:FormRow>
<%-- <f:FormRow>

4
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs
View File

@ -87,6 +87,10 @@ namespace FineUIPro.Web.InformationProject
{
this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
}
if (millionsMonthlyReport.OutSideUnitWorkNum != null)
{
this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
}
if (millionsMonthlyReport.PostPersonNum != null)
{
this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);

9
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.designer.cs generated
View File

@ -84,6 +84,15 @@ namespace FineUIPro.Web.InformationProject {
/// </remarks>
protected global::FineUIPro.TextBox txtTotalWorkNum;
/// <summary>
/// txtOutSideUnitWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOutSideUnitWorkNum;
/// <summary>
/// GroupPanel1 控件。
/// </summary>

7
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUnit.aspx
View File

@ -96,6 +96,9 @@
<f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
<f:CheckBoxField Width="120px" SortField="IsOutSideUnit" RenderAsStaticField="true" DataField="IsOutSideUnit"
HeaderText="系统外单位" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</columns>
<listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -122,8 +125,8 @@
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true"
Icon="Pencil" runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnORCode" OnClick="btnQR_Click" EnablePostBack="true" Hidden="true"
Icon="TableRefresh" runat="server" Text="二维码">
<f:MenuButton ID="btnQRCode" OnClick="btnQRCode_Click" EnablePostBack="true" Hidden="true"
Icon="Shading" runat="server" Text="生成二维码">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">

45
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs
View File

@ -6,6 +6,7 @@ using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Web.Security;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ProjectData
@ -106,7 +107,7 @@ namespace FineUIPro.Web.ProjectData
}
if (this.drpProject.Items.Count() > 0)
{
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime,ProjectUnit.IsSynchro,ProjectUnit.IsOutSideUnit "
+ @" FROM Project_ProjectUnit AS ProjectUnit "
+ @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "
@ -301,7 +302,16 @@ namespace FineUIPro.Web.ProjectData
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
menuId = BLL.Const.ProjectUnitMenuId;
}/*
string loginUrl = FormsAuthentication.LoginUrl;
if (loginUrl.Contains("Hsse"))
{
menuId = BLL.Const.SeverProjectUnitMenuId;
}
else if (loginUrl.Contains("Qwms"))
{
menuId = BLL.Const.QMProjectUnitMenuId;
}*/
var porject = BLL.ProjectService.GetProjectByProjectId(this.drpProject.SelectedValue);
if (porject != null && (porject.ProjectState == BLL.Const.ProjectState_1 || string.IsNullOrEmpty(porject.ProjectState)))
{
@ -312,6 +322,7 @@ namespace FineUIPro.Web.ProjectData
{
this.btnSelect.Hidden = false;
this.btnMenuEdit.Hidden = false;
this.btnQRCode.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
@ -334,7 +345,6 @@ namespace FineUIPro.Web.ProjectData
this.btnMenuEdit.Hidden = true;
this.btnMenuDelete.Hidden = true;
}
this.btnORCode.Hidden = false;
}
#endregion
@ -409,18 +419,43 @@ namespace FineUIPro.Web.ProjectData
}
#endregion
//二维码生成
protected void btnQR_Click(object sender, EventArgs e)
/// <summary>
/// 生成二维码
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnQRCode_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
// string unitId = string.Empty;
// Model.Project_ProjectUnit projectUnit = BLL.ProjectUnitService.GetProjectUnitById(Grid1.SelectedRowID);
// if (projectUnit != null)
// {
// unitId = projectUnit.UnitId;
// }
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/SeeQRImage.aspx?UnitId={0}", unitId), "二维码查看", 400, 400));
string DomainNameUrl = ConfigurationManager.AppSettings["DomainNameUrl"];
string strCode = DomainNameUrl + Grid1.SelectedRowID;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/SeeQRImage.aspx?ProjectUnitId={0}&strCode={1}", Grid1.SelectedRowID, strCode), "二维码查看", 400, 400));
//int num = 0;
//if (getPersons.Count() > 0)
//{
// foreach (var item in getPersons)
// {
// string url = CreateQRCodeService.CreateCode_Simple("person$" + item.IdentityCard);
// if (!string.IsNullOrEmpty(url))
// {
// item.QRCodeAttachUrl = url;
// Funs.DB.SubmitChanges();
// num++;
// }
// }
//}
//ShowNotify("操作完成，新生成二维码" + num.ToString() + "条", MessageBoxIcon.Success);
}
}
}

4
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUnit.aspx.designer.cs generated
View File

@ -195,13 +195,13 @@ namespace FineUIPro.Web.ProjectData
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnORCode 控件。
/// btnQRCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnORCode;
protected global::FineUIPro.MenuButton btnQRCode;
/// <summary>
/// btnMenuDelete 控件。

1
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx
View File

@ -88,6 +88,7 @@
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
<f:CheckBox runat="server" ID="ckIsOutSideUnit" Label="是否系统外单位"></f:CheckBox>
</Items>
</f:FormRow>
</rows>

14
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs
View File

@ -86,10 +86,14 @@ namespace FineUIPro.Web.ProjectData
this.nbPlanCostB.Text = projectUnit.PlanCostB.ToString();
}
this.txtContractRange.Text = projectUnit.ContractRange;
if (projectUnit.IsSynchro==true)
if (projectUnit.IsSynchro == true)
{
this.ckIsSynchro.Checked = true;
}
if (projectUnit.IsOutSideUnit == true)
{
this.ckIsOutSideUnit.Checked = true;
}
}
}
}
@ -122,6 +126,14 @@ namespace FineUIPro.Web.ProjectData
{
newProjectUnit.IsSynchro = null;
}
if (this.ckIsOutSideUnit.Checked)
{
newProjectUnit.IsOutSideUnit = true;
}
else
{
newProjectUnit.IsOutSideUnit = null;
}
BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
if (unit != null)

9
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs generated
View File

@ -183,6 +183,15 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.CheckBox ckIsSynchro;
/// <summary>
/// ckIsOutSideUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsOutSideUnit;
/// <summary>
/// Toolbar1 控件。
/// </summary>

3
SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
View File

@ -161,6 +161,9 @@
</f:GroupField>
<f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
HeaderText="去除系统内单位的总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
<Columns>

1
SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs
View File

@ -123,6 +123,7 @@ namespace FineUIPro.Web.ZHGL.Information
yearTotalItem.ContractorNum = yearSumItems.Sum(x => x.ContractorNum ?? 0);
yearTotalItem.SumPersonNum = yearSumItems.Sum(x => x.SumPersonNum ?? 0);
yearTotalItem.TotalWorkNum = yearSumItems.Sum(x => x.TotalWorkNum ?? 0);
yearTotalItem.OutSideUnitWorkNum = yearSumItems.Sum(x => x.OutSideUnitWorkNum ?? 0);
yearTotalItem.SeriousInjuriesNum = yearSumItems.Sum(x => x.SeriousInjuriesNum ?? 0);
yearTotalItem.SeriousInjuriesPersonNum = yearSumItems.Sum(x => x.SeriousInjuriesPersonNum ?? 0);
yearTotalItem.SeriousInjuriesLossHour = yearSumItems.Sum(x => x.SeriousInjuriesLossHour ?? 0);

92
SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
View File

@ -12,6 +12,11 @@
white-space: normal;
word-break: break-all;
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
@ -221,15 +226,19 @@
<f:RenderField Width="120px" ColumnID="Affiliation" DataField="Affiliation" FieldType="String"
HeaderText="所属单位" HeaderTextAlign="Center">
<Editor>
<f:TextBox runat="server" ID="txtAffiliation" Text='<%# Eval("Affiliation")%>'>
</f:TextBox>
<%-- <f:TextBox runat="server" ID="txtAffiliation" Text='<%# Eval("Affiliation")%>'> --%>
<%-- </f:TextBox> --%>
<f:DropDownList ID="drpAffiliation" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpAffiliation_SelectedIndexChanged">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Name" DataField="Name" FieldType="String"
HeaderText="名称" HeaderTextAlign="Center">
<Editor>
<f:TextBox runat="server" ID="txtName" Text='<%# Eval("Name")%>'>
</f:TextBox>
<%-- <f:TextBox runat="server" ID="txtName" Text='<%# Eval("Name")%>'> --%>
<%-- </f:TextBox> --%>
<f:DropDownList ID="drpName" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpName_SelectedIndexChanged">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:GroupField EnableLock="true" HeaderText="员工总数" TextAlign="Center">
@ -270,6 +279,16 @@
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="110px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
HeaderText="去除系统内单位的总工时数(万)" HeaderTextAlign="Center">
<Editor>
<%-- <f:TextBox runat="server" ID="txtTotalWorkNum" Text='<%# Eval("TotalWorkNum")%>'>
</f:TextBox>--%>
<f:NumberBox ID="txtOutSideUnitWorkNum" NoDecimal="false" NoNegative="true" MinValue="0.00"
Text='<%# Eval("TotalWorkNum")%>' runat="server" DecimalPrecision="4">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
<Columns>
<f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
@ -519,6 +538,9 @@
</Editor>
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforeedit" Handler="onGridBeforeEdit"/>
</Listeners>
</f:Grid>
</Items>
</f:FormRow>
@ -550,3 +572,65 @@
</form>
</body>
</html>
<script type="text/javascript">
// 存储已绑定事件的下拉框ID，避免重复绑定
var boundDrpIds = [];
var grid1ClientID = '<%= Grid1.ClientID %>';
// Grid 单元格点击事件（核心：纯DOM解析，不依赖事件参数）
function onGridBeforeEdit(e) {
// 1. 解析点击的单元格DOM，获取行索引和列ID
var cellDom = $(e.target).closest(".f-grid-cell"); // 找到单元格DOM
if (!cellDom.length) return;
// 2. 获取行索引（从行DOM的属性中解析）
var rowDom = cellDom.closest(".f-grid-row");
var rowIndex = rowDom.attr("data-rowid"); // 行索引
if (rowIndex === undefined) return;
// 3. 获取列ID（从单元格DOM的属性中解析）
var columnId = cellDom.attr("data-columnid"); // 列ID（Name）
if (columnId !== "Name") return;
// 4. 触发单元格进入编辑态
var grid = F(grid1ClientID);
// 通过遍历columns数组查找匹配的列
var column = null;
for (var i = 0; i < grid.columns.length; i++) {
if (grid.columns[i].columnId === columnId) {
column = grid.columns[i];
break;
}
}
if (!column) return;
if (columnId === "Name") {
var unitName = "";
for (var i = 0; i < grid.data.length; i++) {
if (grid.data[i].id === rowIndex) {
unitName = grid.data[i].values.Affiliation;
break;
}
}
// 动态加载选项 获取项目名称
loadDynamicProject(column,unitName)
};
}
function loadDynamicProject(column,unitName) {
$.ajax({
url: "MillionsMonthlyReportSave.aspx/InitDrpNameDataSource",
type: "POST",
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
unitName: unitName,
}),
success: function(data) {
var items = data.d;
if(items.length>0){
column.editor.data = items;
}
},
error: function(xhr) {
console.log("加载选项失败：" + xhr.responseText);
}
});
}
</script>

148
SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.Services;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Information
@ -43,6 +44,11 @@ namespace FineUIPro.Web.ZHGL.Information
{
if (!IsPostBack)
{
drpAffiliation.DataTextField = "UnitName";
drpAffiliation.DataValueField = "UnitName";
drpAffiliation.DataSource = BLL.UnitService.GetBranchUnitList(false);
drpAffiliation.DataBind();
this.GetButtonPower();
items.Clear();
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, false);
@ -414,27 +420,27 @@ namespace FineUIPro.Web.ZHGL.Information
private string AuditData()
{
string err = string.Empty;
// Model.SUBQHSEDB db = Funs.DB;
// var reports = from x in db.Information_MillionsMonthlyReport
//Model.SUBQHSEDB db = Funs.DB;
//var reports = from x in db.Information_MillionsMonthlyReport
// where x.FillingDate < DateTime.Now
// orderby x.FillingDate descending
// select x;
// if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
// {
//if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
//{
// reports = from x in reports
// where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId
// orderby x.FillingDate descending
// select x;
// }
// var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
// //var items = from x in db.Information_MillionsMonthlyReportItem
// // where reportIds.Contains(x.MillionsMonthlyReportId)
// // select new { x.Name, x.TotalWorkNum };
// var items = from x in db.Information_MillionsMonthlyReportItem
//}
//var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
////var items = from x in db.Information_MillionsMonthlyReportItem
//// where reportIds.Contains(x.MillionsMonthlyReportId)
//// select new { x.Name, x.TotalWorkNum };
//var items = from x in db.Information_MillionsMonthlyReportItem
// where reportIds.Contains(x.MillionsMonthlyReportId)
// select new { x.Name, x.TotalWorkNum };
// foreach (JObject mergedRow in Grid1.GetMergedData())
// {
//foreach (JObject mergedRow in Grid1.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
// {
@ -459,7 +465,7 @@ namespace FineUIPro.Web.ZHGL.Information
// }
// }
// }
// }
//}
return err;
}
#endregion
@ -467,7 +473,7 @@ namespace FineUIPro.Web.ZHGL.Information
#region 增加本月明细
private void GetItems(string millionsMonthlyReportId)
{
decimal TotalWorkNumSum = 0;
decimal TotalWorkNumSum = 0, OutSideUnitWorkNumSum = 0;
int PostPersonNumSum = 0, SnapPersonNumSum = 0, ContractorNumSum = 0, SumPersonNumSum = 0, SeriousInjuriesNumSum = 0, SeriousInjuriesPersonNumSum = 0, SeriousInjuriesLossHourSum = 0, MinorAccidentNumSum = 0,
MinorAccidentPersonNumSum = 0, MinorAccidentLossHourSum = 0, DeathAccidentNumSum = 0, DeathAccidentPersonNumSum = 0, DeathAccidentLossHourSum = 0, RestrictedWorkPersonNumSum = 0, RestrictedWorkLossHourSum = 0, MedicalTreatmentPersonNumSum = 0, MedicalTreatmentLossHourSum = 0,
FireNumSum = 0, EnvironmenNumSum = 0, TrafficNumSum = 0, EquipmentNumSum = 0, QualityNumSum = 0, OtherNumSum = 0, FirstAidDressingsNumSum = 0, AttemptedEventNumSum = 0, LossDayNumSum = 0;
@ -487,10 +493,21 @@ namespace FineUIPro.Web.ZHGL.Information
if (!string.IsNullOrEmpty(values["Affiliation"].ToString()))
{
item.Affiliation = values.Value<string>("Affiliation");
var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == values.Value<string>("Affiliation"));
if (getUnit != null)
{
item.UnitId = getUnit.UnitId;
}
}
if (!string.IsNullOrEmpty(values["Name"].ToString()))
{
item.Name = values.Value<string>("Name");
var Name = System.Text.RegularExpressions.Regex.Replace(values.Value<string>("Name"), @"\[[^\]]*\]", "").Trim();
var getProject = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectName == Name);
if (getProject != null)
{
item.ProjectId = getProject.ProjectId;
}
}
if (!string.IsNullOrEmpty(values["PostPersonNum"].ToString()))
{
@ -538,6 +555,15 @@ namespace FineUIPro.Web.ZHGL.Information
{
item.TotalWorkNum = 0;
}
if (!string.IsNullOrEmpty(values["OutSideUnitWorkNum"].ToString()))
{
item.OutSideUnitWorkNum = values.Value<decimal>("OutSideUnitWorkNum");
OutSideUnitWorkNumSum += values.Value<decimal>("OutSideUnitWorkNum");
}
else
{
item.OutSideUnitWorkNum = 0;
}
if (!string.IsNullOrEmpty(values["SeriousInjuriesNum"].ToString()))
{
item.SeriousInjuriesNum = values.Value<int>("SeriousInjuriesNum");
@ -744,6 +770,7 @@ namespace FineUIPro.Web.ZHGL.Information
ContractorNum = ContractorNumSum,
SumPersonNum = SumPersonNumSum,
TotalWorkNum = TotalWorkNumSum,
OutSideUnitWorkNum = OutSideUnitWorkNumSum,
SeriousInjuriesNum = SeriousInjuriesNumSum,
SeriousInjuriesPersonNum = SeriousInjuriesPersonNumSum,
SeriousInjuriesLossHour = SeriousInjuriesLossHourSum,
@ -789,6 +816,7 @@ namespace FineUIPro.Web.ZHGL.Information
{
newItem.SortIndex = oldItem.SortIndex + 1;
newItem.Affiliation = oldItem.Affiliation;
drpAffiliation_SelectedIndexChanged(sender, e);
}
else
{
@ -850,6 +878,7 @@ namespace FineUIPro.Web.ZHGL.Information
ContractorNum = 0,
SumPersonNum = 0,
TotalWorkNum = 0,
OutSideUnitWorkNum = 0,
SeriousInjuriesNum = 0,
SeriousInjuriesPersonNum = 0,
SeriousInjuriesLossHour = 0,
@ -886,6 +915,7 @@ namespace FineUIPro.Web.ZHGL.Information
ContractorNum = 0,
SumPersonNum = 0,
TotalWorkNum = 0,
OutSideUnitWorkNum = 0,
SeriousInjuriesNum = 0,
SeriousInjuriesPersonNum = 0,
SeriousInjuriesLossHour = 0,
@ -948,6 +978,7 @@ namespace FineUIPro.Web.ZHGL.Information
item.ContractorNum = report.ContractorNum;
item.SumPersonNum = report.SumPersonNum;
item.TotalWorkNum = report.TotalWorkNum;
item.OutSideUnitWorkNum = report.OutSideUnitWorkNum;
item.SeriousInjuriesNum = report.SeriousInjuriesNum;
item.SeriousInjuriesPersonNum = report.SeriousInjuriesPersonNum;
item.SeriousInjuriesLossHour = report.SeriousInjuriesLossHour;
@ -978,6 +1009,7 @@ namespace FineUIPro.Web.ZHGL.Information
item.ContractorNum = 0;
item.SumPersonNum = 0;
item.TotalWorkNum = 0;
item.OutSideUnitWorkNum = 0;
item.SeriousInjuriesNum = 0;
item.SeriousInjuriesPersonNum = 0;
item.SeriousInjuriesLossHour = 0;
@ -1133,6 +1165,7 @@ namespace FineUIPro.Web.ZHGL.Information
ContractorNum = item.ContractorNum,
SumPersonNum = item.SumPersonNum,
TotalWorkNum = item.TotalWorkNum,
OutSideUnitWorkNum = item.OutSideUnitWorkNum,
SeriousInjuriesNum = item.SeriousInjuriesNum,
SeriousInjuriesPersonNum = item.SeriousInjuriesPersonNum,
SeriousInjuriesLossHour = item.SeriousInjuriesLossHour,
@ -1284,5 +1317,92 @@ namespace FineUIPro.Web.ZHGL.Information
}
this.txtKeyWorkOKRate.Text = rate;
}
protected void drpAffiliation_SelectedIndexChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(drpAffiliation.SelectedValue))
{
var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == drpAffiliation.SelectedValue);
if (getUnit != null)
{
var originalProjects = ProjectService.GetProjectWorkList(getUnit.UnitId);
var getSProjects = originalProjects.Select(x => new
{
x.ProjectId,
ProjectName = $"[{x.ProjectCode}]{x.ProjectName}",
}).ToList();
drpName.DataTextField = "ProjectName";
drpName.DataValueField = "ProjectName";
drpName.DataSource = getSProjects;
drpName.DataBind();
}
}
}
protected void drpName_SelectedIndexChanged(object sender, EventArgs e)
{
bool isDuplicate = false;
if (!string.IsNullOrEmpty(drpName.SelectedValue))
{
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["Affiliation"].ToString()))
{
if (values.Value<string>("Name") == drpName.SelectedValue && values.Value<string>("Affiliation") == drpAffiliation.SelectedValue)
{
isDuplicate = true;
break;
}
}
}
}
if (isDuplicate)
{
drpName.SelectedValue = string.Empty;
Alert.Show("此项目已被选择，请勿重复！");
}
}
#region 动态加载下拉框
[WebMethod]
public static List<object> InitDrpNameDataSource(string unitName)
{
List<object> result = new List<object>();
try
{
var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == unitName);
if (getUnit != null)
{
var originalProjects = ProjectService.GetProjectWorkList(getUnit.UnitId);
var getSProjects = originalProjects.Select(x => new
{
x.ProjectId,
ProjectName = $"[{x.ProjectCode}]{x.ProjectName}",
}).ToList();
foreach (var project in getSProjects)
{
result.Add(new
{
display = project.ProjectName ?? "",
enabled = 1,
group = "",
prefix = string.Empty,
value = project.ProjectName ?? "",
text = project.ProjectName ?? "",
});
}
}
}
catch (Exception ex)
{
}
return result;
}
#endregion
}
}

17
SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs generated
View File

@ -436,22 +436,22 @@ namespace FineUIPro.Web.ZHGL.Information {
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// txtAffiliation 控件。
/// drpAffiliation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAffiliation;
protected global::FineUIPro.DropDownList drpAffiliation;
/// <summary>
/// txtName 控件。
/// drpName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtName;
protected global::FineUIPro.DropDownList drpName;
/// <summary>
/// txtPostPersonNum 控件。
@ -489,6 +489,15 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.NumberBox txtTotalWorkNum;
/// <summary>
/// txtOutSideUnitWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtOutSideUnitWorkNum;
/// <summary>
/// txtDeathAccidentNum 控件。
/// </summary>

120
SUBQHSE/Model/Model.cs
View File

@ -227254,6 +227254,12 @@ namespace Model
private System.Nullable<int> _EnvironmenNum;
private System.Nullable<decimal> _OutSideUnitWorkNum;
private string _UnitId;
private string _ProjectId;
private EntityRef<Information_MillionsMonthlyReport> _Information_MillionsMonthlyReport;
#region 可扩展性方法定义
@ -227332,6 +227338,12 @@ namespace Model
partial void OnDeathAccidentLossHourChanged();
partial void OnEnvironmenNumChanging(System.Nullable<int> value);
partial void OnEnvironmenNumChanged();
partial void OnOutSideUnitWorkNumChanging(System.Nullable<decimal> value);
partial void OnOutSideUnitWorkNumChanged();
partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
#endregion
public Information_MillionsMonthlyReportItem()
@ -228064,6 +228076,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSideUnitWorkNum", DbType="Decimal(18,4)")]
public System.Nullable<decimal> OutSideUnitWorkNum
{
get
{
return this._OutSideUnitWorkNum;
}
set
{
if ((this._OutSideUnitWorkNum != value))
{
this.OnOutSideUnitWorkNumChanging(value);
this.SendPropertyChanging();
this._OutSideUnitWorkNum = value;
this.SendPropertyChanged("OutSideUnitWorkNum");
this.OnOutSideUnitWorkNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
public string UnitId
{
get
{
return this._UnitId;
}
set
{
if ((this._UnitId != value))
{
this.OnUnitIdChanging(value);
this.SendPropertyChanging();
this._UnitId = value;
this.SendPropertyChanged("UnitId");
this.OnUnitIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_MillionsMonthlyReportItem_Information_MillionsMonthlyReport", Storage="_Information_MillionsMonthlyReport", ThisKey="MillionsMonthlyReportId", OtherKey="MillionsMonthlyReportId", IsForeignKey=true)]
public Information_MillionsMonthlyReport Information_MillionsMonthlyReport
{
@ -239724,6 +239796,8 @@ namespace Model
private System.Nullable<int> _SoleDutyNum;
private System.Nullable<decimal> _OutSideUnitWorkNum;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Sys_User> _Sys_User;
@ -239844,6 +239918,8 @@ namespace Model
partial void OnCommissionerNumChanged();
partial void OnSoleDutyNumChanging(System.Nullable<int> value);
partial void OnSoleDutyNumChanged();
partial void OnOutSideUnitWorkNumChanging(System.Nullable<decimal> value);
partial void OnOutSideUnitWorkNumChanged();
#endregion
public InformationProject_MillionsMonthlyReport()
@ -240981,6 +241057,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSideUnitWorkNum", DbType="Decimal(18,4)")]
public System.Nullable<decimal> OutSideUnitWorkNum
{
get
{
return this._OutSideUnitWorkNum;
}
set
{
if ((this._OutSideUnitWorkNum != value))
{
this.OnOutSideUnitWorkNumChanging(value);
this.SendPropertyChanging();
this._OutSideUnitWorkNum = value;
this.SendPropertyChanged("OutSideUnitWorkNum");
this.OnOutSideUnitWorkNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_InformationProject_MillionsMonthlyReport_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -324705,6 +324801,8 @@ namespace Model
private string _QRCodeAttachUrl;
private System.Nullable<bool> _IsOutSideUnit;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -324745,6 +324843,8 @@ namespace Model
partial void OnCQMS_OrganizationPicChanged();
partial void OnQRCodeAttachUrlChanging(string value);
partial void OnQRCodeAttachUrlChanged();
partial void OnIsOutSideUnitChanging(System.Nullable<bool> value);
partial void OnIsOutSideUnitChanged();
#endregion
public Project_ProjectUnit()
@ -325082,6 +325182,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOutSideUnit", DbType="Bit")]
public System.Nullable<bool> IsOutSideUnit
{
get
{
return this._IsOutSideUnit;
}
set
{
if ((this._IsOutSideUnit != value))
{
this.OnIsOutSideUnitChanging(value);
this.SendPropertyChanging();
this._IsOutSideUnit = value;
this.SendPropertyChanged("IsOutSideUnit");
this.OnIsOutSideUnitChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUnit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{