lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改质量综合管理导入及页面显示

Browse Source
This commit is contained in:
高飞
2023-06-26 11:16:55 +08:00
parent 966843abbe
commit f1c55719b3
35 changed files with 2194 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
+2 -6
View File
@@ -31,10 +31,10 @@
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
Hidden="true">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
@@ -63,10 +63,6 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整理时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="StatesName"
SortField="StatesName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.cs
+1 -1
View File
@@ -148,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Solution
var getRecord = BLL.ExpertArgumentService.GetLargerHazardListById(Grid1.SelectedRowID);
if (getRecord != null)
{
if (!this.btnMenuModify.Hidden && (getRecord.States == BLL.Const.State_0 || string.IsNullOrEmpty(getRecord.States))) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
if (!this.btnMenuModify.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpertArgumentListEdit.aspx?LargerHazardListId={0}", getRecord.LargerHazardListId, "查看 - ")));
}
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx
+3 -6
View File
@@ -32,7 +32,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server">
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增">
</f:Button>
</Items>
</f:Toolbar>
@@ -74,13 +74,10 @@
</f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存"
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存"
ValidateForms="SimpleForm1" OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交"
ValidateForms="SimpleForm1" OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭"
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭"
runat="server" Icon="SystemClose">
</f:Button>
</Items>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx.cs
+1 -19
View File
@@ -81,19 +81,6 @@ namespace FineUIPro.Web.HSSE.Solution
}
}
#region 提交按钮
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
this.SaveData(BLL.Const.BtnSubmit);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
#endregion
#region 保存按钮
/// <summary>
/// 保存按钮
@@ -123,13 +110,8 @@ namespace FineUIPro.Web.HSSE.Solution
VersionNo = this.txtVersionNo.Text.Trim(),
RecardManId = this.CurrUser.UserId,
////单据状态
States = BLL.Const.State_0,
States = BLL.Const.State_1,
};
if (type == BLL.Const.BtnSubmit)
{
newRecord.States = BLL.Const.State_1;
}
if (!string.IsNullOrEmpty(this.LargerHazardListId))
{
BLL.ExpertArgumentService.UpdateLargerHazardList(newRecord);
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx.designer.cs
Generated
-9
View File
@@ -129,15 +129,6 @@ namespace FineUIPro.Web.HSSE.Solution {
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnClose 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx
+3 -3
View File
@@ -17,7 +17,7 @@
Required="true" ShowRedStar="true">
</f:NumberBox>
<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" EnableEdit="true"
Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWorkId_SelectedIndexChanged">
Required="true" ShowRedStar="true">
</f:DropDownList>
</Items>
</f:FormRow>
@@ -57,10 +57,10 @@
</f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Text="保存"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs
+5 -11
View File
@@ -55,6 +55,7 @@ namespace FineUIPro.Web.HSSE.Solution
BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False");
//施工单位
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList2(drpWorkPackageId, true);
this.LargerHazardListId = Request.Params["LargerHazardListId"];
this.LargerHazardListItemId = Request.Params["LargerHazardListItemId"];
@@ -65,11 +66,10 @@ namespace FineUIPro.Web.HSSE.Solution
if (!string.IsNullOrEmpty(getItem.UnitWorkId))
{
this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId;
BLL.WorkPackageService.InitWorkPackagesDropDownListByUnitWorkId(this.drpWorkPackageId, this.drpUnitWorkId.SelectedValue, true);
if (!string.IsNullOrEmpty(getItem.WorkPackageId))
{
this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
}
}
if (!string.IsNullOrEmpty(getItem.WorkPackageId))
{
this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
}
this.txtWorkPackageSize.Text = getItem.WorkPackageSize;
this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", getItem.ExpectedStartTime);
@@ -128,11 +128,5 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
protected void drpUnitWorkId_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpWorkPackageId.Items.Clear();
BLL.WorkPackageService.InitWorkPackagesDropDownListByUnitWorkId(this.drpWorkPackageId, this.drpUnitWorkId.SelectedValue, true);
}
}
}
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx
+3 -3
View File
@@ -19,7 +19,7 @@
</f:TextBox>
<f:TextBox ID="txtVersionNo" runat="server" Label="版本" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtRecordTime" runat="server" Label="版本" Readonly="true">
<f:TextBox ID="txtRecordTime" runat="server" Label="编制日期" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
@@ -66,10 +66,10 @@
</f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnCancel" Icon="PageCancel" runat="server" ToolTip="作废" Hidden="true"
<f:Button ID="btnCancel" Icon="PageCancel" runat="server" ToolTip="作废" Hidden="true"
OnClick="btnCancel_Click" Text="作废" ConfirmText="确定作废当前记录？">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭"
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭"
runat="server" Icon="SystemClose">
</f:Button>
</Items>