diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql new file mode 100644 index 00000000..1269914b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql @@ -0,0 +1,31 @@ + +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('193BB4A7-B5F2-4A01-8E98-8010D073CA7A','4E0030F6-EF5E-40A6-939F-C29BC4D7CEE1','޸',1) +go + +--ȥʹò˵ +update Sys_Menu set IsUsed=0 where MenuId='27DE7248-C4FF-4288-BBAC-11CB8741AD67' --ר֤嵥 +update Sys_Menu set IsUsed=0 where MenuId='F910062E-98B0-486F-A8BD-D5B0035F808F'--֪ͨ +update Sys_Menu set IsUsed=0 where MenuId='F057C207-4549-48AE-B838-A1920E5709D8' --ϵ +update Sys_Menu set IsUsed=0 where MenuId='06958288-96F4-4291-909A-FFC2FC76814D'--ΥԱ¼ +update Sys_Menu set IsUsed=0 where MenuId='3EF6E488-21D2-47BB-AA33-4FB0E9FED606' --¼ӦԤ +update Sys_Menu set IsUsed=0 where MenuId='E1BBA25B-DAE5-4CFF-B72A-6C6044917D2B'--Ŀĵ +update Sys_Menu set IsUsed=0 where SuperMenu='E1BBA25B-DAE5-4CFF-B72A-6C6044917D2B' +update Sys_Menu set IsUsed=0 where SuperMenu='4EBDBF0A-53FC-4B86-BE6E-D6C16985A613' +update Sys_Menu set IsUsed=0 where MenuId='B2DA78EF-EECA-4AF4-9FAC-ECCFF1D6E459' --¼ +go + +update License_HSETechnical set TechnicalManId = (select userName from sys_user where UserId = TechnicalManId) +go +update License_HSETechnical set PartTechnicalManIds = (STUFF(( SELECT ',' + UserName FROM Sys_User +where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + License_HSETechnical.PartTechnicalManIds + ',')>0 +ORDER BY PATINDEX('%,' + RTRIM(License_HSETechnical.HSETechnicalId) + ',%',',' + License_HSETechnical.PartTechnicalManIds + ',') +FOR XML PATH('')), 1, 1,'')) +go + +update Sys_Menu set IsUsed=0 where MenuId='D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684' --HSE +go +--HSEݲ밲ȫ쵼С +--insert into Meeting_SafetyLeaderGroupMeeting(SafetyLeaderGroupMeetingId,ProjectId,SafetyLeaderGroupMeetingCode,SafetyLeaderGroupMeetingName,SafetyLeaderGroupMeetingDate,CompileMan,SafetyLeaderGroupMeetingContents,CompileDate,States,AttentPersonNum,MeetingHours,MeetingHostMan,AttentPerson,MeetingPlace,UnitId,MeetingHostManId,AttentPersonIds) +--select MonthMeetingId,ProjectId,MonthMeetingCode,MonthMeetingName,MonthMeetingDate,CompileMan,MonthMeetingContents,CompileDate,States,AttentPersonNum,MeetingHours,MeetingHostMan,AttentPerson,MeetingPlace,UnitId,MeetingHostManId,AttentPersonIds from Meeting_MonthMeeting +--go diff --git a/SGGL/BLL/BoSheng/BOSHENGService.cs b/SGGL/BLL/BoSheng/BOSHENGService.cs index 302d6d13..c782cfe5 100644 --- a/SGGL/BLL/BoSheng/BOSHENGService.cs +++ b/SGGL/BLL/BoSheng/BOSHENGService.cs @@ -1,4 +1,5 @@ using FineUIPro; +using Model; using System; using System.Collections; using System.Linq; @@ -22,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getUnits = from x in db.Bo_Sheng_Unit + private static IQueryable getUnits = from x in db.Bo_Sheng_Unit where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -173,7 +174,7 @@ namespace BLL IsOutName = x.IsOut == "1" ? "是" : "否", x.LeaveDate, x.IsBlackList, - IsBlackListName =x.IsBlackList == "1" ? "是" : "否", + IsBlackListName = x.IsBlackList == "1" ? "是" : "否", x.AgreementId, x.HasInsurance, x.DeviceNumber, @@ -184,6 +185,7 @@ namespace BLL x.UploadTime, }; } + #endregion #region 获取培训记录列表 @@ -238,7 +240,7 @@ namespace BLL x.RecordName, x.TrainType, x.PaperMode, - PaperModeName = x.PaperMode=="0"? "使用原卷" : "重新出卷", + PaperModeName = x.PaperMode == "0" ? "使用原卷" : "重新出卷", x.TrainMode, x.TrainPrincipal, x.TrainStartDate, @@ -291,7 +293,7 @@ namespace BLL /// 页码 /// 每页数量 /// - public static IEnumerable getTrainPersonListData(string projectId,string departName, string name, string identifyID, Grid Grid1) + public static IEnumerable getTrainPersonListData(string projectId, string departName, string name, string identifyID, Grid Grid1) { IQueryable getDataList = getTrainPersons.Where(x => x.ProjectId == projectId); if (!string.IsNullOrEmpty(departName)) @@ -335,7 +337,7 @@ namespace BLL x.SignInType, x.TrainPeriod, x.State, - StateName= x.State=="0"? "正常" : "补签", + StateName = x.State == "0" ? "正常" : "补签", x.TotalScore, x.PassScore, x.Score, @@ -369,8 +371,8 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getExams = from x in db.Bo_Sheng_Exam - where (x.DeleteTag == "False" || x.DeleteTag == null) + private static IQueryable getExams = from x in db.Bo_Sheng_Exam + where (x.DeleteTag == "False" || x.DeleteTag == null) select x; /// @@ -379,7 +381,7 @@ namespace BLL /// 页码 /// 每页数量 /// - public static IEnumerable getExamListData(string projectId, string qsnCode,string qsnContent, Grid Grid1) + public static IEnumerable getExamListData(string projectId, string qsnCode, string qsnContent, Grid Grid1) { IQueryable getDataList = getExams.Where(x => x.ProjectId == projectId); @@ -414,7 +416,7 @@ namespace BLL x.QsnFileName, x.QsnAnswer, x.QsnCategory, - QsnCategoryName= x.QsnCategory=="3"? "图片题" : (x.QsnCategory == "2"? "多媒体题" : "文字题"), + QsnCategoryName = x.QsnCategory == "3" ? "图片题" : (x.QsnCategory == "2" ? "多媒体题" : "文字题"), x.QsnKind, QsnKindName = x.QsnKind == "3" ? "判断" : (x.QsnCategory == "2" ? "多选" : "单选"), x.QsnImportant, @@ -439,8 +441,8 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord - where (x.DeleteTag == "False" || x.DeleteTag == null) + private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord + where (x.DeleteTag == "False" || x.DeleteTag == null) select x; /// @@ -508,5 +510,49 @@ namespace BLL }; } #endregion + + /// + /// 根据主键获取博晟人员信息 + /// + /// + /// + public static Model.Bo_Sheng_Person GetBoPersonById(string id) + { + return Funs.DB.Bo_Sheng_Person.FirstOrDefault(e => e.ID == id); + } + + /// + /// 修改博晟人员信息 + /// + /// + /// + public static void UpdateBoPerson(Bo_Sheng_Person person) + { + Model.Bo_Sheng_Person newPerson = Funs.DB.Bo_Sheng_Person.FirstOrDefault(e => e.ID == person.ID); + if (newPerson != null) + { + newPerson.Name = person.Name; + newPerson.DepartName = person.DepartName; + newPerson.IdentifyID = person.IdentifyID; + newPerson.Sex = person.Sex; + newPerson.BirthDay = person.BirthDay; + newPerson.Station = person.Station; + newPerson.Address = person.Address; + newPerson.Police = person.Police; + newPerson.ValidPeriodStart = person.ValidPeriodStart; + newPerson.ValidPeriodEnd = person.ValidPeriodEnd; + newPerson.Telephone = person.Telephone; + newPerson.JobNumber = person.JobNumber; + newPerson.NewAddress = person.NewAddress; + newPerson.RegisterDate = person.RegisterDate; + newPerson.CategoryLevel = person.CategoryLevel; + newPerson.EntranceDate = person.EntranceDate; + newPerson.LeaveDate = person.LeaveDate; + newPerson.IsOut = person.IsOut; + newPerson.IsBlackList = person.IsBlackList; + newPerson.UploadTime = person.UploadTime; + Funs.DB.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 60ce8daa..8e468e98 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2637,6 +2637,13 @@ namespace BLL + #endregion + + #region 博晟培训考试 + /// + /// 人员信息 + /// + public const string BoPersonMenuId = "4E0030F6-EF5E-40A6-939F-C29BC4D7CEE1"; #endregion #endregion diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx index 3981bd7b..954102cd 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx +++ b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx @@ -18,7 +18,7 @@ runat="server" BoxFlex="1" DataKeyNames="ID" AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" DataIDField="ID" AllowSorting="true" SortField="Name" EnableTextSelection="True" - SortDirection="ASC" EnableColumnLines="true" OnSort="Grid1_Sort"> + SortDirection="ASC" EnableColumnLines="true" OnSort="Grid1_Sort" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"> @@ -109,7 +109,10 @@ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="上传时间" HeaderTextAlign="Center" TextAlign="Center"> - + + + + @@ -121,7 +124,28 @@ - + + + + + + diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs index 640b052b..1dc310c4 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs @@ -16,6 +16,7 @@ namespace FineUIPro.Web.BoSheng { if (!IsPostBack) { + GetButtonPower(); Funs.DropDownPageSize(this.ddlPageSize); //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); @@ -90,5 +91,61 @@ namespace FineUIPro.Web.BoSheng this.GridBind(); } #endregion + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.GridBind(); + } + + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + var person = BLL.BOSHENGService.GetBoPersonById(id); + if (person != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("BoPersonEdit.aspx?id={0}", id, "编辑 - "))); + } + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.BoPersonMenuId); + if (buttonList.Count > 0) + { + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs index bd0e1732..7741bcbe 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs @@ -137,5 +137,32 @@ namespace FineUIPro.Web.BoSheng { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; } } diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx new file mode 100644 index 00000000..1d35e155 --- /dev/null +++ b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx @@ -0,0 +1,96 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BoPersonEdit.aspx.cs" Inherits="FineUIPro.Web.BoSheng.BoPersonEdit" %> + + + + + + + 修改博晟人员信息 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs new file mode 100644 index 00000000..ada42750 --- /dev/null +++ b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs @@ -0,0 +1,127 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.BoSheng +{ + public partial class BoPersonEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + #endregion + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.Id = Request.Params["id"]; + if (!string.IsNullOrEmpty(this.Id)) + { + Model.Bo_Sheng_Person person = BLL.BOSHENGService.GetBoPersonById(this.Id); + if (person != null) + { + this.txtName.Text = person.Name; + this.txtDepartName.Text = person.DepartName; + this.txtIdentifyID.Text = person.IdentifyID; + this.rblSex.SelectedValue = person.Sex; + this.txtBirthDay.Text = person.BirthDay.HasValue ? string.Format("{0:yyyy-MM-dd}", person.BirthDay) : ""; + this.txtStation.Text = person.Station; + this.txtAddress.Text = person.Address; + this.txtPolice.Text = person.Police; + this.txtValidPeriodStart.Text = string.Format("{0:yyyy-MM-dd}", person.ValidPeriodStart); + this.txtValidPeriodEnd.Text = string.Format("{0:yyyy-MM-dd}", person.ValidPeriodEnd); + this.txtTelephone.Text = person.Telephone; + this.txtJobNumber.Text = person.JobNumber; + this.txtNewAddress.Text = person.NewAddress; + this.txtRegisterDate.Text = person.RegisterDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", person.RegisterDate) : ""; + this.txtCategoryLevel.Text = person.CategoryLevel; + this.txtEntranceDate.Text = person.EntranceDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", person.EntranceDate) : ""; + this.txtLeaveDate.Text = person.LeaveDate.HasValue ? string.Format("{0:yyyy-MM-dd hh:mm:ss}", person.LeaveDate) : ""; + if (person.IsOut == "1") + { + this.cbIsOutName.Checked = true; + } + if (person.IsBlackList == "1") + { + this.cbIsBlackListName.Checked = true; + } + this.txtUploadTime.Text = person.UploadTime.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", person.UploadTime) : ""; + } + } + } + } + + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Model.Bo_Sheng_Person person = BLL.BOSHENGService.GetBoPersonById(this.Id); + if (person != null) + { + person.ID = this.Id; + person.Name = this.txtName.Text.Trim(); + person.DepartName = this.txtDepartName.Text.Trim(); + person.IdentifyID = this.txtIdentifyID.Text.Trim(); + person.Sex = this.rblSex.SelectedValue; + person.BirthDay = Funs.GetNewDateTime(this.txtBirthDay.Text.Trim()); + person.Station = this.txtStation.Text.Trim(); + person.Address = this.txtAddress.Text.Trim(); + person.Police = this.txtPolice.Text.Trim(); + person.ValidPeriodStart =this.txtValidPeriodStart.Text.Trim(); + person.ValidPeriodEnd = this.txtValidPeriodEnd.Text.Trim(); + person.Telephone = this.txtTelephone.Text.Trim(); + person.JobNumber = this.txtJobNumber.Text.Trim(); + person.NewAddress = this.txtNewAddress.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtRegisterDate.Text)) + { + person.RegisterDate = Convert.ToDateTime(this.txtRegisterDate.Text); + } + person.CategoryLevel = this.txtCategoryLevel.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtEntranceDate.Text)) + { + person.EntranceDate = Convert.ToDateTime(this.txtEntranceDate.Text); + } + if (!string.IsNullOrEmpty(this.txtLeaveDate.Text)) + { + person.LeaveDate = Convert.ToDateTime(this.txtLeaveDate.Text); + } + person.IsOut = this.cbIsOutName.Checked? "1" : "0"; + person.IsBlackList = this.cbIsBlackListName.Checked ? "1" : "0"; + if (!string.IsNullOrEmpty(this.txtUploadTime.Text)) + { + person.UploadTime = Convert.ToDateTime(this.txtUploadTime.Text); + } + BLL.BOSHENGService.UpdateBoPerson(person); + ShowNotify("修改成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs new file mode 100644 index 00000000..3c90296c --- /dev/null +++ b/SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs @@ -0,0 +1,258 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.BoSheng { + + + public partial class BoPersonEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// txtDepartName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDepartName; + + /// + /// txtIdentifyID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIdentifyID; + + /// + /// rblSex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblSex; + + /// + /// txtBirthDay 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtBirthDay; + + /// + /// txtStation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtStation; + + /// + /// txtAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAddress; + + /// + /// txtPolice 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPolice; + + /// + /// txtValidPeriodStart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtValidPeriodStart; + + /// + /// txtValidPeriodEnd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtValidPeriodEnd; + + /// + /// txtTelephone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTelephone; + + /// + /// txtJobNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtJobNumber; + + /// + /// txtNewAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtNewAddress; + + /// + /// txtRegisterDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRegisterDate; + + /// + /// txtCategoryLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCategoryLevel; + + /// + /// txtEntranceDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEntranceDate; + + /// + /// cbIsOutName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsOutName; + + /// + /// txtLeaveDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtLeaveDate; + + /// + /// cbIsBlackListName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsBlackListName; + + /// + /// txtUploadTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtUploadTime; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx index dadefa25..280f9fd3 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx +++ b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx @@ -30,6 +30,8 @@ + +
diff --git a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs index ef141882..e8a3cd9b 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs @@ -90,5 +90,17 @@ namespace FineUIPro.Web.BoSheng this.GridBind(); } #endregion + + #region 同步培训记录 + /// + /// 同步培训记录 + /// + /// + /// + protected void btnRefresh_Click(object sender, EventArgs e) + { + BOSHENGMonitorService.AddData(null, null); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs index adc89545..7bb4074a 100644 --- a/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.BoSheng { /// protected global::FineUIPro.Button btnOut; + /// + /// btnRefresh 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRefresh; + /// /// labNumber 控件。 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 1e2448d5..f691bf67 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -249,6 +249,7 @@ + @@ -6645,6 +6646,13 @@ BoExam.aspx + + BoPersonEdit.aspx + ASPXCodeBehind + + + BoPersonEdit.aspx + BoPersonTrainRecord.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index b52b49a8..b8cc84be 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx index db7589f0..bec5b9c3 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx @@ -154,9 +154,9 @@ - - + --%> /// /// - 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))); + //} /// /// 通知单上传附件资源 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs index fb00bd49..708499e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs @@ -237,15 +237,6 @@ namespace FineUIPro.Web.HSSE.Check { /// protected global::FineUIPro.Button btnPunishNoticeUrl; - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx index d70ef9e8..2ea4e605 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx @@ -166,9 +166,9 @@ - - + --%> /// /// - 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))); + //} /// /// 通知单上传附件资源 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs index 378c4a31..5b1f42f0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs @@ -309,15 +309,6 @@ namespace FineUIPro.Web.HSSE.Check { /// protected global::FineUIPro.Button btnPunishNoticeUrl; - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx index 3079f984..4ac3428f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx @@ -71,7 +71,7 @@ - + @@ -123,9 +123,9 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs index 7b7b2350..07c780d2 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs @@ -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 /// /// /// - 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))); + //} /// /// 通知单上传附件资源 diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs index e39743d1..193398b0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs @@ -192,15 +192,6 @@ namespace FineUIPro.Web.HSSE.Check { /// protected global::FineUIPro.Button btnPunishNoticeUrl; - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx index 1160a2e6..42acd00a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx @@ -37,17 +37,19 @@ - + <%----%> + - - - + --%> + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs index 14862eb8..44c5882f 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs @@ -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); + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs index 9b9a0857..d64ec59b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs @@ -76,13 +76,13 @@ namespace FineUIPro.Web.HSSE.License { protected global::FineUIPro.DropDownList drpTeamGroupId; /// - /// drpTechnicalMan 控件。 + /// txtTechnicalMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpTechnicalMan; + protected global::FineUIPro.TextBox txtTechnicalMan; /// /// lbHid 控件。 @@ -94,13 +94,13 @@ namespace FineUIPro.Web.HSSE.License { protected global::FineUIPro.Label lbHid; /// - /// drpPartTechnicalMans 控件。 + /// txtPartTechnicalMans 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpPartTechnicalMans; + protected global::FineUIPro.TextBox txtPartTechnicalMans; /// /// txtPartTechnicalManNames 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx index ae61c5fb..ba4b146c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx @@ -58,12 +58,12 @@ - - + --%> protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx index 39b3e05f..d6dc52f8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx @@ -59,12 +59,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs index befb9db9..d7160ba1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs @@ -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))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs index 477ee12b..bd7d485e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs @@ -129,24 +129,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx index f76c2896..b6572644 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx @@ -75,12 +75,12 @@ - - + --%> protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx index 4aa02312..6a21b7dd 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx @@ -73,12 +73,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs index 4d92941c..ec1634db 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs @@ -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))); + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs index a176fca1..4151ed0e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx index cab19f70..bf8b8b0f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx @@ -73,12 +73,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs index a3a70c97..08ee2fd1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs @@ -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))); + //} /// /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs index a4c3f748..ca05a371 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx index 92a6e322..0fe85a2e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx @@ -71,12 +71,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs index 1f53012c..77ae5eb6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs @@ -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))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs index efba2588..57e0bc7c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx index 663f3272..25601351 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx @@ -63,12 +63,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs index 0bf72b55..29bad072 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs @@ -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))); + //} /// /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs index 867b6d31..114b7a60 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs @@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx index 2c616e17..248f20dc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx @@ -61,12 +61,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs index 81a1f9e6..35be83b8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs @@ -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))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs index f5a28569..b77b338b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs @@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx index 1b03c7dc..c83b35d6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx @@ -73,12 +73,12 @@ - - + --%> /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs index 4aeea242..741598c6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx index 3481d664..6e38895d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx @@ -72,12 +72,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs index fb09655e..743f4027 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs @@ -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))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs index 0e6281ac..26ce6028 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs @@ -165,24 +165,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx index a28c9e2b..05dac76d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx @@ -71,12 +71,12 @@ - - + --%> /// 计算参会人数 diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs index 85783798..0ba623dd 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs @@ -156,24 +156,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx index cda38078..6744a8f8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx @@ -70,12 +70,12 @@ - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs index 00097028..271eb1db 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs @@ -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))); + // } + //} } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs index 73a7105e..3b3abfe9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs @@ -156,24 +156,6 @@ namespace FineUIPro.Web.HSSE.Meeting { /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// btnAttachUrl1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl1; - - /// - /// btnAttachUrl2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl2; - /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs index 4a5bac14..464c3574 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs @@ -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())) { diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index eafda425..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index 1544f676..c2b8a0b5 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -22,7 +22,6 @@ - @@ -66,9 +65,7 @@ - - @@ -77,9 +74,7 @@ - - @@ -119,7 +114,6 @@ - @@ -163,7 +157,6 @@ - @@ -174,12 +167,4 @@ - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index a9d07855..2854ffd9 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -6,7 +6,4 @@ - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index e7b8b8fa..b1a26ee1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - - + + + + @@ -71,9 +71,7 @@ - - diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index d3859428..91d9fd84 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,21 +1,3 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 69859890..ed44c8fe 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,8 +83,4 @@ - - - - \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true