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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
汪青 2024-05-23 16:02:14 +08:00
parent 9b5124c4e2 e79d7d1bf1
commit d1a6bb49da
71 changed files with 2323 additions and 1684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataBase/版本日志/SGGLDB_WH_2024-05-22-wq.sql
View File

@ -26,6 +26,6 @@ CREATE TABLE dbo.Division_SubProjects(
CONSTRAINT [PK_Division_SubProjects] PRIMARY KEY CLUSTERED
(
[DivisionId] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO

31
DataBase/版本日志/SGGLDB_WH_2024-05-23-bwj.sql Normal file
View File

@ -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

68
SGGL/BLL/BoSheng/BOSHENGService.cs
View File

@ -1,4 +1,5 @@
using FineUIPro;
using Model;
using System;
using System.Collections;
using System.Linq;
@ -22,7 +23,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Bo_Sheng_Unit> getUnits = from x in db.Bo_Sheng_Unit
private static IQueryable<Model.Bo_Sheng_Unit> 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
/// <param name="PageIndex">页码</param>
/// <param name="PageSize">每页数量</param>
/// <returns></returns>
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<Model.Bo_Sheng_TrainPerson> 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
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Bo_Sheng_Exam> getExams = from x in db.Bo_Sheng_Exam
where (x.DeleteTag == "False" || x.DeleteTag == null)
private static IQueryable<Model.Bo_Sheng_Exam> getExams = from x in db.Bo_Sheng_Exam
where (x.DeleteTag == "False" || x.DeleteTag == null)
select x;
/// <summary>
@ -379,7 +381,7 @@ namespace BLL
/// <param name="PageIndex">页码</param>
/// <param name="PageSize">每页数量</param>
/// <returns></returns>
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<Model.Bo_Sheng_Exam> 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
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Bo_Sheng_PersonTrainRecord> getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord
where (x.DeleteTag == "False" || x.DeleteTag == null)
private static IQueryable<Model.Bo_Sheng_PersonTrainRecord> getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord
where (x.DeleteTag == "False" || x.DeleteTag == null)
select x;
/// <summary>
@ -508,5 +510,49 @@ namespace BLL
};
}
#endregion
/// <summary>
/// 根据主键获取博晟人员信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public static Model.Bo_Sheng_Person GetBoPersonById(string id)
{
return Funs.DB.Bo_Sheng_Person.FirstOrDefault(e => e.ID == id);
}
/// <summary>
/// 修改博晟人员信息
/// </summary>
/// <param name="person"></param>
/// <returns></returns>
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();
}
}
}
}

7
SGGL/BLL/Common/Const.cs
View File

@ -2637,6 +2637,13 @@ namespace BLL
#endregion
#region 博晟培训考试
/// <summary>
/// 人员信息
/// </summary>
public const string BoPersonMenuId = "4E0030F6-EF5E-40A6-939F-C29BC4D7CEE1";
#endregion
#endregion

30
SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx
View File

@ -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">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@ -109,7 +109,10 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="上传时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
@ -121,7 +124,28 @@
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</f:Panel>
<f:Window ID="Window1" Title="人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1024px" Height="620px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>

57
SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.cs
View File

@ -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();
}
/// <summary>
/// 编辑数据方法
/// </summary>
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 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
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
}
}

27
SGGL/FineUIPro.Web/BoSheng/BoPerson.aspx.designer.cs generated
View File

@ -137,5 +137,32 @@ namespace FineUIPro.Web.BoSheng {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
}
}

96
SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx Normal file
View File

