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>
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx
+6 -4
View File
@@ -37,17 +37,19 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpTechnicalMan" runat="server" Label="交底人" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
<%--<f:DropDownList ID="drpTechnicalMan" runat="server" Label="交底人" LabelAlign="Right" EnableEdit="true"></f:DropDownList>--%>
<f:TextBox ID="txtTechnicalMan" runat="server" Label="交底人" LabelAlign="Right"></f:TextBox>
<f:Label runat="server" ID="lbHid"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPartTechnicalMans" runat="server" Label="参加人员" EnableEdit="true" EnableMultiSelect="true"
<%--<f:DropDownList ID="drpPartTechnicalMans" runat="server" Label="参加人员" EnableEdit="true" EnableMultiSelect="true"
ForceSelection="false" MaxLength="2000" EnableCheckBoxSelect="true"
AutoPostBack="true" OnSelectedIndexChanged="drpPartTechnicalMans_SelectedIndexChanged">
</f:DropDownList>
<f:TextBox runat="server" ID="txtPartTechnicalManNames" MaxLength="2000" Label="补充人员"></f:TextBox>
</f:DropDownList>--%>
<f:TextBox runat="server" ID="txtPartTechnicalMans" Label="参加人员" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtPartTechnicalManNames" MaxLength="2000" Label="补充人员" LabelAlign="Right"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs
+33 -29
View File
@@ -65,7 +65,7 @@ namespace FineUIPro.Web.HSSE.License
if (!string.IsNullOrEmpty(hseTechnical.UnitId))
{
this.drpUnitId.SelectedValue = hseTechnical.UnitId;
UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
//UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true);
}
if (!string.IsNullOrEmpty(hseTechnical.TeamGroupId))
@@ -74,11 +74,13 @@ namespace FineUIPro.Web.HSSE.License
}
if (!string.IsNullOrEmpty(hseTechnical.TechnicalManId))
{
this.drpTechnicalMan.SelectedValue = hseTechnical.TechnicalManId;
//this.drpTechnicalMan.SelectedValue = hseTechnical.TechnicalManId;
this.txtTechnicalMan.Text = hseTechnical.TechnicalManId;
}
if (!string.IsNullOrEmpty(hseTechnical.PartTechnicalManIds))
{
this.drpPartTechnicalMans.SelectedValueArray = hseTechnical.PartTechnicalManIds.Split(',');
this.txtPartTechnicalMans.Text = hseTechnical.PartTechnicalManIds;
//this.drpPartTechnicalMans.SelectedValueArray = hseTechnical.PartTechnicalManIds.Split(',');
}
this.txtPartTechnicalManNames.Text = hseTechnical.PartTechnicalManNames;
this.txtWorkContents.Text = hseTechnical.WorkContents;
@@ -108,7 +110,7 @@ namespace FineUIPro.Web.HSSE.License
{
UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
//参加人员
UserService.InitUserDropDownList(this.drpPartTechnicalMans, this.ProjectId, true);
//UserService.InitUserDropDownList(this.drpPartTechnicalMans, this.ProjectId, true);
}
#region 保存
@@ -160,10 +162,11 @@ namespace FineUIPro.Web.HSSE.License
{
hSETechnical.TeamGroupId = this.drpTeamGroupId.SelectedValue;
}
if (this.drpTechnicalMan.SelectedValue != BLL.Const._Null)
{
hSETechnical.TechnicalManId = this.drpTechnicalMan.SelectedValue;
}
//if (this.drpTechnicalMan.SelectedValue != BLL.Const._Null)
//{
//hSETechnical.TechnicalManId = this.drpTechnicalMan.SelectedValue;
//}
hSETechnical.TechnicalManId = this.txtTechnicalMan.Text.Trim();
hSETechnical.WorkContents = this.txtWorkContents.Text.Trim();
hSETechnical.Address = this.txtAddress.Text.Trim();
hSETechnical.CompileMan = this.CurrUser.UserId;
@@ -175,19 +178,20 @@ namespace FineUIPro.Web.HSSE.License
}
///组成员
string partInManIds = string.Empty;
foreach (var item in this.drpPartTechnicalMans.SelectedValueArray)
{
var user = BLL.UserService.GetUserByUserId(item);
if (user != null)
{
partInManIds += user.UserId + ",";
}
}
if (!string.IsNullOrEmpty(partInManIds))
{
hSETechnical.PartTechnicalManIds = partInManIds.Substring(0, partInManIds.LastIndexOf(","));
}
//string partInManIds = string.Empty;
//foreach (var item in this.drpPartTechnicalMans.SelectedValueArray)
//{
// var user = BLL.UserService.GetUserByUserId(item);
// if (user != null)
// {
// partInManIds += user.UserId + ",";
// }
//}
//if (!string.IsNullOrEmpty(partInManIds))
//{
// hSETechnical.PartTechnicalManIds = partInManIds.Substring(0, partInManIds.LastIndexOf(","));
//}
hSETechnical.PartTechnicalManIds = this.txtPartTechnicalMans.Text.Trim();
hSETechnical.PartTechnicalManNames = this.txtPartTechnicalManNames.Text.Trim();
if (!string.IsNullOrEmpty(this.HSETechnicalId))
@@ -232,24 +236,24 @@ namespace FineUIPro.Web.HSSE.License
protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpTeamGroupId.Items.Clear();
this.drpTechnicalMan.Items.Clear();
//this.drpTechnicalMan.Items.Clear();
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
//UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true);
}
else
{
Funs.FineUIPleaseSelect(this.drpTeamGroupId);
Funs.FineUIPleaseSelect(this.drpTechnicalMan);
//Funs.FineUIPleaseSelect(this.drpTechnicalMan);
}
this.drpTeamGroupId.SelectedIndex = 0;
this.drpTechnicalMan.SelectedIndex = 0;
//this.drpTechnicalMan.SelectedIndex = 0;
}
protected void drpPartTechnicalMans_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpPartTechnicalMans.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPartTechnicalMans.SelectedValueArray);
}
//protected void drpPartTechnicalMans_SelectedIndexChanged(object sender, EventArgs e)
//{
// this.drpPartTechnicalMans.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPartTechnicalMans.SelectedValueArray);
//}
}
}
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs
Generated
+4 -4
View File
@@ -76,13 +76,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.DropDownList drpTeamGroupId;
/// <summary>
/// drpTechnicalMan 控件。
/// txtTechnicalMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTechnicalMan;
protected global::FineUIPro.TextBox txtTechnicalMan;
/// <summary>
/// lbHid 控件。
@@ -94,13 +94,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.Label lbHid;
/// <summary>
/// drpPartTechnicalMans 控件。
/// txtPartTechnicalMans 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPartTechnicalMans;
protected global::FineUIPro.TextBox txtPartTechnicalMans;
/// <summary>
/// txtPartTechnicalManNames 控件。
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx
+2 -2
View File
@@ -58,12 +58,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_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/Meeting/AttendMeetingEdit.aspx.cs
+16 -16
View File
@@ -187,22 +187,22 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.AttendMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.AttendMeetingId, Const.ProjectAttendMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.AttendMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.AttendMeetingId, Const.ProjectAttendMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.AttendMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.AttendMeetingId, Const.ProjectAttendMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.AttendMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.AttendMeetingId, Const.ProjectAttendMeetingMenuId)));
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx.designer.cs
Generated
-18
View File
@@ -129,24 +129,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx
+2 -2
View File
@@ -59,12 +59,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" >
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" >
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click">
</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/Meeting/AttendMeetingView.aspx.cs
+14 -14
View File
@@ -78,20 +78,20 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.AttendMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId)));
}
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.AttendMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId)));
// }
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.AttendMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId)));
}
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.AttendMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.AttendMeetingId, BLL.Const.ProjectAttendMeetingMenuId)));
// }
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs
Generated
-18
View File
@@ -129,24 +129,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx
+2 -2
View File
@@ -75,12 +75,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_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/Meeting/ClassMeetingEdit.aspx.cs
+16 -16
View File
@@ -214,23 +214,23 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.ClassMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.ClassMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.ClassMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.ClassMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//}
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx.designer.cs
Generated
-18
View File
@@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx
+2 -2
View File
@@ -73,12 +73,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" >
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" >
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click">
</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/Meeting/ClassMeetingView.aspx.cs
+8 -8
View File
@@ -84,14 +84,14 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs
Generated
-18
View File
@@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx
+2 -2
View File
@@ -73,12 +73,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click" ValidateForms="SimpleForm1">
</f:Button>
</f:Button>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs
+16 -16
View File
@@ -195,23 +195,23 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.MonthMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.MonthMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.MonthMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.MonthMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.MonthMeetingId, Const.ProjectMonthMeetingMenuId)));
//}
/// <summary>
/// 计算参会人数
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs
Generated
-18
View File
@@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx
+2 -2
View File
@@ -71,12 +71,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" >
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" >
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click">
</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/Meeting/MonthMeetingView.aspx.cs
+14 -14
View File
@@ -85,20 +85,20 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.MonthMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId)));
}
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.MonthMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId)));
// }
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.MonthMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId)));
}
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.MonthMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.MonthMeetingId, BLL.Const.ProjectMonthMeetingMenuId)));
// }
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs
Generated
-18
View File
@@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx
+2 -2
View File
@@ -63,12 +63,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click" ValidateForms="SimpleForm1">
</f:Button>
</f:Button>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs
+16 -16
View File
@@ -185,23 +185,23 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.SafetyLeaderGroupMeetingId, Const.ProjectSafetyLeaderGroupMeetingMenuId)));
//}
/// <summary>
/// 计算参会人数
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs
Generated
-18
View File
@@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx
+2 -2
View File
@@ -61,12 +61,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" >
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" >
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click">
</f:Button>
</f:Button>--%>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs
+14 -14
View File
@@ -82,20 +82,20 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId)));
}
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId)));
// }
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId)));
}
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.SafetyLeaderGroupMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SafetyLeaderGroupMeetingId, BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId)));
// }
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs
Generated
-18
View File
@@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx
+2 -2
View File
@@ -73,12 +73,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_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/Meeting/SpecialMeetingEdit.aspx.cs
+16 -16
View File
@@ -196,23 +196,23 @@ namespace FineUIPro.Web.HSSE.Meeting
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.SpecialMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.SpecialMeetingId, Const.ProjectSpecialMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.SpecialMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.SpecialMeetingId, Const.ProjectSpecialMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.SpecialMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.SpecialMeetingId, Const.ProjectSpecialMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.SpecialMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.SpecialMeetingId, Const.ProjectSpecialMeetingMenuId)));
//}
/// <summary>
/// 计算参会人数
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs
Generated
-18
View File
@@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx
+2 -2
View File
@@ -72,12 +72,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" >
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" >
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click">
</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/Meeting/SpecialMeetingView.aspx.cs
+14 -14
View File
@@ -86,20 +86,20 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.SpecialMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId)));
}
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.SpecialMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId)));
// }
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.SpecialMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId)));
}
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.SpecialMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.SpecialMeetingId, BLL.Const.ProjectSpecialMeetingMenuId)));
// }
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs
Generated
-18
View File
@@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx
+2 -2
View File
@@ -71,12 +71,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click" ValidateForms="SimpleForm1">
</f:Button>
</f:Button>--%>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.cs
+16 -16
View File
@@ -203,23 +203,23 @@ namespace FineUIPro.Web.HSSE.Meeting
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.WeekMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.WeekMeetingId, Const.ProjectWeekMeetingMenuId)));
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.WeekMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.WeekMeetingId, Const.ProjectWeekMeetingMenuId)));
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.WeekMeetingId))
{
SaveData(Const.BtnSave);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.WeekMeetingId, Const.ProjectWeekMeetingMenuId)));
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (string.IsNullOrEmpty(this.WeekMeetingId))
// {
// SaveData(Const.BtnSave);
// }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.WeekMeetingId, Const.ProjectWeekMeetingMenuId)));
//}
/// <summary>
/// 计算参会人数
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs
Generated
-18
View File
@@ -156,24 +156,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// btnSave 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx
+2 -2
View File
@@ -70,12 +70,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" >
</f:Button>
<f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" >
</f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click">
</f:Button>
</f:Button>--%>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs
+14 -14
View File
@@ -83,20 +83,20 @@ namespace FineUIPro.Web.HSSE.Meeting
}
}
#endregion
protected void btnAttachUrl1_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.WeekMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId)));
}
}
//protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.WeekMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId)));
// }
//}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.WeekMeetingId))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId)));
}
}
//protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{
// if (!string.IsNullOrEmpty(this.WeekMeetingId))
// {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.WeekMeetingId, BLL.Const.ProjectWeekMeetingMenuId)));
// }
//}
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs
Generated
-18
View File
@@ -156,24 +156,6 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary>
/// btnClose 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+35
View File
@@ -583,6 +583,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (!string.IsNullOrEmpty(person.PersonId))
{
#region 特岗人员资质
////更新特岗人员资质
var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(person.PersonId);
if (personQuality != null)
@@ -616,6 +617,40 @@ namespace FineUIPro.Web.HSSE.SitePerson
newPersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
BLL.PersonQualityService.AddPersonQuality(newPersonQuality);
}
#endregion
#region 安管人员资质
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
{
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
safePersonQuality.CompileMan = this.CurrUser.UserId;
safePersonQuality.CompileDate = DateTime.Now;
BLL.SafePersonQualityService.UpdateSafePersonQuality(safePersonQuality);
}
else
{
Model.QualityAudit_SafePersonQuality newSafePersonQuality = new Model.QualityAudit_SafePersonQuality
{
SafePersonQualityId = SQLHelper.GetNewID(typeof(Model.QualityAudit_SafePersonQuality)),
PersonId = person.PersonId,
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now
};
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
newSafePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
newSafePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
newSafePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
BLL.SafePersonQualityService.AddSafePersonQuality(newSafePersonQuality);
}
#endregion
}
if (string.IsNullOrEmpty(this.txtOutTime.Text.Trim()))
{