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

20240523 菜单精简

Browse Source
This commit is contained in:
毕文静
2024-05-23 09:41:47 +08:00
parent 3de388f25d
commit e1517d9238
70 changed files with 1029 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx
+2 -2
View File
@@ -154,9 +154,9 @@
<f:Button ID="btnPunishNoticeUrl" Text="通知单" ToolTip="通知单上传及查看" Icon="TableCell" runat="server"
OnClick="btnPunishNoticeUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl" Text="回执单" ToolTip="回执单上传及查看" Icon="TableCell" runat="server"
<%--<f:Button ID="btnAttachUrl" Text="回执单" ToolTip="回执单上传及查看" Icon="TableCell" runat="server"
OnClick="btnUploadResources_Click" ValidateForms="SimpleForm1">
</f:Button>
</f:Button>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs
+8 -8
View File
@@ -191,14 +191,14 @@ namespace FineUIPro.Web.HSSE.Check
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUploadResources_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.PunishNoticeId))
{
this.PunishNoticeId = SQLHelper.GetNewID(typeof(Model.Check_RectifyNotices));
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId)));
}
//protected void btnUploadResources_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.PunishNoticeId))
// {
// this.PunishNoticeId = SQLHelper.GetNewID(typeof(Model.Check_RectifyNotices));
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId)));
//}
/// <summary>
/// 通知单上传附件资源
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs
Generated
-9
View File
@@ -237,15 +237,6 @@ namespace FineUIPro.Web.HSSE.Check {
/// </remarks>
protected global::FineUIPro.Button btnPunishNoticeUrl;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx
+2 -2
View File
@@ -166,9 +166,9 @@
<f:Button ID="btnPunishNoticeUrl" Text="通知单" ToolTip="通知单上传及查看" Icon="TableCell" runat="server"
OnClick="btnPunishNoticeUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl" Text="回执单" ToolTip="回执单上传及查看" Icon="TableCell" runat="server"
<%--<f:Button ID="btnAttachUrl" Text="回执单" ToolTip="回执单上传及查看" Icon="TableCell" runat="server"
OnClick="btnUploadResources_Click" ValidateForms="SimpleForm1">
</f:Button>
</f:Button>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1"
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs
+4 -4
View File
@@ -202,11 +202,11 @@ namespace FineUIPro.Web.HSSE.Check
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUploadResources_Click(object sender, EventArgs e)
{
//protected void btnUploadResources_Click(object sender, EventArgs e)
//{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId)));
}
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&menuId=" + Const.ProjectPunishNoticeMenuId, this.PunishNoticeId)));
//}
/// <summary>
/// 通知单上传附件资源
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs
Generated
-9
View File
@@ -309,15 +309,6 @@ namespace FineUIPro.Web.HSSE.Check {
/// </remarks>
protected global::FineUIPro.Button btnPunishNoticeUrl;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx
+3 -3
View File
@@ -71,7 +71,7 @@
<Items>
<f:TextBox ID="txtSignMan" runat="server" Label="签发人" LabelAlign="Right" Readonly="true" LabelWidth="90px">
</f:TextBox>
<f:TextBox ID="txtApproveMan" runat="server" Label="批准人" LabelAlign="Right" Readonly="true" LabelWidth="90px">
<f:TextBox ID="txtApproveMan" runat="server" Label="批准人" LabelAlign="Right" Readonly="true" LabelWidth="90px" Hidden="true">
</f:TextBox>
</Items>
</f:FormRow>
@@ -123,9 +123,9 @@
<f:Button ID="btnPunishNoticeUrl" Text="通知单" ToolTip="通知单上传及查看" Icon="TableCell" runat="server"
OnClick="btnPunishNoticeUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl" Text="回执单" ToolTip="回执单上传及查看" Icon="TableCell" runat="server"
<%--<f:Button ID="btnAttachUrl" Text="回执单" ToolTip="回执单上传及查看" Icon="TableCell" runat="server"
OnClick="btnUploadResources_Click" ValidateForms="SimpleForm1">
</f:Button>
</f:Button>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs
+9 -9
View File
@@ -88,11 +88,11 @@ namespace FineUIPro.Web.HSSE.Check
{
this.txtSignMan.Text = user1.UserName;
}
Model.Sys_User user2 = BLL.UserService.GetUserByUserId(punishNotice.ApproveMan);
if (user2 != null)
{
this.txtApproveMan.Text = user2.UserName;
}
//Model.Sys_User user2 = BLL.UserService.GetUserByUserId(punishNotice.ApproveMan);
//if (user2 != null)
//{
// this.txtApproveMan.Text = user2.UserName;
//}
if (punishNotice.PunishMoney != null)
{
this.txtPunishMoney.Text = Convert.ToString(punishNotice.PunishMoney);
@@ -144,10 +144,10 @@ namespace FineUIPro.Web.HSSE.Check
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUploadResources_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&type=-1&menuId=" + BLL.Const.ProjectPunishNoticeMenuId, this.PunishNoticeId)));
}
//protected void btnUploadResources_Click(object sender, EventArgs e)
//{
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PunishNotice&type=-1&menuId=" + BLL.Const.ProjectPunishNoticeMenuId, this.PunishNoticeId)));
//}
/// <summary>
/// 通知单上传附件资源
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs
Generated
-9
View File
@@ -192,15 +192,6 @@ namespace FineUIPro.Web.HSSE.Check {
/// </remarks>
protected global::FineUIPro.Button btnPunishNoticeUrl;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>