@ -0,0 +1,96 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BoPersonEdit.aspx.cs" Inherits="FineUIPro.Web.BoSheng.BoPersonEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>修改博晟人员信息</title>
</head>
<body>
<form id="form1" runat="server"><f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="博晟人员信息"
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtName" runat="server" Label="姓名" LabelAlign="Right" Required="true" ShowRedStar="true" Readonly="true"></f:TextBox>
<f:TextBox ID="txtDepartName" runat="server" Label="所在单位" LabelAlign="Right" Required="true" ShowRedStar="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtIdentifyID" runat="server" Label="身份证号码" LabelAlign="Right" Required="true" ShowRedStar="true"></f:TextBox>
<f:RadioButtonList ID="rblSex" runat="server" Label="性别" LabelAlign="Right">
<f:RadioItem Value="1" Text="男" Selected="true"/>
<f:RadioItem Value="2" Text="女" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtBirthDay" runat="server" Label="出生年月" LabelAlign="Right" ></f:DatePicker>
<f:TextBox ID="txtStation" runat="server" Label="岗位" LabelAlign="Right"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAddress" runat="server" Label="地址" LabelAlign="Right"></f:TextBox>
<f:TextBox ID="txtPolice" runat="server" Label="发证机关" LabelAlign="Right"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtValidPeriodStart" runat="server" Label="有效期" LabelAlign="Right" ></f:DatePicker>
<f:DatePicker ID="txtValidPeriodEnd" runat="server" Label="止" LabelAlign="Right" ></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTelephone" runat="server" Label="电话" LabelAlign="Right"></f:TextBox>
<f:TextBox ID="txtJobNumber" runat="server" Label="工号" LabelAlign="Right"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtNewAddress" runat="server" Label="现地址" LabelAlign="Right"></f:TextBox>
<f:DatePicker ID="txtRegisterDate" runat="server" Label="登记时间" LabelAlign="Right" ShowTime="true" DateFormatString="yyyy-MM-dd HH:mm:ss"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCategoryLevel" runat="server" Label="专业等级" LabelAlign="Right"></f:TextBox>
<f:DatePicker ID="txtEntranceDate" runat="server" Label="入场时间" LabelAlign="Right" ShowTime="true" DateFormatString="yyyy-MM-dd HH:mm:ss"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="cbIsOutName" runat="server" Label="是否离场"></f:CheckBox>
<f:DatePicker ID="txtLeaveDate" runat="server" Label="出场时间" LabelAlign="Right" ShowTime="true" DateFormatString="yyyy-MM-dd HH:mm:ss"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="cbIsBlackListName" runat="server" Label="黑名单"></f:CheckBox>
<f:DatePicker ID="txtUploadTime" runat="server" Label="上传时间" LabelAlign="Right" ShowTime="true" DateFormatString="yyyy-MM-dd HH:mm:ss"></f:DatePicker>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>

127
SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.cs Normal file
View File

@ -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 定义项
/// <summary>
/// 主键
/// </summary>
private string Id
{
get
{
return (string)ViewState["Id"];
}
set
{
ViewState["Id"] = value;
}
}
#endregion
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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) : "";
}
}
}
}
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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());
}
}
}
}

258
SGGL/FineUIPro.Web/BoSheng/BoPersonEdit.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,258 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BoSheng {
public partial class BoPersonEdit {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtName;
/// <summary>
/// txtDepartName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDepartName;
/// <summary>
/// txtIdentifyID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIdentifyID;
/// <summary>
/// rblSex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblSex;
/// <summary>
/// txtBirthDay 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtBirthDay;
/// <summary>
/// txtStation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtStation;
/// <summary>
/// txtAddress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAddress;
/// <summary>
/// txtPolice 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPolice;
/// <summary>
/// txtValidPeriodStart 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtValidPeriodStart;
/// <summary>
/// txtValidPeriodEnd 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtValidPeriodEnd;
/// <summary>
/// txtTelephone 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTelephone;
/// <summary>
/// txtJobNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobNumber;
/// <summary>
/// txtNewAddress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtNewAddress;
/// <summary>
/// txtRegisterDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtRegisterDate;
/// <summary>
/// txtCategoryLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCategoryLevel;
/// <summary>
/// txtEntranceDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEntranceDate;
/// <summary>
/// cbIsOutName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsOutName;
/// <summary>
/// txtLeaveDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLeaveDate;
/// <summary>
/// cbIsBlackListName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsBlackListName;
/// <summary>
/// txtUploadTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtUploadTime;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}

2
SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx
View File

@ -30,6 +30,8 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnRefresh" runat="server" Icon="ArrowRefresh" ToolTip="同步" OnClick="btnRefresh_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>

12
SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.cs
View File

@ -90,5 +90,17 @@ namespace FineUIPro.Web.BoSheng
this.GridBind();
}
#endregion
#region 同步培训记录
/// <summary>
/// 同步培训记录
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnRefresh_Click(object sender, EventArgs e)
{
BOSHENGMonitorService.AddData(null, null);
}
#endregion
}
}

9
SGGL/FineUIPro.Web/BoSheng/BoTrain.aspx.designer.cs generated
View File

