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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2024-11-12 17:56:08 +08:00
parent 57a4adcd9e ef607782ee
commit 4ecfb2d567
15 changed files with 725 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
+1 -1
View File
@@ -38,7 +38,7 @@
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:DropDownList ID="DropDownList1" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px"
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px"
>
</f:DropDownList>
</Items>
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
+19 -1
View File
@@ -94,6 +94,8 @@ namespace FineUIPro.Web.HSSE.Hazard
if (!string.IsNullOrEmpty(constructionRisk.UnitId))
{
drpUnit.SelectedValue = constructionRisk.UnitId;
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
this.drpSubUnitDutyPerson.SelectedValue = constructionRisk.SubUnitDutyPerson;
}
if (!string.IsNullOrEmpty(constructionRisk.RefLicense))
{
@@ -166,6 +168,7 @@ namespace FineUIPro.Web.HSSE.Hazard
drpHandleType.DataSource = BLL.ConstructionRiskListService.GetDHandleTypeByState(BLL.Const.ConstructionRisk_Compile);
drpHandleType.DataBind();
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
}
drpHandleType_SelectedIndexChanged(null, null);
Grid1.DataSource = constructionRiskControls;
@@ -207,6 +210,11 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (this.drpSubUnitDutyPerson.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择施工单位责任人！", MessageBoxIcon.Warning);
return;
}
if (this.drpWorkArea.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择主项！", MessageBoxIcon.Warning);
@@ -240,6 +248,11 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpSubUnitDutyPerson.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择施工单位责任人！", MessageBoxIcon.Warning);
return;
}
if (this.drpWorkArea.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择主项！", MessageBoxIcon.Warning);
@@ -312,6 +325,10 @@ namespace FineUIPro.Web.HSSE.Hazard
{
newConstructionRisk.UnitId = drpUnit.SelectedValue;
}
if (this.drpSubUnitDutyPerson.SelectedValue != BLL.Const._Null)
{
newConstructionRisk.SubUnitDutyPerson = this.drpSubUnitDutyPerson.SelectedValue;
}
newConstructionRisk.DateA = Funs.GetNewDateTime(this.dpDateA.Text.Trim());
newConstructionRisk.DateZ = Funs.GetNewDateTime(this.dpDateZ.Text.Trim());
if (this.drpLicenseDes.SelectedValueArray.Length == 1 && this.drpLicenseDes.SelectedValue == BLL.Const._Null)
@@ -652,7 +669,8 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
this.drpSubUnitDutyPerson.SelectedValue = BLL.Const._Null;
}
}
}
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -76,13 +76,13 @@ namespace FineUIPro.Web.HSSE.Hazard {
protected global::FineUIPro.TextBox txtConstructionContent;
/// <summary>
/// DropDownList1 控件。
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary>
/// drpWorkArea 控件。
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
+5 -3
View File
@@ -35,10 +35,12 @@
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 85%">
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:Label runat="server" ID="txtC" LabelWidth="140px" Label="施工内容" ShowRedStar="true"></f:Label>
<f:Label runat="server" ID="txtConstructionContent"></f:Label>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" Readonly="true"
>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs
+2
View File
@@ -88,6 +88,8 @@ namespace FineUIPro.Web.HSSE.Hazard
if (!string.IsNullOrEmpty(constructionRisk.UnitId))
{
drpUnit.SelectedValue = constructionRisk.UnitId;
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
this.drpSubUnitDutyPerson.SelectedValue = constructionRisk.SubUnitDutyPerson;
}
if (!string.IsNullOrEmpty(constructionRisk.RefLicense))
{
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs
Generated
+10 -10
View File
@@ -66,15 +66,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks>
protected global::FineUIPro.DatePicker dpDateZ;
/// <summary>
/// txtC 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtC;
/// <summary>
/// txtConstructionContent 控件。
/// </summary>
@@ -82,7 +73,16 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtConstructionContent;
protected global::FineUIPro.TextBox txtConstructionContent;
/// <summary>
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary>
/// drpWorkArea 控件。
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx
+3
View File
@@ -46,6 +46,9 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnUpdata" Text ="推送" Icon="PageSave" runat="server" Hidden="true" ConfirmText="确定推送？"
ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
</f:Button>
<f:HiddenField runat="server" ID="hdStr"></f:HiddenField>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+18
View File
@@ -255,6 +255,7 @@ namespace FineUIPro.Web.ProjectData
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
this.btnUpdata.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave))
{
@@ -442,5 +443,22 @@ namespace FineUIPro.Web.ProjectData
}
}
#region 推送项目信息到集团
protected void btnPush_Click(object sender, EventArgs e)
{
string code = CNCECHSSEWebService.PushProject();
if (code == "1")
{
ShowNotify("同步成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
else
{
Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
}
}
#endregion
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs
Generated
+9
View File
@@ -102,6 +102,15 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnUpdata 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUpdata;
/// <summary>
/// hdStr 控件。
/// </summary>