This commit is contained in:
geh
2026-09-14 15:58:12 +08:00
parent a815e09879
commit 77f61d7e06
128 changed files with 25181 additions and 960 deletions
@@ -31,6 +31,15 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="施工单位" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged" EnableEdit="true" AutoSelectFirstItem="false">
</f:DropDownList>
<f:DropDownList ID="drpStandbyPersonnel" runat="server" Label="旁站人员" Required="true" ShowRedStar="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:Label runat="server" ID="Label7"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList ID="rblIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Required="true" ShowRedStar="true">
@@ -50,6 +50,8 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.ProjectId = this.CurrUser.LoginProjectId;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, false);
//类型
BLL.ConstValue.InitConstValueDropDownList(this.drpHazardType, ConstValue.Group_LargerHazardType, true);
//是否需要专家论证
@@ -68,6 +70,17 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.drpHazardType.SelectedValue = largerHazard.HazardType;
}
if (!string.IsNullOrEmpty(largerHazard.UnitId))
{
this.drpUnit.SelectedValue = largerHazard.UnitId;
//根据单位和项目获取人员
BLL.PersonService.InitPersonByProjectUnitDropDownList(this.drpStandbyPersonnel, largerHazard.ProjectId, largerHazard.UnitId, false);
if (!string.IsNullOrEmpty(largerHazard.StandbyPersonnelId))
{
this.drpStandbyPersonnel.SelectedValue = largerHazard.StandbyPersonnelId;
}
}
this.txtAddress.Text = largerHazard.Address;
if (largerHazard.ExpectedTime != null)
{
@@ -131,6 +144,17 @@ namespace FineUIPro.Web.HSSE.Solution
ShowNotify("请选择类型!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(this.drpStandbyPersonnel.SelectedValue))
{
ShowNotify("请选择旁站人员!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(this.drpUnit.SelectedValue))
{
ShowNotify("请选择施工单位!", MessageBoxIcon.Warning);
return;
}
this.SaveData(BLL.Const.BtnSave);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
@@ -159,6 +183,9 @@ namespace FineUIPro.Web.HSSE.Solution
States = this.drpStates.SelectedValue,
HazardName=txtHazardName.Text.Trim(),
ApprovalState = this.drpApprovalState.SelectedValue,
UnitId = this.drpUnit.SelectedValue,
StandbyPersonnelId = this.drpStandbyPersonnel.SelectedValue,
};
if (!string.IsNullOrEmpty(this.HazardId))
@@ -205,6 +232,14 @@ namespace FineUIPro.Web.HSSE.Solution
}
#endregion
}
//更新三库危大工程
string message = string.Empty;
SanKuDataSummaryReportService.UpdateDangerousEngineeringRecord(this.HazardId, ref message);
if (!string.IsNullOrWhiteSpace(message))
{
ShowNotify(message, MessageBoxIcon.Warning);
}
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation);
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject);
}
@@ -386,5 +421,20 @@ namespace FineUIPro.Web.HSSE.Solution
BLL.LargerHazardService.AddLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId,BLL.Const.ProjectLargerHazardListMenuId,BLL.Const.BtnAdd);
}
/// <summary>
/// 单位下拉框事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue))
{
//根据单位和项目获取人员
BLL.PersonService.InitPersonByProjectUnitDropDownList(this.drpStandbyPersonnel, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, false);
}
}
}
}
@@ -77,6 +77,33 @@ namespace FineUIPro.Web.HSSE.Solution
/// </remarks>
protected global::FineUIPro.DatePicker txtExpectedTime;
/// <summary>
/// drpUnit control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpStandbyPersonnel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.DropDownList drpStandbyPersonnel;
/// <summary>
/// Label7 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Label Label7;
/// <summary>
/// rblIsArgument control.
/// </summary>
@@ -131,9 +131,9 @@
</f:Panel>
</Items>
</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="1000px" Height="500px">
<f:Window ID="Window1" Title="编辑危工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1100px" Height="580px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
@@ -31,6 +31,15 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtUnitName" runat="server" Label="施工单位" LabelWidth="100px" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtStandbyPersonnel" runat="server" Label="旁站人员" LabelWidth="100px" Readonly="true">
</f:TextBox>
<f:Label runat="server" ID="Label7"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Readonly="true" >
@@ -74,6 +74,14 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.txtTrainPersonNum.Text = largerHazard.TrainPersonNum.ToString();
}
if (!string.IsNullOrWhiteSpace(largerHazard.UnitId))
{
this.txtUnitName.Text = UnitService.getUnitNamesUnitIds(largerHazard.UnitId);
}
if (!string.IsNullOrWhiteSpace(largerHazard.StandbyPersonnelId))
{
this.txtStandbyPersonnel.Text = PersonService.GetPersonNameById(largerHazard.StandbyPersonnelId);
}
this.drpStates.SelectedValue = largerHazard.States;
this.txtDescriptions.Text = largerHazard.Descriptions;
this.txtRemark.Text = HttpUtility.HtmlDecode(largerHazard.Remark);
@@ -77,6 +77,33 @@ namespace FineUIPro.Web.HSSE.Solution
/// </remarks>
protected global::FineUIPro.TextBox txtExpectedTime;
/// <summary>
/// txtUnitName control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// txtStandbyPersonnel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtStandbyPersonnel;
/// <summary>
/// Label7 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Label Label7;
/// <summary>
/// txtIsArgument control.
/// </summary>