@ -93,6 +93,15 @@ namespace FineUIPro.Web.BoSheng {
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnRefresh 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnRefresh;
/// <summary>
/// labNumber 控件。
/// </summary>

23
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -249,6 +249,7 @@
<Content Include="BaseInfo\WorkPost.aspx" />
<Content Include="BaseInfo\WorkStage.aspx" />
<Content Include="BoSheng\BoExam.aspx" />
<Content Include="BoSheng\BoPersonEdit.aspx" />
<Content Include="BoSheng\BoPersonTrainRecord.aspx" />
<Content Include="BoSheng\BoTrainPerson.aspx" />
<Content Include="BoSheng\BoTrain.aspx" />
@ -581,6 +582,8 @@
<Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
<Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
<Content Include="CQMS\WBS\ControlPoint.aspx" />
<Content Include="CQMS\WBS\Control\DivisionSubProjects.aspx" />
<Content Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx" />
<Content Include="CQMS\WBS\Control\PointCropping.aspx" />
<Content Include="CQMS\WBS\Control\PointCroppingEdit.aspx" />
<Content Include="CQMS\WBS\EditBreakdown.aspx" />
@ -6645,6 +6648,13 @@
<Compile Include="BoSheng\BoExam.aspx.designer.cs">
<DependentUpon>BoExam.aspx</DependentUpon>
</Compile>
<Compile Include="BoSheng\BoPersonEdit.aspx.cs">
<DependentUpon>BoPersonEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BoSheng\BoPersonEdit.aspx.designer.cs">
<DependentUpon>BoPersonEdit.aspx</DependentUpon>
</Compile>
<Compile Include="BoSheng\BoPersonTrainRecord.aspx.cs">
<DependentUpon>BoPersonTrainRecord.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -8472,6 +8482,19 @@
<Compile Include="CQMS\WBS\ControlPoint.aspx.designer.cs">
<DependentUpon>ControlPoint.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.cs">
<DependentUpon>DivisionSubProjects.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.designer.cs">
<DependentUpon>DivisionSubProjects.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx.cs">
<DependentUpon>DivisionSubProjectsEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx.designer.cs">
<DependentUpon>DivisionSubProjectsEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\WBS\Control\PointCropping.aspx.cs">
<DependentUpon>PointCropping.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

4
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx
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"

16
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs
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>
/// 通知单上传附件资源

9
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx
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"

8
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs
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>
/// 通知单上传附件资源

9
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.designer.cs generated
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>

6
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx
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">

18
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.cs
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>
/// 通知单上传附件资源

9
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeView.aspx.designer.cs generated
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>

10
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx
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>

62
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs
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);
//}
}
}

8
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs generated
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 控件。

4
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx
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"

32
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx.cs
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)));
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingEdit.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx
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">

28
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.cs
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)));
// }
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/AttendMeetingView.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx
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"

32
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx.cs
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)
{

18
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx
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">

16
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs
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)));
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx
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>

32
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.cs
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>
/// 计算参会人数

18
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingEdit.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx
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">

28
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.cs
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)));
// }
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/MonthMeetingView.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx
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>

32
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.cs
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>
/// 计算参会人数

18
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingEdit.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx
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="关闭">

28
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.cs
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)));
// }
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx
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"

32
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.cs
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>
/// 计算参会人数

18
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingEdit.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx
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">

28
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.cs
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)));
// }
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/SpecialMeetingView.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx
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"

32
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.cs
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>
/// 计算参会人数

18
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingEdit.aspx.designer.cs generated
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>

4
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx
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">

28
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.cs
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)));
// }
//}
}
}

18
SGGL/FineUIPro.Web/HSSE/Meeting/WeekMeetingView.aspx.designer.cs generated
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>

35
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
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()))
{

15
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -22,7 +22,6 @@
</TreeNode>
<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
<TreeNode id="5B3D3F7B-9B50-4927-B131-11D13D4D1C19" Text="危大工程施工方案清单" NavigateUrl="HSSE/Solution/LargerHazardList.aspx"></TreeNode>
<TreeNode id="27DE7248-C4FF-4288-BBAC-11CB8741AD67" Text="专家论证清单" NavigateUrl="HSSE/Solution/ExpertArgumentList.aspx"></TreeNode>
<TreeNode id="49485F7E-8E71-4EED-87B4-BF6CC180C69C" Text="HSE技术交底" NavigateUrl="HSSE/License/HSETechnical.aspx"></TreeNode>
</TreeNode>
<TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员信息" NavigateUrl=""><TreeNode id="AD6FC259-CF40-41C7-BA3F-15AC50C1DD20" Text="人员信息档案" NavigateUrl="HSSE/SitePerson/PersonList.aspx"></TreeNode>
@ -66,9 +65,7 @@
<TreeNode id="94C36333-C22A-499F-B9DB-53EEF77922AE" Text="项目现场重大HSE因素控制措施一览表" NavigateUrl="HSSE/Hazard/MajorHazardList.aspx"></TreeNode>
<TreeNode id="E22F555A-D41C-4F5F-9734-39B578957732" Text="其他危险源辨识文件" NavigateUrl="HSSE/Hazard/OtherHazard.aspx"></TreeNode>
</TreeNode>
<TreeNode id="F910062E-98B0-486F-A8BD-D5B0035F808F" Text="监理整改通知单" NavigateUrl="HSSE/Check/SupervisionNotice.aspx"></TreeNode>
<TreeNode id="29F27641-06ED-435A-9F9B-FCE6366801BE" Text="企业监督检查整改" NavigateUrl="HSSE/Hazard/ProjectSuperviseCheckRectify.aspx"></TreeNode>
<TreeNode id="F057C207-4549-48AE-B838-A1920E5709D8" Text="联系单" NavigateUrl="HSSE/Check/ContactList.aspx"></TreeNode>
<TreeNode id="C3B6B222-44DC-46F3-B783-B1FC0F743C48" Text="隐患整改单" NavigateUrl="HSSE/Check/RectifyNotices.aspx"></TreeNode>
<TreeNode id="C81DB7ED-165E-4C69-86B0-A3AAE37059FE" Text="工程暂停令" NavigateUrl="HSSE/Check/PauseNotice.aspx"></TreeNode>
<TreeNode id="80F786CB-E8CA-44AD-A08C-8E4D12BFDCA1" Text="总部检查" NavigateUrl="HSSE/Check/OfficeCheck.aspx"></TreeNode>
@ -77,9 +74,7 @@
</TreeNode>
<TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="HSE会议" NavigateUrl=""><TreeNode id="DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF" Text="安全领导小组会议" NavigateUrl="HSSE/Meeting/SafetyLeaderGroupMeeting.aspx"></TreeNode>
<TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="HSE周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>
<TreeNode id="D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684" Text="HSE月例会" NavigateUrl="HSSE/Meeting/MonthMeeting.aspx"></TreeNode>
<TreeNode id="BB6CEC48-283B-46AD-BEDD-F964D261698F" Text="HSE专题会议" NavigateUrl="HSSE/Meeting/SpecialMeeting.aspx"></TreeNode>
<TreeNode id="B2DA78EF-EECA-4AF4-9FAC-ECCFF1D6E459" Text="其他会议记录" NavigateUrl="HSSE/Meeting/AttendMeeting.aspx"></TreeNode>
<TreeNode id="F8ADCDBC-AAAD-4884-9935-2B63562E4779" Text="班前会" NavigateUrl="HSSE/Meeting/ClassMeeting.aspx"></TreeNode>
</TreeNode>
<TreeNode id="473A87D2-1365-4A68-BD38-06F312F81BC2" Text="作业许可" NavigateUrl=""><TreeNode id="2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B" Text="动火作业票" NavigateUrl="HSSE/License/FireWork.aspx"></TreeNode>
@ -119,7 +114,6 @@
<TreeNode id="C13F1CE7-DAEF-4604-A13F-192621D28DF5" Text="奖励统计" NavigateUrl="HSSE/Check/IncentiveNoticeStatistics.aspx"></TreeNode>
<TreeNode id="755F1C1D-2178-47D8-9F82-A501B53A2436" Text="处罚通知单" NavigateUrl="HSSE/Check/PunishNotice.aspx"></TreeNode>
<TreeNode id="CCD0E55B-300A-454B-8559-155ADAD386AE" Text="处罚统计" NavigateUrl="HSSE/Check/PunishNoticeStatistics.aspx"></TreeNode>
<TreeNode id="06958288-96F4-4291-909A-FFC2FC76814D" Text="违规人员记录" NavigateUrl="HSSE/Check/ViolationPerson.aspx"></TreeNode>
<TreeNode id="9A034CAD-C7D5-4DE4-9FF5-828D35FFEE28" Text="获奖证书或奖杯" NavigateUrl="HSSE/Check/HSECertificate.aspx"></TreeNode>
</TreeNode>
<TreeNode id="B6FBD6B6-F9A0-49B1-87F9-160748162131" Text="应急信息" NavigateUrl=""><TreeNode id="ABD84F93-A84E-448C-8A67-AB0FE4E8D10C" Text="应急预案管理清单" NavigateUrl="HSSE/Emergency/EmergencyList.aspx"></TreeNode>
@ -163,7 +157,6 @@
</TreeNode>
<TreeNode id="E765DADB-B7BF-4F01-AFBC-F20E9D2F62D6" Text="环境保护" NavigateUrl=""><TreeNode id="342B5DEA-ECE1-46A4-BAA6-F0DB5276C769" Text="环境监测数据" NavigateUrl="HSSE/Environmental/EnvironmentalMonitoring.aspx"></TreeNode>
<TreeNode id="74F23370-56D8-426E-822D-5E367F620546" Text="突发环境事件" NavigateUrl="HSSE/Environmental/UnexpectedEnvironmental.aspx"></TreeNode>
<TreeNode id="3EF6E488-21D2-47BB-AA33-4FB0E9FED606" Text="环境事件应急预案" NavigateUrl="HSSE/Environmental/EnvironmentalEmergencyPlan.aspx"></TreeNode>
<TreeNode id="97DCAFD1-DDA5-48B4-8E2D-E82702BA899B" Text="环评报告" NavigateUrl="HSSE/Environmental/EIAReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D3576E49-DBC9-43EA-9822-EA5F4D96CA24" Text="绩效评价管理" NavigateUrl=""><TreeNode id="EED8DBEE-83F6-4B5B-8382-AF40EB66B0A9" Text="分包方绩效评价" NavigateUrl="HSSE/Perfomance/PerfomanceRecord.aspx"></TreeNode>
@ -174,12 +167,4 @@
</TreeNode>
<TreeNode id="14DD34F2-0682-48D6-A199-108297A9825E" Text="安全分析" NavigateUrl=""><TreeNode id="14C42C8E-8D3D-4D30-AA56-4F96828610AD" Text="危险因素分析" NavigateUrl="HSSE/InformationAnalysis/CheckAnalysis.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E1BBA25B-DAE5-4CFF-B72A-6C6044917D2B" Text="项目文档资料" NavigateUrl=""><TreeNode id="4EBDBF0A-53FC-4B86-BE6E-D6C16985A613" Text="定稿文件" NavigateUrl=""><TreeNode id="C5354813-7B1E-4155-8EE8-D349BF2F18F4" Text="业主管理文档" NavigateUrl="HSSE/FinalFileManage/OwnerFinalFile.aspx"></TreeNode>
<TreeNode id="719DA0D3-FA59-4A03-B6E0-6663A211956F" Text="监理管理文档" NavigateUrl="HSSE/FinalFileManage/FinalFileList.aspx"></TreeNode>
<TreeNode id="B1C694BB-EF35-49B6-AEE4-0C5CA6803208" Text="其他管理文档" NavigateUrl="HSSE/FinalFileManage/OtherDocumentList.aspx"></TreeNode>
<TreeNode id="24D6B764-7B91-46EB-9D80-A6073FC5720D" Text="已定稿文件" NavigateUrl="HSSE/FinalFileManage/HSEFinalFileList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="05C6C2AF-3B0B-4BF0-A8CE-1FC15DAC3C54" Text="项目文件夹" NavigateUrl="HSSE/InformationProject/ProjectFolder.aspx"></TreeNode>
<TreeNode id="C69B7409-BE1E-4754-AC90-57B56EEE198B" Text="文件柜A（检查类）" NavigateUrl="HSSE/InformationProject/FileCabinetA.aspx"></TreeNode>
</TreeNode>
</Tree>

3
SGGL/FineUIPro.Web/common/Menu_Personal.xml
View File

@ -6,7 +6,4 @@
<TreeNode id="C6EF06E5-9019-4583-8122-EA94FCC545C6" Text="员工总结" NavigateUrl=""></TreeNode>
<TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
<TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
</Tree>

10
SGGL/FineUIPro.Web/common/Menu_TestRun.xml
View File

@ -46,12 +46,12 @@
<TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
<TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
<TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
<TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
<TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@ -71,9 +71,7 @@
<TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
<TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
<TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>

18
SGGL/FineUIPro.Web/common/Menu_Transfer.xml
View File

@ -1,21 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
</TreeNode>
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计报表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交累积统计报表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
</TreeNode>
</Tree>

4
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -83,8 +83,4 @@
</TreeNode>
<TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
<TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
<TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
<TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
</TreeNode>
</Tree>

2394
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />