zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交集团数据穿透修改

This commit is contained in:
高飞 2023-06-19 09:04:34 +08:00
parent efed3c7f6f
commit 1e709abb1a
184 changed files with 10777 additions and 3631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

423
DataBase/版本日志/SGGLDB_CD_V2023-06-17-001.sql Normal file
View File

@ -0,0 +1,423 @@
update InApproveManager_EquipmentInItem set IsUsed=1
update InApproveManager_GeneralEquipmentInItem set IsUsed=1
GO
ALTER VIEW [dbo].[View_License_LicenseManager]
AS
/*现场安全许可证*/
SELECT LicenseManager.LicenseManagerId,
LicenseManager.ProjectId,
LicenseManager.LicenseTypeId,
LicenseManager.LicenseManagerCode,
LicenseManager.LicenseManageName,
LicenseManager.UnitId,
LicenseManager.LicenseManageContents,
LicenseManager.CompileMan,
LicenseManager.CompileDate,
LicenseManager.States,
Project.ProjectCode,
Project.ProjectName,
LicenseType.LicenseTypeName,
Unit.UnitName,
UnitType.UnitTypeId,
UnitType.UnitTypeName,
Users.UserName,
LicenseManager.WorkAreaId,
--WorkArea.WorkAreaName,
LicenseManager.StartDate,
LicenseManager.EndDate,
LicenseManager.ApplicantMan,
LicenseManager.IsHighRisk,
LicenseManager.WorkStates,
case LicenseManager.WorkStates when '1' then '待开工'
when '2' then '作业中'
when '3' then '已关闭'
when '-1' then '已取消'
else '' end as WorkStatesStr,
WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork
where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0
ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',')
FOR XML PATH('')), 1, 1,'')
FROM dbo.License_LicenseManager AS LicenseManager
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId
LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId
LEFT JOIN dbo.Sys_User AS Users ON Users.UserId = LicenseManager.CompileMan
LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId
LEFT JOIN dbo.Base_UnitType as UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId
GO
update License_LicenseManager set WorkStates='3'
GO
update HSSE_Hazard_HazardRegister set Risk_Level='一般'
GO
/**********隐患巡检（手机端）视图*************/
ALTER VIEW [dbo].[View_Hazard_HazardRegister]
AS
SELECT Registration.HazardRegisterId,
Registration.HazardCode,
Registration.RegisterDate,
Registration.RegisterDef,
Registration.Rectification,
Registration.Place,
Registration.ResponsibleUnit,
Registration.Observer,
Registration.Risk_Level,
Registration.RectifiedDate,
Registration.ProjectId,
Project.UnitId AS PUnitId,
ProjectUnit.UnitName AS PUnitName,
Registration.states,
Registration.IsEffective,
Registration.ResponsibleMan,
Registration.CheckManId,
Registration.CheckTime,
Registration.RectificationPeriod,
Registration.ImageUrl,
Registration.RectificationImageUrl,
Registration.RectificationTime,
Registration.ConfirmMan,
Registration.ConfirmDate,
Registration.HandleIdea,
Registration.CutPayment,
Registration.ProblemTypes,
Registration.CheckSpecialId,
Registration.CheckItemDetailId,
Registration.SupCheckItemSetId,
Registration.CheckItemSetId,
Registration.SafeSupervisionId,
Registration.SafeSupervisionIsOK,
Project.ProjectName,
Registration.CheckCycle,
ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
Unit.UnitName as ResponsibilityUnitName,
User1.UserName AS ResponsibilityManName,
ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
User2.UserName AS CheckManName,
ISNULL(User2.Telephone,'') AS CheckManTel,
User2.UnitId AS SendUnitId,
User3.UserName AS ConfirmManName,
ISNULL(User3.Telephone,'') AS ConfirmManTel,
User4.UserName AS ResponsibilityManName2,
ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel,
(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '待整改'
WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN '合格'
WHEN Registration.states='2' THEN '已整改-待复查验收'
WHEN Registration.states='3' THEN '已闭环'
ELSE '已作废' END ) AS StatesStr,
RegisterTypes.RegisterTypesId,
RegisterTypes.RegisterTypesName,
Registration.DIC_ID,
Registration.CCManIds,
CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
FOR XML PATH('')), 1, 1,''),
Registration.Requirements
FROM dbo.HSSE_Hazard_HazardRegister AS Registration
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
LEFT JOIN dbo.Base_Unit AS ProjectUnit ON Project.UnitId = ProjectUnit.UnitId
LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan
LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
GO
delete from Sys_Menu where MenuId='9A3212F8-2392-4F21-A8C7-FF5EE3B191F1'
delete from Sys_ButtonToMenu where MenuId='762F0BF9-471B-4115-B35E-03A26C573877'
delete from Sys_Menu where MenuId='762F0BF9-471B-4115-B35E-03A26C573877'
delete from Sys_ButtonToMenu where MenuId='EDC50857-7762-4498-83C6-5BDE85036BAB'
delete from Sys_Menu where MenuId='EDC50857-7762-4498-83C6-5BDE85036BAB'
delete from Sys_ButtonToMenu where MenuId='74A6B343-5837-416B-AE9C-D2BBCA08E41F'
delete from Sys_Menu where MenuId='74A6B343-5837-416B-AE9C-D2BBCA08E41F'
delete from Sys_ButtonToMenu where MenuId='F6A6D53A-150E-43DB-A3C4-6FA18E9401E9'
delete from Sys_Menu where MenuId='F6A6D53A-150E-43DB-A3C4-6FA18E9401E9'
delete from Sys_ButtonToMenu where MenuId='D256E5C8-DC76-4F4D-BABE-A253418823F4'
delete from Sys_Menu where MenuId='D256E5C8-DC76-4F4D-BABE-A253418823F4'
delete from Sys_ButtonToMenu where MenuId='94C36333-C22A-499F-B9DB-53EEF77922AE'
delete from Sys_Menu where MenuId='94C36333-C22A-499F-B9DB-53EEF77922AE'
delete from Sys_ButtonToMenu where MenuId='E22F555A-D41C-4F5F-9734-39B578957732'
delete from Sys_Menu where MenuId='E22F555A-D41C-4F5F-9734-39B578957732'
GO
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('9A3212F8-2392-4F21-A8C7-FF5EE3B191F1' ,'风险分级动态管控',null,'',50,'467A0CB9-737D-4451-965E-869EBC3A4BD6', 'Menu_HSSE',0,0,1)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('762F0BF9-471B-4115-B35E-03A26C573877' ,'环境因素识别与评价',null,'HSSE/Hazard/EnvironmentalRiskList.aspx',10,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('25E47331-0E20-47B0-AAC3-926C0444D9C9', '762F0BF9-471B-4115-B35E-03A26C573877' ,'增加' ,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('25705A8C-A734-4D56-8C30-4D08578B37F3', '762F0BF9-471B-4115-B35E-03A26C573877' ,'修改' ,2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('8485EACC-BEE1-4BED-95CE-A10AA53372D1', '762F0BF9-471B-4115-B35E-03A26C573877' ,'删除' ,3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('4DEF4A6D-77BD-4192-896D-6AB88BFA8F91', '762F0BF9-471B-4115-B35E-03A26C573877' ,'保存' ,4)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('EDC50857-7762-4498-83C6-5BDE85036BAB' ,'风险评价',null,'HSSE/Hazard/HazardList.aspx',20,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('C90FA764-F303-43F6-AC24-2F9E9351C637', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'增加' ,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('16D438F4-72C7-4765-84DE-4C34867F7760', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'修改' ,2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('51ED8EA2-133F-4277-90C5-6C1F6EB50F8B', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'删除' ,3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('0BF51430-3A6D-483B-9516-89711266E2F5', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'保存' ,4)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('74A6B343-5837-416B-AE9C-D2BBCA08E41F' ,'风险信息库',null,'HSSE/Hazard/HazardInfo.aspx',25,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('D4A583C2-5505-4FBD-BE1C-1A168FA0F352', '74A6B343-5837-416B-AE9C-D2BBCA08E41F' ,'保存' ,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('693767D0-37E7-4FA1-8C21-C02C543AF811', '74A6B343-5837-416B-AE9C-D2BBCA08E41F' ,'审核' ,2)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('F6A6D53A-150E-43DB-A3C4-6FA18E9401E9' ,'风险分级管控',null,'HSSE/Hazard/RiskControl.aspx',30,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('7608EEE7-4102-449C-8F61-272E3952C8A8', 'F6A6D53A-150E-43DB-A3C4-6FA18E9401E9' ,'保存' ,1)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('D256E5C8-DC76-4F4D-BABE-A253418823F4' ,'风险巡检记录',null,'HSSE/Hazard/RoutingInspection.aspx',32,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('1D00171C-17EB-46EB-8892-86FCC495CF9B', 'D256E5C8-DC76-4F4D-BABE-A253418823F4' ,'删除' ,1)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('94C36333-C22A-499F-B9DB-53EEF77922AE' ,'项目现场重大HSE因素控制措施一览表',null,'HSSE/Hazard/MajorHazardList.aspx',40,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('E22F555A-D41C-4F5F-9734-39B578957732' ,'其他危险源辨识文件',null,'HSSE/Hazard/OtherHazard.aspx',50,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('EACFD7D1-93F9-4BD3-AB9B-E4BD4FA0147C', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'增加' ,1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('296031BC-B143-48F3-B903-B7697ED6B704', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'修改' ,2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B21B1B8A-E2F5-4A68-AC0A-9666B051BBE2', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'删除' ,3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('AB49F853-52D5-4CFC-9CE0-BC3504C7D90A', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'保存' ,4)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('A83A0227-09D1-4D93-940C-E9BC6066EE6C', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'提交' ,5)
GO
drop table [dbo].[Hazard_HazardSelectedItem]
GO
CREATE TABLE [dbo].[Hazard_HazardSelectedItem](
[HazardSelectedItemId] [nvarchar](50) NOT NULL,
[HazardId] [nvarchar](50) NOT NULL,
[HazardListTypeId] [nvarchar](50) NULL,
[HazardListId] [nvarchar](50) NOT NULL,
[HazardItems] [nvarchar](100) NULL,
[DefectsType] [nvarchar](50) NULL,
[MayLeadAccidents] [nvarchar](100) NULL,
[HelperMethod] [nvarchar](50) NULL,
[HazardJudge_L] [numeric](6, 1) NULL,
[HazardJudge_E] [numeric](6, 1) NULL,
[HazardJudge_C] [numeric](6, 1) NULL,
[HazardJudge_D] [numeric](6, 1) NULL,
[HazardLevel] [nvarchar](50) NULL,
[ControlMeasures] [nvarchar](200) NULL,
[IsResponse] [bit] NULL,
[ResponseRecode] [nvarchar](100) NULL,
[PromptTime] [int] NULL,
[Remark] [nvarchar](100) NULL,
[WorkStage] [nvarchar](2000) NULL,
[ProjectId] [nvarchar](50) NULL,
[DutyPerson] [nvarchar](50) NULL,
[CheckStartDate] [datetime] NULL,
[IsStart] [bit] NULL,
[State] [char](1) NULL,
[PlanExistDate] [datetime] NULL,
[QRCodeAttachUrl] [nvarchar](200) NULL,
CONSTRAINT [PK_Hazard_HazardSelectedItem_1] PRIMARY KEY CLUSTERED
(
[HazardSelectedItemId] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
SET ANSI_PADDING OFF
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'危险源代码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'危险源类别编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardListTypeId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'所属清单' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardListId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'危险因素明细' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardItems'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'缺陷类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'DefectsType'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'可能导致的事故' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'MayLeadAccidents'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'辅助方法(分为:I,Ⅱ,Ⅲ,Ⅳ,Ⅴ)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HelperMethod'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'作业条件危险性评价(L)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_L'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'作业条件危险性评价(E)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_E'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'作业条件危险性评价(C)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_C'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'作业条件危险性评价(D)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_D'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'危险级别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardLevel'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'控制措施' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'ControlMeasures'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否响应' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'IsResponse'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'响应记录' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'ResponseRecode'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'提示时间（1-1周，2-2周，以此类推）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'PromptTime'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'Remark'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'危害辩识与危险评价结果表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem'
GO
CREATE TABLE [dbo].[Hazard_PatrolPlan](
[PatrolPlanId] [nvarchar](50) NOT NULL,
[HazardSelectedItemId] [nvarchar](50) NULL,
[HazardLevel] [nvarchar](50) NULL,
[DutyPerson] [nvarchar](50) NULL,
[Days] [int] NULL,
[CheckStartDate] [datetime] NULL,
[LimitCheckDate] [datetime] NULL,
[CheckDate] [datetime] NULL,
[State] [char](1) NULL,
CONSTRAINT [PK_Hazard_PatrolPlan] PRIMARY KEY CLUSTERED
(
[PatrolPlanId] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
SET ANSI_PADDING OFF
GO
ALTER TABLE [dbo].[Hazard_PatrolPlan] WITH CHECK ADD CONSTRAINT [FK_Hazard_PatrolPlan_Hazard_HazardSelectedItem] FOREIGN KEY([HazardSelectedItemId])
REFERENCES [dbo].[Hazard_HazardSelectedItem] ([HazardSelectedItemId])
GO
ALTER TABLE [dbo].[Hazard_PatrolPlan] CHECK CONSTRAINT [FK_Hazard_PatrolPlan_Hazard_HazardSelectedItem]
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'巡检计划表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_PatrolPlan'
GO
CREATE TABLE [dbo].[Hazard_RiskEvaluationRecord](
[LECItemRecordId] [nvarchar](50) NOT NULL,
[DataId] [nvarchar](50) NULL,
[DataType] [nvarchar](50) NULL,
[Evaluatorld] [nvarchar](50) NULL,
[EvaluatorDate] [date] NULL,
[L] [numeric](6, 1) NULL,
[E] [numeric](6, 1) NULL,
[C] [numeric](6, 1) NULL,
[D] [numeric](6, 1) NULL,
[RiskLevel] [nvarchar](50) NULL,
[ControlMeasures] [nvarchar](800) NULL,
[Remark] [nvarchar](500) NULL,
CONSTRAINT [PK_Hazard_RiskEvaluationRecord] PRIMARY KEY CLUSTERED
(
[LECItemRecordId] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
CREATE TABLE [dbo].[Hazard_RoutingInspection](
[RoutingInspectionId] [nvarchar](50) NOT NULL,
[HazardSelectedItemId] [nvarchar](50) NULL,
[PatrolManId] [nvarchar](50) NULL,
[PatrolTime] [datetime] NULL,
[PatrolResult] [int] NULL,
[OldRiskLevel] [nvarchar](50) NULL,
[PohotoUrl] [nvarchar](200) NULL,
[ControlMeasures] [nvarchar](200) NULL,
[DealReason] [nvarchar](200) NULL,
[RiskManId] [nvarchar](50) NULL,
[PatrolPlanId] [nvarchar](50) NULL,
CONSTRAINT [PK_Hazard_RoutingInspection] PRIMARY KEY CLUSTERED
(
[RoutingInspectionId] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'风险巡检记录表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_RoutingInspection'
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('E4B526CC-805E-4131-8E18-2FFA6871507E','风险等级','BaseInfo/RiskLevel.aspx',140,'8A2CEE72-2793-49C6-9E2E-E83B2676E2DD','Menu_SysSet',1,1,1)
GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('97A0EF27-78C7-4D6D-AE41-BCB28C3A0CA5','E4B526CC-805E-4131-8E18-2FFA6871507E','增加',1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('2ACA14F6-93FD-458E-830F-BEBDC364829D','E4B526CC-805E-4131-8E18-2FFA6871507E','修改',2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('2C201030-1DC1-4D0D-B97A-C85BBFAF7C22','E4B526CC-805E-4131-8E18-2FFA6871507E','删除',3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('B36F59BD-1471-45EE-BF56-525673103B4B','E4B526CC-805E-4131-8E18-2FFA6871507E','保存',4)
GO
INSERT INTO dbo.Base_RiskLevel
VALUES('01537cc5-e8d2-497c-ba53-1faca1faf495',2,'二级/一般风险',121,170,'显著危险，重点控制',7,'')
GO
INSERT INTO dbo.Base_RiskLevel
VALUES('6baaf2bb-ee7c-410c-9a32-13208626c467',3,'三级/较大风险',170,320,'高度危险，需立即整改',3,'')
GO
INSERT INTO dbo.Base_RiskLevel
VALUES('84e1d680-5bfe-48d2-a255-59f43aa3615a',1,'一级/低风险',NULL,120,'一般危险，需要控制',21,'')
GO
INSERT INTO dbo.Base_RiskLevel
VALUES('c9e6285c-2da3-4997-8dc9-fb6ab404346e',4,'四级/重大风险',321,NULL,'极其危险，不能作业',1,'')
GO
update Comprehensive_InspectionPerson set IsTrain=1
GO
update Comprehensive_DesignDetails set JoinPersonNum=6
GO
update Comprehensive_InspectionMachine set IsCheckOK=1
GO
alter table [dbo].[Accident_AccidentReport] add AccidentDegree char(1) null
GO
alter table [dbo].[Hazard_HazardSelectedItem] add Position nvarchar(500) null
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('aa55fad1-6c51-43f5-8c99-3c6aaae79118','机具报验','CQMS/Comprehensive/InspectionMachine.aspx',30,'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1)
GO
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('63b69c8f-93ac-494a-a02a-5417c99d067e','aa55fad1-6c51-43f5-8c99-3c6aaae79118','增加',1)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('1a8efd13-f072-4cc4-8dca-7229752c63ae','aa55fad1-6c51-43f5-8c99-3c6aaae79118','修改',2)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('de27884b-cccf-478d-8abd-045f19ef3e06','aa55fad1-6c51-43f5-8c99-3c6aaae79118','删除',3)
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
VALUES('148c8ae4-b43e-4883-9222-a896fed0e52e','aa55fad1-6c51-43f5-8c99-3c6aaae79118','保存',4)
GO

22
SGGL/BLL/BLL.csproj
View File

@ -55,8 +55,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -94,18 +94,24 @@
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.7.0.2\lib\netstandard2.0\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
@ -199,6 +205,7 @@
<Compile Include="BaseInfo\QualityQuestionTypeService.cs" />
<Compile Include="BaseInfo\QuestionTypeService.cs" />
<Compile Include="BaseInfo\RectificationMeasureService.cs" />
<Compile Include="BaseInfo\RiskLevelService.cs" />
<Compile Include="BaseInfo\RulesRegulationsTypeService.cs" />
<Compile Include="BaseInfo\SafetyMeasuresService.cs" />
<Compile Include="BaseInfo\SecretLevelService.cs" />
@ -481,6 +488,9 @@
<Compile Include="HSSE\Hazard\Hazard_HazardListService.cs" />
<Compile Include="HSSE\Hazard\Hazard_HazardSelectedItemService.cs" />
<Compile Include="HSSE\Hazard\Hazard_OtherHazardService.cs" />
<Compile Include="HSSE\Hazard\Hazard_PatrolPlanService.cs" />
<Compile Include="HSSE\Hazard\Hazard_RoutingInspectionService.cs" />
<Compile Include="HSSE\Hazard\RiskEvaluationRecordService.cs" />
<Compile Include="HSSE\HiddenInspection\HSSE_Hazard_HazardRegisterService.cs" />
<Compile Include="HSSE\HSSESystem\HSSEMainDutyService.cs" />
<Compile Include="HSSE\HSSESystem\ServerSafetyInstitutionService.cs" />

4
SGGL/BLL/BaseInfo/CertificateService.cs
View File

@ -34,6 +34,8 @@ namespace BLL
CertificateId = certificate.CertificateId,
CertificateCode = certificate.CertificateCode,
CertificateName = certificate.CertificateName,
CertificateType = certificate.CertificateType,
IsRegisterHSSE = certificate.IsRegisterHSSE,
Remark = certificate.Remark
};
db.Base_Certificate.InsertOnSubmit(newCertificate);
@ -52,6 +54,8 @@ namespace BLL
{
newCertificate.CertificateCode = certificate.CertificateCode;
newCertificate.CertificateName = certificate.CertificateName;
newCertificate.CertificateType = certificate.CertificateType;
newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE;
newCertificate.Remark = certificate.Remark;
db.SubmitChanges();
}

122
SGGL/BLL/BaseInfo/RiskLevelService.cs Normal file
View File

@ -0,0 +1,122 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 许可证类型
/// </summary>
public static class RiskLevelService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取许可证类型
/// </summary>
/// <param name="licenseTypeId"></param>
/// <returns></returns>
public static Model.Base_RiskLevel GetRiskLevel(string riskLevelId)
{
return Funs.DB.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevelId);
}
/// <summary>
/// 添加许可证类型
/// </summary>
/// <param name="licenseType"></param>
public static void AddRiskLevel(Model.Base_RiskLevel reskLevel)
{
Model.SGGLDB db = Funs.DB;
Model.Base_RiskLevel newreskLevel = new Model.Base_RiskLevel
{
RiskLevelId = reskLevel.RiskLevelId,
RiskLevel = reskLevel.RiskLevel,
RiskLevelName = reskLevel.RiskLevelName,
ControlMeasures = reskLevel.ControlMeasures,
Days = reskLevel.Days,
Remark = reskLevel.Remark,
MaxValue = reskLevel.MaxValue,
MinValue = reskLevel.MinValue
};
db.Base_RiskLevel.InsertOnSubmit(newreskLevel);
db.SubmitChanges();
}
/// <summary>
/// 修改许可证类型
/// </summary>
/// <param name="licenseType"></param>
public static void UpdateLicenseType(Model.Base_RiskLevel riskLevel)
{
Model.SGGLDB db = Funs.DB;
Model.Base_RiskLevel newRiskLevel = db.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevel.RiskLevelId);
if (newRiskLevel != null)
{
newRiskLevel.RiskLevel = riskLevel.RiskLevel;
newRiskLevel.RiskLevelName = riskLevel.RiskLevelName;
newRiskLevel.MinValue = riskLevel.MinValue;
newRiskLevel.MaxValue = riskLevel.MaxValue;
newRiskLevel.ControlMeasures = riskLevel.ControlMeasures;
newRiskLevel.Days = riskLevel.Days;
newRiskLevel.Remark = riskLevel.Remark;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除许可证类型
/// </summary>
/// <param name="licenseTypeId"></param>
public static void DeleteRiskLevelById(string riskLevelId)
{
Model.SGGLDB db = Funs.DB;
Model.Base_RiskLevel riskLevel = db.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId== riskLevelId);
if (riskLevel != null)
{
db.Base_RiskLevel.DeleteOnSubmit(riskLevel);
db.SubmitChanges();
}
}
/// <summary>
/// 获取许可证类型下拉选择项
/// </summary>
/// <returns></returns>
public static List<Model.Base_RiskLevel> GetLicenseTypeList()
{
return (from x in Funs.DB.Base_RiskLevel orderby x.RiskLevel select x).ToList();
}
#region 许可证类型下拉框
/// <summary>
/// 许可证类型下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitRiskLevelDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "RiskLevelId";
dropName.DataTextField = "RiskLevelName";
dropName.DataSource = GetLicenseTypeList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
public static void InitRiskLevelDropDownListByRiskLevelName(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "RiskLevelName";
dropName.DataTextField = "RiskLevelName";
dropName.DataSource = GetLicenseTypeList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
#endregion
}
}

2
SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs
View File

@ -138,6 +138,7 @@ namespace BLL
newDesignDetails.AttachUrl = designDetails.AttachUrl;
newDesignDetails.CompileMan = designDetails.CompileMan;
newDesignDetails.CompileDate = designDetails.CompileDate;
newDesignDetails.JoinPersonNum = designDetails.JoinPersonNum;
newDesignDetails.Status = designDetails.Status;
db.Comprehensive_DesignDetails.InsertOnSubmit(newDesignDetails);
db.SubmitChanges();
@ -161,6 +162,7 @@ namespace BLL
newDesignDetails.UnitWorkId = designDetails.UnitWorkId;
newDesignDetails.UnitName = designDetails.UnitName;
newDesignDetails.AttachUrl = designDetails.AttachUrl;
newDesignDetails.JoinPersonNum = designDetails.JoinPersonNum;
newDesignDetails.Status = designDetails.Status;
db.SubmitChanges();
}

2
SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
View File

@ -120,6 +120,7 @@ namespace BLL
newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
newInspectionMachine.CompileMan = inspectionMachine.CompileMan;
newInspectionMachine.CompileDate = inspectionMachine.CompileDate;
@ -152,6 +153,7 @@ namespace BLL
newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;

2
SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
View File

@ -59,6 +59,7 @@ namespace BLL
newInspectionPerson.CompileDate = inspectionPerson.CompileDate;
newInspectionPerson.IsOnSite = inspectionPerson.IsOnSite;
newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
newInspectionPerson.IsTrain= inspectionPerson.IsTrain;
newInspectionPerson.Status = inspectionPerson.Status;
db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson);
db.SubmitChanges();
@ -89,6 +90,7 @@ namespace BLL
newInspectionPerson.CNProfessionalId = inspectionPerson.CNProfessionalId;
newInspectionPerson.IsOnSite = inspectionPerson.IsOnSite;
newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
newInspectionPerson.IsTrain = inspectionPerson.IsTrain;
newInspectionPerson.Status = inspectionPerson.Status;
db.SubmitChanges();
}

2
SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
View File

@ -260,6 +260,7 @@ namespace BLL
newBreakdownProject.YeZhu = breakdownProject.YeZhu;
newBreakdownProject.FenBao = breakdownProject.FenBao;
newBreakdownProject.SourceBreakdownId = breakdownProject.SourceBreakdownId;
newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType;
db.WBS_BreakdownProject.InsertOnSubmit(newBreakdownProject);
db.SubmitChanges();
@ -288,6 +289,7 @@ namespace BLL
newBreakdownProject.JianLi = breakdownProject.JianLi;
newBreakdownProject.YeZhu = breakdownProject.YeZhu;
newBreakdownProject.FenBao = breakdownProject.FenBao;
newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType;
db.SubmitChanges();
}

3
SGGL/BLL/CQMS/WBS/BreakdownService.cs
View File

@ -65,6 +65,7 @@ namespace BLL
x.WuHuan,
x.JianLi,
x.YeZhu,
x.CheckAcceptType,
CheckPointsDef = Funs.GetSubStr(x.CheckPoints, 15),
RecordAndCodeDef = Funs.GetSubStr(x.RecordAndCode, 15),
x.ModelURL
@ -107,6 +108,7 @@ namespace BLL
newBreakdown.WuHuan = breakdown.WuHuan;
newBreakdown.JianLi = breakdown.JianLi;
newBreakdown.YeZhu = breakdown.YeZhu;
newBreakdown.CheckAcceptType = breakdown.CheckAcceptType;
db.WBS_Breakdown.InsertOnSubmit(newBreakdown);
db.SubmitChanges();
@ -134,6 +136,7 @@ namespace BLL
newBreakdown.WuHuan = breakdown.WuHuan;
newBreakdown.JianLi = breakdown.JianLi;
newBreakdown.YeZhu = breakdown.YeZhu;
newBreakdown.CheckAcceptType = breakdown.CheckAcceptType;
db.SubmitChanges();
}

12
SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
View File

@ -78,6 +78,7 @@ namespace BLL
newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId;
newDivisionProject.UnitWorkId = divisionProject.UnitWorkId;
newDivisionProject.OldDivisionId = divisionProject.OldDivisionId;
newDivisionProject.SubItemType = divisionProject.SubItemType;
db.WBS_DivisionProject.InsertOnSubmit(newDivisionProject);
db.SubmitChanges();
}
@ -96,6 +97,7 @@ namespace BLL
newDivisionProject.SuperDivisionId = divisionProject.SuperDivisionId;
newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId;
newDivisionProject.IsSelected = divisionProject.IsSelected;
newDivisionProject.SubItemType = divisionProject.SubItemType;
db.SubmitChanges();
}
@ -152,16 +154,6 @@ namespace BLL
return Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.DivisionProjectId == divisionProjectId);
}
/// <summary>
/// 根据主键返回一个分部/子分部信息
/// </summary>
/// <param name="cnProfessionalCode">分部/子分部编号</param>
/// <returns></returns>
public static Model.WBS_DivisionProject GetDivisionProjectByUnitWorkIdAndOldDivisionId(string unitWorkId, string oldDivisionId)
{
return Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.UnitWorkId == unitWorkId && x.OldDivisionId == oldDivisionId);
}
/// <summary>
/// 判断分部/子分部编号是否存在
/// </summary>

2
SGGL/BLL/CQMS/WBS/DivisionService.cs
View File

@ -75,6 +75,7 @@ namespace BLL
newDivision.SortIndex = division.SortIndex;
newDivision.SuperDivisionId = division.SuperDivisionId;
newDivision.CNProfessionalId = division.CNProfessionalId;
newDivision.SubItemType = division.SubItemType;
db.WBS_Division.InsertOnSubmit(newDivision);
db.SubmitChanges();
}
@ -92,6 +93,7 @@ namespace BLL
newDivision.SortIndex = division.SortIndex;
newDivision.SuperDivisionId = division.SuperDivisionId;
newDivision.CNProfessionalId = division.CNProfessionalId;
newDivision.SubItemType = division.SubItemType;
db.SubmitChanges();
}

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

@ -1591,6 +1591,10 @@ namespace BLL
/// 执业资格证书证书
/// </summary>
public const string PracticeCertificateMenuId = "1390195D8-874B-4E7B-8DBF-D81A5984E973";
/// <summary>
/// 风险等级
/// </summary>
public const string RiskLevelMenuId = "E4B526CC-805E-4131-8E18-2FFA6871507E";
#endregion
#region 质量基础信息
@ -2248,6 +2252,18 @@ namespace BLL
/// 危险源辨识与评价清单
/// </summary>
public const string ProjectHazardListMenuId = "EDC50857-7762-4498-83C6-5BDE85036BAB";
/// <summary>
/// 风险信息库
/// </summary>
public const string ProjectHazardInfoMenuId = "74A6B343-5837-416B-AE9C-D2BBCA08E41F";
/// <summary>
/// 风险分级管控
/// </summary>
public const string ProjectRiskControlMenuId = "F6A6D53A-150E-43DB-A3C4-6FA18E9401E9";
/// <summary>
/// 风险巡检记录
/// </summary>
public const string ProjectRoutingInspectionMenuId = "D256E5C8-DC76-4F4D-BABE-A253418823F4";
/// <summary>
/// 风险提示

45
SGGL/BLL/Common/IDCardValid.cs
View File

@ -103,5 +103,50 @@ namespace BLL
return true;//符合15位身份证标准
}
#endregion
/// <summary>
/// 根据身份证号码获取生日
/// </summary>
/// <param name="IDCard"></param>
/// <returns></returns>
public static DateTime? getBirthByIDCard(string IDCard)
{
DateTime? birth = null;
if (!string.IsNullOrEmpty(IDCard))
{
string birthStr = string.Empty;
if (IDCard.Length == 18)
{
birthStr = IDCard.Substring(6, 8).Insert(6, "-").Insert(4, "-");
}
else if (IDCard.Length == 15)
{
birthStr = IDCard.Substring(6, 6).Insert(4, "-").Insert(2, "-");
}
DateTime time = new DateTime();
if (DateTime.TryParse(birthStr, out time))
{
birth = time;
}
}
return birth;
}
/// <summary>
/// 获取年龄
/// </summary>
/// <param name="birthDate"></param>
/// <param name="now"></param>
/// <returns></returns>
public static int CalculateAgeCorrect(DateTime birthDate)
{
DateTime now = DateTime.Now;
int age = now.Year - birthDate.Year;
if (now.Month < birthDate.Month || (now.Month == birthDate.Month && now.Day < birthDate.Day)) age--;
return age;
}
}
}

4
SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
View File

@ -46,7 +46,8 @@ namespace BLL
FileContent = accidentPersonRecord.FileContent,
CompileMan = accidentPersonRecord.CompileMan,
CompileDate = accidentPersonRecord.CompileDate,
States = accidentPersonRecord.States
States = accidentPersonRecord.States,
IsAttempt= accidentPersonRecord.IsAttempt,
};
db.Accident_AccidentPersonRecord.InsertOnSubmit(newAccidentPersonRecord);
db.SubmitChanges();
@ -77,6 +78,7 @@ namespace BLL
newAccidentPersonRecord.CompileMan = accidentPersonRecord.CompileMan;
newAccidentPersonRecord.CompileDate = accidentPersonRecord.CompileDate;
newAccidentPersonRecord.States = accidentPersonRecord.States;
newAccidentPersonRecord.IsAttempt= accidentPersonRecord.IsAttempt;
db.SubmitChanges();
}
}

2
SGGL/BLL/HSSE/Accident/AccidentReportService.cs
View File

@ -387,6 +387,7 @@ namespace BLL
NotConfirmWorkingHoursLoss = accidentReport.NotConfirmWorkingHoursLoss,
NotConfirmEconomicLoss = accidentReport.NotConfirmEconomicLoss,
NotConfirmEconomicOtherLoss = accidentReport.NotConfirmEconomicOtherLoss,
AccidentDegree = accidentReport.AccidentDegree,
NotConfirmed = accidentReport.NotConfirmed
};
db.Accident_AccidentReport.InsertOnSubmit(newAccidentReport);
@ -430,6 +431,7 @@ namespace BLL
newAccidentReport.IsNotConfirm = accidentReport.IsNotConfirm;
newAccidentReport.NotConfirmWorkingHoursLoss = accidentReport.NotConfirmWorkingHoursLoss;
newAccidentReport.NotConfirmEconomicLoss = accidentReport.NotConfirmEconomicLoss;
newAccidentReport.AccidentDegree = accidentReport.AccidentDegree;
newAccidentReport.NotConfirmEconomicOtherLoss = accidentReport.NotConfirmEconomicOtherLoss;
db.SubmitChanges();
}

50
SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs
View File

@ -39,6 +39,7 @@ namespace BLL
x.PromptTime,
x.Remark,
x.WorkStage,
x.Position,
//HazardLevelName = (from y in db.Hazard_HazardLevel where y.HazardLevelId == x.HazardLevel select y.HazardLevelName).First(),
};
}
@ -72,6 +73,7 @@ namespace BLL
x.PromptTime,
x.Remark,
x.WorkStage,
x.Position,
//HazardLevelName = (from y in db.Hazard_HazardLevel where y.HazardLevelId == x.HazardLevel select y.HazardLevelName).First(),
};
}
@ -104,6 +106,16 @@ namespace BLL
return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardId == hazardId && x.HazardListId == hazardListId && x.WorkStage == workStage);
}
/// <summary>
/// 根据危险源辨识与评价清单Id获取一个危险源辨识与评价清单审批信息
/// </summary>
/// <param name="hazardId">危险源辨识与评价清单Id</param>
/// <returns>一个危险源辨识与评价清单审批实体</returns>
public static Model.Hazard_HazardSelectedItem GetHazardSelectedItemByHazardSelectedItemId(string hazardSelectedItemId)
{
return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardSelectedItemId == hazardSelectedItemId);
}
/// <summary>
/// 根据危险源辨识与评价清单Id获取一个危险源辨识与评价清单审批信息
/// </summary>
@ -156,11 +168,13 @@ namespace BLL
Model.SGGLDB db = Funs.DB;
Model.Hazard_HazardSelectedItem newHazardSelectedItem = new Model.Hazard_HazardSelectedItem
{
HazardSelectedItemId = hazardSelectedItem.HazardSelectedItemId,
HazardId = hazardSelectedItem.HazardId,
HazardListTypeId = hazardSelectedItem.HazardListTypeId,
HazardListId = hazardSelectedItem.HazardListId,
HazardItems = hazardSelectedItem.HazardItems,
DefectsType = hazardSelectedItem.DefectsType,
ProjectId = hazardSelectedItem.ProjectId,
MayLeadAccidents = hazardSelectedItem.MayLeadAccidents,
HelperMethod = hazardSelectedItem.HelperMethod,
HazardJudge_L = hazardSelectedItem.HazardJudge_L,
@ -171,9 +185,12 @@ namespace BLL
ControlMeasures = hazardSelectedItem.ControlMeasures,
IsResponse = hazardSelectedItem.IsResponse,
ResponseRecode = hazardSelectedItem.ResponseRecode,
DutyPerson = hazardSelectedItem.DutyPerson,
PromptTime = hazardSelectedItem.PromptTime,
Remark = hazardSelectedItem.Remark,
WorkStage = hazardSelectedItem.WorkStage
State = hazardSelectedItem.State,
WorkStage = hazardSelectedItem.WorkStage,
Position = hazardSelectedItem.Position,
};
Funs.DB.Hazard_HazardSelectedItem.InsertOnSubmit(newHazardSelectedItem);
@ -187,7 +204,7 @@ namespace BLL
public static void UpdateHazardSelectedItem(Model.Hazard_HazardSelectedItem hazardSelectedItem)
{
Model.SGGLDB db = Funs.DB;
Model.Hazard_HazardSelectedItem newHazardSelectedItem = db.Hazard_HazardSelectedItem.FirstOrDefault(e => e.HazardId == hazardSelectedItem.HazardId && e.HazardListId == hazardSelectedItem.HazardListId && e.WorkStage == hazardSelectedItem.WorkStage);
Model.Hazard_HazardSelectedItem newHazardSelectedItem = db.Hazard_HazardSelectedItem.FirstOrDefault(e => e.HazardSelectedItemId == hazardSelectedItem.HazardSelectedItemId);
if (newHazardSelectedItem != null)
{
newHazardSelectedItem.HazardListTypeId = hazardSelectedItem.HazardListTypeId;
@ -204,9 +221,16 @@ namespace BLL
newHazardSelectedItem.ControlMeasures = hazardSelectedItem.ControlMeasures;
newHazardSelectedItem.IsResponse = hazardSelectedItem.IsResponse;
newHazardSelectedItem.ResponseRecode = hazardSelectedItem.ResponseRecode;
newHazardSelectedItem.DutyPerson = hazardSelectedItem.DutyPerson;
newHazardSelectedItem.PromptTime = hazardSelectedItem.PromptTime;
newHazardSelectedItem.Remark = hazardSelectedItem.Remark;
newHazardSelectedItem.WorkStage = hazardSelectedItem.WorkStage;
newHazardSelectedItem.CheckStartDate = hazardSelectedItem.CheckStartDate;
newHazardSelectedItem.IsStart = hazardSelectedItem.IsStart;
newHazardSelectedItem.State = hazardSelectedItem.State;
newHazardSelectedItem.PlanExistDate = hazardSelectedItem.PlanExistDate;
newHazardSelectedItem.QRCodeAttachUrl = hazardSelectedItem.QRCodeAttachUrl;
newHazardSelectedItem.Position = hazardSelectedItem.Position;
db.SubmitChanges();
}
@ -222,8 +246,30 @@ namespace BLL
var q = (from x in db.Hazard_HazardSelectedItem where x.HazardListId == hazardListId select x).ToList();
if (q.Count() > 0)
{
foreach (var item in q)
{
var h = db.Hazard_RiskEvaluationRecord.Where(x => x.DataId == item.HazardSelectedItemId);
if (h.Count() > 0)
{
db.Hazard_RiskEvaluationRecord.DeleteAllOnSubmit(h);
db.SubmitChanges();
}
var p = db.Hazard_PatrolPlan.Where(x => x.HazardSelectedItemId == item.HazardSelectedItemId);
if (p.Count() > 0)
{
db.Hazard_PatrolPlan.DeleteAllOnSubmit(p);
db.SubmitChanges();
}
var r = db.Hazard_RoutingInspection.Where(x => x.HazardSelectedItemId == item.HazardSelectedItemId);
if (r.Count() > 0)
{
db.Hazard_RoutingInspection.DeleteAllOnSubmit(r);
db.SubmitChanges();
}
}
db.Hazard_HazardSelectedItem.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
}

96
SGGL/BLL/HSSE/Hazard/Hazard_PatrolPlanService.cs Normal file
View File

@ -0,0 +1,96 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 巡检计划表
/// </summary>
public static class Hazard_PatrolPlanService
{
/// <summary>
/// 根据巡检计划ID获取巡检计划信息
/// </summary>
/// <param name="PatrolPlanName"></param>
/// <returns></returns>
public static Model.Hazard_PatrolPlan GetPatrolPlanByPatrolPlanId(string PatrolPlanId)
{
return Funs.DB.Hazard_PatrolPlan.FirstOrDefault(e => e.PatrolPlanId == PatrolPlanId);
}
/// <summary>
/// 根据风险ID和巡检时限获取巡检计划信息
/// </summary>
/// <param name="PatrolPlanName"></param>
/// <returns></returns>
public static Model.Hazard_PatrolPlan GetPatrolPlanByHazardSelectedItemIdAndLimitCheckDate(string hazardSelectedItemId, DateTime? limitCheckDate)
{
return Funs.DB.Hazard_PatrolPlan.FirstOrDefault(e => e.HazardSelectedItemId == hazardSelectedItemId && e.LimitCheckDate == limitCheckDate);
}
/// <summary>
/// 根据巡检日期获取之前未巡检计划信息集合
/// </summary>
/// <param name="PatrolPlanName"></param>
/// <returns></returns>
public static List<Model.Hazard_PatrolPlan> GetBeforePatrolPlansByCheckDate(string hazardSelectedItemId, DateTime checkDate)
{
return (from x in Funs.DB.Hazard_PatrolPlan where x.HazardSelectedItemId == hazardSelectedItemId && x.LimitCheckDate < checkDate select x).ToList();
}
/// <summary>
/// 添加安全巡检计划
/// </summary>
/// <param name="patrolPlan"></param>
public static void AddPatrolPlan(Model.Hazard_PatrolPlan patrolPlan)
{
Model.Hazard_PatrolPlan newPatrolPlan = new Model.Hazard_PatrolPlan
{
PatrolPlanId = patrolPlan.PatrolPlanId,
HazardSelectedItemId = patrolPlan.HazardSelectedItemId,
HazardLevel = patrolPlan.HazardLevel,
DutyPerson = patrolPlan.DutyPerson,
Days = patrolPlan.Days,
CheckStartDate = patrolPlan.CheckStartDate,
LimitCheckDate = patrolPlan.LimitCheckDate,
CheckDate = patrolPlan.CheckDate,
State = patrolPlan.State
};
Funs.DB.Hazard_PatrolPlan.InsertOnSubmit(newPatrolPlan);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 修改安全巡检计划
/// </summary>
/// <param name="patrolPlan"></param>
public static void UpdatePatrolPlan(Model.Hazard_PatrolPlan patrolPlan)
{
Model.Hazard_PatrolPlan newPatrolPlan = Funs.DB.Hazard_PatrolPlan.FirstOrDefault(e => e.PatrolPlanId == patrolPlan.PatrolPlanId);
if (newPatrolPlan != null)
{
newPatrolPlan.CheckDate = patrolPlan.CheckDate;
newPatrolPlan.State = patrolPlan.State;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据巡检计划ID删除对应巡检计划记录信息
/// </summary>
/// <param name="superviseCheckReportId"></param>
public static void DeletePatrolPlan(string PatrolPlanId)
{
var q = (from x in Funs.DB.Hazard_PatrolPlan where x.PatrolPlanId == PatrolPlanId select x).FirstOrDefault();
if (q != null)
{
Funs.DB.Hazard_PatrolPlan.DeleteOnSubmit(q);
Funs.DB.SubmitChanges();
}
}
}
}

95
SGGL/BLL/HSSE/Hazard/Hazard_RoutingInspectionService.cs Normal file
View File

@ -0,0 +1,95 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 巡检记录表
/// </summary>
public static class Hazard_RoutingInspectionService
{
/// <summary>
/// 根据巡检记录ID获取巡检记录信息
/// </summary>
/// <param name="RoutingInspectionName"></param>
/// <returns></returns>
public static Model.Hazard_RoutingInspection GetRoutingInspectionByRoutingInspectionId(string RoutingInspectionId)
{
return Funs.DB.Hazard_RoutingInspection.FirstOrDefault(e => e.RoutingInspectionId == RoutingInspectionId);
}
/// <summary>
/// 根据巡检计划ID获取巡检记录信息
/// </summary>
/// <param name="RoutingInspectionName"></param>
/// <returns></returns>
public static Model.Hazard_RoutingInspection GetRoutingInspectionByPatrolPlanId(string PatrolPlanId)
{
return Funs.DB.Hazard_RoutingInspection.FirstOrDefault(e => e.PatrolPlanId == PatrolPlanId);
}
/// <summary>
/// 添加安全巡检记录
/// </summary>
/// <param name="RoutingInspection"></param>
public static void AddRoutingInspection(Model.Hazard_RoutingInspection RoutingInspection)
{
Model.Hazard_RoutingInspection newRoutingInspection = new Model.Hazard_RoutingInspection
{
RoutingInspectionId = RoutingInspection.RoutingInspectionId,
HazardSelectedItemId = RoutingInspection.HazardSelectedItemId,
PatrolManId = RoutingInspection.PatrolManId,
PatrolTime = RoutingInspection.PatrolTime,
PatrolResult = RoutingInspection.PatrolResult,
OldRiskLevel = RoutingInspection.OldRiskLevel,
PohotoUrl = RoutingInspection.PohotoUrl,
ControlMeasures = RoutingInspection.ControlMeasures,
DealReason = RoutingInspection.DealReason,
RiskManId = RoutingInspection.RiskManId,
PatrolPlanId = RoutingInspection.PatrolPlanId
};
Funs.DB.Hazard_RoutingInspection.InsertOnSubmit(newRoutingInspection);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 修改安全巡检记录
/// </summary>
/// <param name="RoutingInspection"></param>
public static void UpdateRoutingInspection(Model.Hazard_RoutingInspection RoutingInspection)
{
Model.Hazard_RoutingInspection newRoutingInspection = Funs.DB.Hazard_RoutingInspection.FirstOrDefault(e => e.RoutingInspectionId == RoutingInspection.RoutingInspectionId);
if (newRoutingInspection != null)
{
newRoutingInspection.PatrolManId = RoutingInspection.PatrolManId;
newRoutingInspection.PatrolTime = RoutingInspection.PatrolTime;
newRoutingInspection.PatrolResult = RoutingInspection.PatrolResult;
newRoutingInspection.OldRiskLevel = RoutingInspection.OldRiskLevel;
newRoutingInspection.PohotoUrl = RoutingInspection.PohotoUrl;
newRoutingInspection.ControlMeasures = RoutingInspection.ControlMeasures;
newRoutingInspection.DealReason = RoutingInspection.DealReason;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据巡检记录ID删除对应巡检记录记录信息
/// </summary>
/// <param name="superviseCheckReportId"></param>
public static void DeleteRoutingInspection(string RoutingInspectionId)
{
var q = (from x in Funs.DB.Hazard_RoutingInspection where x.RoutingInspectionId == RoutingInspectionId select x).FirstOrDefault();
if (q != null)
{
///删除附件
BLL.CommonService.DeleteAttachFileById(RoutingInspectionId);
Funs.DB.Hazard_RoutingInspection.DeleteOnSubmit(q);
Funs.DB.SubmitChanges();
}
}
}
}

109
SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs Normal file
View File

@ -0,0 +1,109 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public static class RiskEvaluationRecordService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取风险评价记录
/// </summary>
/// <param name="hazardId"></param>
/// <returns></returns>
public static Model.Hazard_RiskEvaluationRecord GetRiskEvaluationRecordByLECItemRecordId(string LECItemRecordId)
{
return Funs.DB.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == LECItemRecordId);
}
/// <summary>
/// 根据风险主键获取风险评价记录
/// </summary>
/// <param name="hazardId"></param>
/// <returns></returns>
public static Model.Hazard_RiskEvaluationRecord GetRiskEvaluationRecordByDataIdAndEvaluatorDate(string dataId)
{
return Funs.DB.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.DataId == dataId && e.EvaluatorDate == null);
}
/// <summary>
/// 根据整理人获取风险评价记录
/// </summary>
/// <param name="compileMan"></param>
/// <returns></returns>
public static List<Model.Hazard_RiskEvaluationRecord> GetRiskEvaluationRecordByDataId(string dataId)
{
return (from x in Funs.DB.Hazard_RiskEvaluationRecord where x.DataId == dataId select x).ToList();
}
/// <summary>
/// 添加风险评价记录
/// </summary>
/// <param name="RiskEvaluationRecord"></param>
public static void AddRiskEvaluationRecord(Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord)
{
Model.SGGLDB db = Funs.DB;
Model.Hazard_RiskEvaluationRecord newRiskEvaluationRecord = new Model.Hazard_RiskEvaluationRecord
{
LECItemRecordId = RiskEvaluationRecord.LECItemRecordId,
DataId = RiskEvaluationRecord.DataId,
DataType = RiskEvaluationRecord.DataType,
Evaluatorld = RiskEvaluationRecord.Evaluatorld,
EvaluatorDate = RiskEvaluationRecord.EvaluatorDate,
L = RiskEvaluationRecord.L,
E = RiskEvaluationRecord.E,
C = RiskEvaluationRecord.C,
D = RiskEvaluationRecord.D,
RiskLevel = RiskEvaluationRecord.RiskLevel,
ControlMeasures = RiskEvaluationRecord.ControlMeasures,
Remark = RiskEvaluationRecord.Remark,
};
db.Hazard_RiskEvaluationRecord.InsertOnSubmit(newRiskEvaluationRecord);
db.SubmitChanges();
}
/// <summary>
/// 修改风险评价记录
/// </summary>
/// <param name="RiskEvaluationRecord"></param>
public static void UpdateRiskEvaluationRecord(Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord)
{
Model.SGGLDB db = Funs.DB;
Model.Hazard_RiskEvaluationRecord newRiskEvaluationRecord = db.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == RiskEvaluationRecord.LECItemRecordId);
if (newRiskEvaluationRecord != null)
{
newRiskEvaluationRecord.DataId = RiskEvaluationRecord.DataId;
newRiskEvaluationRecord.DataType = RiskEvaluationRecord.DataType;
newRiskEvaluationRecord.Evaluatorld = RiskEvaluationRecord.Evaluatorld;
newRiskEvaluationRecord.EvaluatorDate = RiskEvaluationRecord.EvaluatorDate;
newRiskEvaluationRecord.L = RiskEvaluationRecord.L;
newRiskEvaluationRecord.E = RiskEvaluationRecord.E;
newRiskEvaluationRecord.C = RiskEvaluationRecord.C;
newRiskEvaluationRecord.D = RiskEvaluationRecord.D;
newRiskEvaluationRecord.RiskLevel = RiskEvaluationRecord.RiskLevel;
newRiskEvaluationRecord.ControlMeasures = RiskEvaluationRecord.ControlMeasures;
newRiskEvaluationRecord.Remark = RiskEvaluationRecord.Remark;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除风险评价记录
/// </summary>
/// <param name="LECItemRecordId"></param>
public static void DeleteRiskEvaluationRecordByLECItemRecordId(string LECItemRecordId)
{
Model.SGGLDB db = Funs.DB;
Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord = db.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == LECItemRecordId);
if (RiskEvaluationRecord != null)
{
db.Hazard_RiskEvaluationRecord.DeleteOnSubmit(RiskEvaluationRecord);
db.SubmitChanges();
}
}
}
}

4
SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs
View File

@ -52,7 +52,8 @@ namespace BLL
RegistrationNum = equipmentInItem.RegistrationNum,
OperationQualificationNum = equipmentInItem.OperationQualificationNum,
InsuranceNum = equipmentInItem.InsuranceNum,
CommercialInsuranceNum = equipmentInItem.CommercialInsuranceNum
CommercialInsuranceNum = equipmentInItem.CommercialInsuranceNum,
IsUsed = equipmentInItem.IsUsed,
};
db.InApproveManager_EquipmentInItem.InsertOnSubmit(newEquipmentItem);
db.SubmitChanges();
@ -79,6 +80,7 @@ namespace BLL
newEquipmentItem.OperationQualificationNum = equipmentInItem.OperationQualificationNum;
newEquipmentItem.InsuranceNum = equipmentInItem.InsuranceNum;
newEquipmentItem.CommercialInsuranceNum = equipmentInItem.CommercialInsuranceNum;
newEquipmentItem.IsUsed = equipmentInItem.IsUsed;
db.SubmitChanges();
}
}

4
SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs
View File

@ -44,7 +44,8 @@ namespace BLL
SpecialEquipmentId = generalEquipmentInItem.SpecialEquipmentId,
SizeModel = generalEquipmentInItem.SizeModel,
OwnerCheck = generalEquipmentInItem.OwnerCheck,
CertificateNum = generalEquipmentInItem.CertificateNum
CertificateNum = generalEquipmentInItem.CertificateNum,
IsUsed = generalEquipmentInItem.IsUsed,
};
db.InApproveManager_GeneralEquipmentInItem.InsertOnSubmit(newEquipmentItem);
db.SubmitChanges();
@ -65,6 +66,7 @@ namespace BLL
newGeneralEquipmentInItem.SizeModel = generalEquipmentInItem.SizeModel;
newGeneralEquipmentInItem.OwnerCheck = generalEquipmentInItem.OwnerCheck;
newGeneralEquipmentInItem.CertificateNum = generalEquipmentInItem.CertificateNum;
newGeneralEquipmentInItem.IsUsed = generalEquipmentInItem.IsUsed;
db.SubmitChanges();
}
}

8
SGGL/BLL/HSSE/License/LicenseManagerService.cs
View File

@ -57,7 +57,8 @@ namespace BLL
WorkAreaId = licenseManager.WorkAreaId,
StartDate = licenseManager.StartDate,
EndDate = licenseManager.EndDate,
WorkStates=licenseManager.WorkStates,
WorkStates = licenseManager.WorkStates,
IsHighRisk = licenseManager.IsHighRisk,
};
db.License_LicenseManager.InsertOnSubmit(newLicenseManager);
db.SubmitChanges();
@ -88,6 +89,7 @@ namespace BLL
newLicenseManager.StartDate = licenseManager.StartDate;
newLicenseManager.EndDate = licenseManager.EndDate;
newLicenseManager.WorkStates = licenseManager.WorkStates;
newLicenseManager.IsHighRisk = licenseManager.IsHighRisk;
db.SubmitChanges();
}
}
@ -100,7 +102,7 @@ namespace BLL
{
Model.SGGLDB db = Funs.DB;
Model.License_LicenseManager licenseManager = db.License_LicenseManager.FirstOrDefault(e => e.LicenseManagerId == licenseManagerId);
if (licenseManager!=null)
if (licenseManager != null)
{
///删除编码表记录
BLL.CodeRecordsService.DeleteCodeRecordsByDataId(licenseManagerId);
@ -110,7 +112,7 @@ namespace BLL
if (flowOperate.Count() > 0)
{
BLL.CommonService.DeleteFlowOperateByID(licenseManager.LicenseManagerId); ////删除审核流程表
}
}
db.License_LicenseManager.DeleteOnSubmit(licenseManager);
db.SubmitChanges();
}

89
SGGL/BLL/HSSE/SitePerson/PersonService.cs
View File

@ -14,6 +14,93 @@ namespace BLL
{
public static Model.SGGLDB db = Funs.DB;
#region 劳务人员列表
/// <summary>
/// 记录数
/// </summary>
public static int count2
{
get;
set;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.View_SitePerson_Person> getDataLists = from x in db.View_SitePerson_Person
select x;
/// <summary>
/// 数据列表
/// </summary>
/// <param name="projetcId"></param>
/// <param name="unitId"></param>
/// <param name="workPostId"></param>
/// <param name="name"></param>
/// <param name="idCard"></param>
/// <param name="states"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, Grid Grid1)
{
IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId);
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
{
getDataList = getDataList.Where(e => e.ProjectId == projetcId);
}
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
{
getDataList = getDataList.Where(e => e.UnitId == unitId);
}
if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null)
{
getDataList = getDataList.Where(e => e.WorkPostId == workPostId);
}
if (!string.IsNullOrEmpty(states) && states != "-2")
{
getDataList = getDataList.Where(e => e.IsUsed == Convert.ToInt32(states));
}
if (!string.IsNullOrEmpty(name))
{
getDataList = getDataList.Where(e => e.PersonName.Contains(name));
}
if (!string.IsNullOrEmpty(idCard))
{
getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));
}
count2 = getDataList.Count();
if (count2 == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
select new
{
x.PersonId,
x.PersonName,
x.CardNo,
x.IdentityCard,
x.Sex,
x.SexName,
x.UnitId,
x.UnitName,
x.WorkPostId,
x.WorkPostName,
x.ProjectId,
ProjectName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
ShortName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ShortName,
NativePlace = x.CountryName ?? "" + x.ProvinceName ?? "",
x.TeamGroupId,
x.TeamGroupName,
x.InTime,
x.OutTime,
x.IsUsed,
OutName = (x.IsUsed == 1 ? "是" : "否"),
};
}
#endregion
/// <summary>
/// 根据主键获取人员信息
/// </summary>
@ -278,6 +365,7 @@ namespace BLL
Nation = person.Nation,
CountryCode = person.CountryCode,
ProvinceCode = person.ProvinceCode,
IsSafetyMonitoring = person.IsSafetyMonitoring,
IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard),
};
@ -332,6 +420,7 @@ namespace BLL
newPerson.PositionId = person.PositionId;
newPerson.PostTitleId = person.PostTitleId;
newPerson.PhotoUrl = person.PhotoUrl;
newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring;
newPerson.HeadImage = person.HeadImage;
newPerson.IsUsed = person.IsUsed;
newPerson.IsCardUsed = person.IsCardUsed;

4
SGGL/BLL/HSSE/Solution/LargerHazardService.cs
View File

@ -41,6 +41,8 @@ namespace BLL
RecardMan = largerHazard.RecardMan,
Remark = largerHazard.Remark,
States = largerHazard.States,
TrainPersonNum = largerHazard.TrainPersonNum,
IsSuperLargerHazard = largerHazard.IsSuperLargerHazard,
Descriptions = largerHazard.Descriptions
};
@ -68,6 +70,8 @@ namespace BLL
newLargerHazard.IsArgument = largerHazard.IsArgument;
newLargerHazard.Remark = largerHazard.Remark;
newLargerHazard.States = largerHazard.States;
newLargerHazard.TrainPersonNum = largerHazard.TrainPersonNum;
newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard;
newLargerHazard.Descriptions = largerHazard.Descriptions;
db.SubmitChanges();
}

2
SGGL/BLL/SysManage/UnitService.cs
View File

@ -279,7 +279,7 @@ namespace BLL
var q = (from x in db.Base_Unit
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId && y.UnitType == unitType
where y.ProjectId == projectId && (y.UnitType == unitType || string.IsNullOrEmpty(unitType))
orderby x.UnitCode
select x).ToList();
return q;

51
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
View File

@ -8,9 +8,9 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false">
<Items>
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false">
<items>
<f:Grid ID="Grid1" Title="特岗证书" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" ForceFit="true"
DataKeyNames="CertificateId" DataIDField="CertificateId" OnPageIndexChange="Grid1_PageIndexChange"
@ -24,6 +24,13 @@
<f:RenderField Width="250px" ColumnID="CertificateName" DataField="CertificateName"
FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CertificateType" DataField="CertificateType" FieldType="String"
HeaderText="证件类别" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IsRegisterHSSE" DataField="IsRegisterHSSE" FieldType="Boolean"
RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
@ -53,6 +60,14 @@
<f:TextBox ID="txtCertificateName" Label="名称" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
<f:DropDownList ID="drpCertificateType" runat="server" Label="证件类别" LabelAlign="Right"
LabelWidth="80px">
<f:ListItem Value="A" Text="A类" />
<f:ListItem Value="B" Text="B类" />
<f:ListItem Value="C" Text="C类" />
</f:DropDownList>
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
</f:TextArea>
</Items>
@ -76,16 +91,14 @@
</f:Toolbar>
</Toolbars>
</f:SimpleForm>
</Items>
</f:Panel>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Icon="Pencil" runat="server" Text="编辑" >
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</items>
</f:Panel>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Icon="Pencil" runat="server" Text="编辑"></f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除"></f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
@ -95,6 +108,10 @@
return false;
}
function renderIsHsse(value) {
return value == true ? '是' : '否';
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
@ -108,6 +125,8 @@
var hfFormIDClientID = '<%= hfFormID.ClientID %>';
var txtCodeClientID = '<%= txtCertificateCode.ClientID %>';
var txtNameClientID = '<%= txtCertificateName.ClientID %>';
var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>';
var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>';
var txtRemarkClientID = '<%=txtRemark.ClientID %>';
function onGridRowSelect(event, rowId) {
@ -123,10 +142,12 @@
F(hfFormIDClientID).setValue(rowId);
F(txtCodeClientID).setValue(rowValue['CertificateCode']);
F(txtNameClientID).setValue(rowValue['CertificateName']);
F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']);
F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']);
F(txtRemarkClientID).setValue(rowValue['Remark']);
// 更新保存按钮文本
// F(btnSaveClientID).setText('保存数据（编辑）');
// F(btnSaveClientID).setText('保存数据（编辑）');
}
function onNewButtonClick() {
@ -139,7 +160,7 @@
F(btnDeleteClientID).disable();
// 更新保存按钮文本
// F(btnSaveClientID).setText('保存数据（新增）');
// F(btnSaveClientID).setText('保存数据（新增）');
}
</script>
</body>

14
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
View File

@ -23,6 +23,7 @@ namespace FineUIPro.Web.BaseInfo
////权限按钮方法
this.GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
Funs.FineUIPleaseSelect(this.drpCertificateType);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
@ -181,6 +182,14 @@ namespace FineUIPro.Web.BaseInfo
{
this.txtCertificateCode.Text = certificate.CertificateCode;
this.txtCertificateName.Text = certificate.CertificateName;
if (!string.IsNullOrEmpty(certificate.CertificateType))
{
this.drpCertificateType.SelectedValue = certificate.CertificateType;
}
if (certificate.IsRegisterHSSE == true)
{
this.ckbIsRegisterHSSE.Checked = true;
}
this.txtRemark.Text = certificate.Remark;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
@ -201,8 +210,13 @@ namespace FineUIPro.Web.BaseInfo
{
CertificateCode = this.txtCertificateCode.Text.Trim(),
CertificateName = this.txtCertificateName.Text.Trim(),
IsRegisterHSSE = Convert.ToBoolean(this.ckbIsRegisterHSSE.Checked),
Remark = txtRemark.Text.Trim()
};
if (this.drpCertificateType.SelectedValue != BLL.Const._Null)
{
certificate.CertificateType = this.drpCertificateType.SelectedValue;
}
if (string.IsNullOrEmpty(strRowID))
{
certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate));

18
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs generated
View File

@ -111,6 +111,24 @@ namespace FineUIPro.Web.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateName;
/// <summary>
/// drpCertificateType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCertificateType;
/// <summary>
/// ckbIsRegisterHSSE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsRegisterHSSE;
/// <summary>
/// txtRemark 控件。
/// </summary>

100
SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx Normal file
View File

@ -0,0 +1,100 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskLevel.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.RiskLevel" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>风险等级</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险等级" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="RiskLevelId" DataIDField="RiskLevelId" ForceFit="true"
AllowSorting="true" SortField="RiskLevel" SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableColumnLines="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField Width="70px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="130px" ColumnID="RiskLevelName" DataField="RiskLevelName" SortField="RiskLevelName"
FieldType="String" HeaderText="风险等级" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="130px" ColumnID="RiskLevel" DataField="RiskLevel" SortField="RiskLevel"
FieldType="String" HeaderText="风险等级值" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MinValue" DataField="MinValue" SortField="MinValue"
FieldType="String" HeaderText="最小值" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaxValue" DataField="MaxValue" SortField="MaxValue"
FieldType="String" HeaderText="最大值" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="550px" ColumnID="ControlMeasures" DataField="ControlMeasures" SortField="ControlMeasures"
FieldType="String" HeaderText="控制措施" EnableFilter="true" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="130px" ColumnID="Days" DataField="Days" SortField="Days"
FieldType="String" HeaderText="巡检频次(天)" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="550px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" EnableFilter="true" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="风险等级" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="430px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" 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>

240
SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.cs Normal file
View File

@ -0,0 +1,240 @@
using BLL;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.BaseInfo
{
public partial class RiskLevel : PageBase
{
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
////权限按钮方法
this.GetButtonPower();
btnNew.OnClientClick = Window1.GetShowReference("RiskLevelEdit.aspx") + "return false;";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT RiskLevelId
, RiskLevel
, RiskLevelName
, MinValue
, MaxValue
, ControlMeasures
, Days
, Remark
FROM dbo.Base_RiskLevel ";
SqlParameter[] parameter = null;
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
#endregion
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
#region 分页选择下拉改变事件
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
#endregion
#region 弹出编辑窗口关闭事件
/// <summary>
/// 弹出编辑窗体关闭事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
#region 编辑
/// <summary>
/// Grid行双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
this.EditData();
}
/// <summary>
/// 右键编辑事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
this.EditData();
}
/// <summary>
/// 编辑数据方法
/// </summary>
private void EditData()
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string RegisterTypesId = Grid1.SelectedRowID;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RiskLevelEdit.aspx?RiskLevelId={0}", RegisterTypesId, "编辑 - ")));
}
#endregion
#region 删除
/// <summary>
/// 右键删除事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuDelete_Click(object sender, EventArgs e)
{
this.DeleteData();
}
/// <summary>
/// 删除方法
/// </summary>
private void DeleteData()
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HazardRegisterTypesMenuId, Const.BtnDelete))
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
bool isShow = false;
if (Grid1.SelectedRowIndexArray.Length == 1)
{
isShow = true;
}
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
if (this.judgementDelete(rowID, isShow))
{
var riskLevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x=>x.RiskLevelId==rowID);
if (riskLevel != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, riskLevel.RiskLevelName, riskLevel.RiskLevelId, BLL.Const.RiskLevelMenuId, BLL.Const.BtnDelete);
Funs.DB.Base_RiskLevel.DeleteOnSubmit(riskLevel);
Funs.DB.SubmitChanges();
}
}
}
BindGrid();
ShowNotify("删除数据成功!（表格数据已重新绑定）", MessageBoxIcon.Success);
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！");
}
}
/// <summary>
/// 判断是否可删除
/// </summary>
/// <param name="rowID"></param>
/// <param name="isShow"></param>
/// <returns></returns>
private bool judgementDelete(string rowID, bool isShow)
{
string content = string.Empty;
if (string.IsNullOrEmpty(content))
{
return true;
}
else
{
if (isShow)
{
Alert.ShowInTop(content);
}
return false;
}
}
#endregion
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
private void GetButtonPower()
{
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.RiskLevelMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
this.btnMenuEdit.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
this.btnMenuDelete.Hidden = false;
}
}
}
#endregion
}
}

143
SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,143 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo
{
public partial class RiskLevel
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </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;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
}
}

73
SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx Normal file
View File

@ -0,0 +1,73 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskLevelEdit.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.RiskLevelEdit" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>风险等级</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtRiskLevelName" runat="server" Label="风险等级" Required="true" ShowRedStar="true" FocusOnPageLoad="true" >
</f:TextBox>
<f:NumberBox ID="txtRiskLevel" runat="server" Label="风险等级值" Required="true" ShowRedStar="true" >
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtMin" runat="server" Label="最小值" NoDecimal="true" NoNegative="true" >
</f:NumberBox>
<f:NumberBox ID="txtMax" runat="server" Label="最大值" NoDecimal="true" NoNegative="true" >
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtDays" runat="server" Label="巡检频次" Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true" >
</f:NumberBox>
<f:NumberBox ID="NumberBox4" runat="server" Label="最大值" NoDecimal="true" NoNegative="true" Hidden="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtControlMeasures" runat="server" Label="控制措施" Required="true"
ShowRedStar="true" MaxLength="500">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="100">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存数据" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>

118
SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.cs Normal file
View File

@ -0,0 +1,118 @@
using BLL;
using System;
using System.Linq;
namespace FineUIPro.Web.BaseInfo
{
public partial class RiskLevelEdit : PageBase
{
#region 定义项
/// <summary>
/// 问题巡检类型主键
/// </summary>
public string RiskLevelId
{
get
{
return (string)ViewState["RiskLevelId"];
}
set
{
ViewState["RiskLevelId"] = value;
}
}
#endregion
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.RiskLevelId = Request.QueryString["RiskLevelId"];
if (!string.IsNullOrEmpty(this.RiskLevelId))
{
var riskLevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x=>x.RiskLevelId==this.RiskLevelId);
if (riskLevel != null)
{
if (riskLevel.RiskLevel.HasValue)
{
this.txtRiskLevel.Text = riskLevel.RiskLevel.Value.ToString();
}
this.txtRiskLevelName.Text = riskLevel.RiskLevelName;
if (riskLevel.MinValue.HasValue)
{
this.txtMin.Text = riskLevel.MinValue.Value.ToString();
}
if (riskLevel.MaxValue.HasValue)
{
this.txtMax.Text = riskLevel.MaxValue.Value.ToString();
}
if (riskLevel.Days.HasValue)
{
this.txtDays.Text = riskLevel.Days.Value.ToString();
}
this.txtControlMeasures.Text = riskLevel.ControlMeasures;
this.txtRemark.Text = riskLevel.Remark;
}
}
}
}
#endregion
#region 保存数据
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.RiskLevelMenuId, Const.BtnSave))
{
Model.Base_RiskLevel riskLevel = null;
if (string.IsNullOrEmpty(this.RiskLevelId))
{
riskLevel= new Model.Base_RiskLevel();
}
else
{
riskLevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x=>x.RiskLevelId==this.RiskLevelId);
}
riskLevel.RiskLevelName = this.txtRiskLevelName.Text;
riskLevel.RiskLevel = int.Parse(this.txtRiskLevel.Text);
riskLevel.MinValue = int.Parse(this.txtMin.Text);
riskLevel.MaxValue = int.Parse(this.txtMax.Text);
riskLevel.Days = int.Parse(this.txtDays.Text);
riskLevel.ControlMeasures=this.txtControlMeasures.Text ;
riskLevel.Remark=this.txtRemark.Text ;
if (string.IsNullOrEmpty(this.RiskLevelId))
{
this.RiskLevelId = SQLHelper.GetNewID(typeof(Model.Base_RiskLevel));
riskLevel.RiskLevelId = this.RiskLevelId;
Funs.DB.Base_RiskLevel.InsertOnSubmit(riskLevel);
BLL.LogService.AddSys_Log(this.CurrUser, riskLevel.RiskLevelName, riskLevel.RiskLevelId, BLL.Const.HazardRegisterTypesMenuId,BLL.Const.BtnAdd);
}
else
{
BLL.LogService.AddSys_Log(this.CurrUser, riskLevel.RiskLevelName, riskLevel.RiskLevelId, BLL.Const.HazardRegisterTypesMenuId, BLL.Const.BtnModify);
}
Funs.DB.SubmitChanges();
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！");
}
}
#endregion
}
}

143
SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,143 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo
{
public partial class RiskLevelEdit
{
/// <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>
/// txtRiskLevelName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRiskLevelName;
/// <summary>
/// txtRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtRiskLevel;
/// <summary>
/// txtMin 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtMin;
/// <summary>
/// txtMax 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtMax;
/// <summary>
/// txtDays 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDays;
/// <summary>
/// NumberBox4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox NumberBox4;
/// <summary>
/// txtControlMeasures 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtControlMeasures;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}

6
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx
View File

@ -36,6 +36,12 @@
<f:DropDownList ID="drpUnitIds" runat="server" Label="参加单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" AutoSelectFirstItem="false" LabelWidth="140px"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtJoinPersonNum" NoDecimal="true" NoNegative="true" Label="参与人数" LabelAlign="Right" LabelWidth="140px"></f:NumberBox>
<f:TextBox ID="TextBox1" runat="server" Label="" MaxLength="50" Required="true" ShowRedStar="true" Hidden="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">

7
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
View File

@ -67,7 +67,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.drpUnitIds.SelectedValueArray = designDetails.UnitName.Split(',');
}
if (designDetails.JoinPersonNum != null)
{
this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString();
}
var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId);
if (currApprove != null)
@ -190,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
ids = ids.Substring(0, ids.LastIndexOf(","));
}
designDetails.UnitWorkId = ids;
designDetails.JoinPersonNum = Funs.GetNewIntOrZero(this.txtJoinPersonNum.Text.Trim());
string unitIds = string.Empty;
var units = this.drpUnitIds.SelectedValueArray;
foreach (var item in units)

60
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs generated
View File

@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class DesignDetailsEdit
{
namespace FineUIPro.Web.CQMS.Comprehensive {
public partial class DesignDetailsEdit {
/// <summary>
/// form1 控件。
/// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpCNProfessionalId 控件。
/// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessionalId;
/// <summary>
/// txtDesignDetailsCode 控件。
/// </summary>
@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDesignDetailsCode;
/// <summary>
/// txtDetailsMan 控件。
/// </summary>
@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDetailsMan;
/// <summary>
/// txtDetailsDate 控件。
/// </summary>
@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtDetailsDate;
/// <summary>
/// drpUnitWorks 控件。
/// </summary>
@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorks;
/// <summary>
/// drpUnitIds 控件。
/// </summary>
@ -94,7 +92,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitIds;
/// <summary>
/// txtJoinPersonNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtJoinPersonNum;
/// <summary>
/// TextBox1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox1;
/// <summary>
/// Panel2 控件。
/// </summary>
@ -103,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
@ -112,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
@ -121,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -130,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@ -139,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -148,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// </summary>

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
View File

@ -115,7 +115,7 @@
</f:Panel>
<f:Window ID="Window1" Title="机具报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="460px">
Width="900px" Height="510px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"

48
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx
View File

@ -49,29 +49,41 @@
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
<f:NumberBox ID="txtUnitsCount" runat="server" Label="台数" LabelWidth="110px" NoDecimal="true" NoNegative="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="报验日期" ID="txtInspectionDate"
LabelAlign="right" LabelWidth="140px">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="离场时间" ID="txtLeaveDate"
LabelAlign="right" LabelWidth="110px">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList runat="server" ID="rblIsOnSite" Label="是否在场" ShowRedStar="true" LabelWidth="140px">
<f:RadioButtonList runat="server" ID="rblIsCheckOK" Label="校验合格" LabelWidth="110px">
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtUnitsCount" runat="server" Label="台数" LabelWidth="140px" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="报验日期" ID="txtInspectionDate"
LabelAlign="right" LabelWidth="110px">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="离场时间" ID="txtLeaveDate"
LabelAlign="right" LabelWidth="140px">
</f:DatePicker>
<f:RadioButtonList runat="server" ID="rblIsOnSite" Label="是否在场" ShowRedStar="true" LabelWidth="110px">
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" ShowRedStar="true" runat="server" Label="上传附件"
LabelWidth="110px" LabelAlign="Right">
LabelWidth="140px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
@ -79,8 +91,6 @@
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow MarginTop="10px">
<Items>
<f:DropDownList runat="server" Width="300px" Label="专业工程师确认" LabelWidth="130px" ID="drpAudit" ShowRedStar="true" Required="true" EmptyText="--请选择--">

7
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
View File

@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
if (CurrUser.UnitId == null || CurrUser.UnitId == Const.sysglyId)
if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_CD)
{
this.drpUnitId.Enabled = true;
}
@ -77,6 +77,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtTestCycle.Text = inspectionMachine.TestCycle;
this.rblIsVerification.SelectedValue = inspectionMachine.IsVerification.HasValue && inspectionMachine.IsVerification == true ? "true" : "false";
this.rblIsCheckOK.SelectedValue = inspectionMachine.IsCheckOK.HasValue && inspectionMachine.IsCheckOK == true ? "true" : "false";
if (inspectionMachine.InspectionDate != null)
{
this.txtInspectionDate.Text = string.Format("{0:yyyy-MM-dd}", inspectionMachine.InspectionDate);
@ -97,7 +98,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachine.InspectionMachineId);
if (currApprove != null)
{ //重新编制 编制人 可以 显示 提交 保存按钮
this.drpAudit.SelectedValue = currApprove.ApproveMan;
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionMachine.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
@ -209,6 +210,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
@ -288,6 +290,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);

77
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs generated
View File

@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class InspectionMachineEdit
{
namespace FineUIPro.Web.CQMS.Comprehensive {
public partial class InspectionMachineEdit {
/// <summary>
/// form1 控件。
/// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpUnitId 控件。
/// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// txtInspectionMachineCode 控件。
/// </summary>
@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInspectionMachineCode;
/// <summary>
/// txtInspectionMachineName 控件。
/// </summary>
@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInspectionMachineName;
/// <summary>
/// drpCNProfessionalId 控件。
/// </summary>
@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessionalId;
/// <summary>
/// rblInspectionType 控件。
/// </summary>
@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblInspectionType;
/// <summary>
/// txtSpecificationModel 控件。
/// </summary>
@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecificationModel;
/// <summary>
/// txtNextTestDate 控件。
/// </summary>
@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtNextTestDate;
/// <summary>
/// txtTestCycle 控件。
/// </summary>
@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTestCycle;
/// <summary>
/// rblIsVerification 控件。
/// </summary>
@ -121,7 +119,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsVerification;
/// <summary>
/// rblIsCheckOK 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsCheckOK;
/// <summary>
/// txtUnitsCount 控件。
/// </summary>
@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtUnitsCount;
/// <summary>
/// txtInspectionDate 控件。
/// </summary>
@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtInspectionDate;
/// <summary>
/// txtLeaveDate 控件。
/// </summary>
@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLeaveDate;
/// <summary>
/// rblIsOnSite 控件。
/// </summary>
@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsOnSite;
/// <summary>
/// Panel2 控件。
/// </summary>
@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// drpAudit 控件。
/// </summary>
@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAudit;
/// <summary>
/// agree 控件。
/// </summary>
@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow agree;
/// <summary>
/// rblIsAgree 控件。
/// </summary>
@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAgree;
/// <summary>
/// options 控件。
/// </summary>
@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options;
/// <summary>
/// txtidea 控件。
/// </summary>
@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtidea;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@ -247,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -256,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@ -265,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// WindowAtt 控件。
/// </summary>

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
View File

@ -62,6 +62,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList runat="server" ID="rblIsTrain" Label="培训" ShowRedStar="true" LabelWidth="150px" LabelAlign="Right">
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="150" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
</Items>
</f:FormRow>

19
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
View File

@ -75,6 +75,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.txtApprovalTime.Text = string.Format("{0:yyyy-MM-dd}", inspectionPerson.ApprovalTime);
}
this.rblIsTrain.SelectedValue = inspectionPerson.IsTrain.HasValue && inspectionPerson.IsTrain == true ? "true" : "false";
this.rblIsOnSite.SelectedValue = inspectionPerson.IsOnSite.HasValue && inspectionPerson.IsOnSite == true ? "true" : "false";
if (inspectionPerson.DepartureTime != null)
{
@ -266,7 +267,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
inspectionPerson.IsOnSite = false;
}
if (this.rblIsTrain.SelectedValue == "true")
{
inspectionPerson.IsTrain = true;
}
else
{
inspectionPerson.IsTrain = false;
}
if (!string.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
{
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
@ -415,7 +423,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
inspectionPerson.IsOnSite = false;
}
if (this.rblIsTrain.SelectedValue == "true")
{
inspectionPerson.IsTrain = true;
}
else
{
inspectionPerson.IsTrain = false;
}
if (!string.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
{
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());

77
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs generated
View File

@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class InspectionPersonEdit
{
namespace FineUIPro.Web.CQMS.Comprehensive {
public partial class InspectionPersonEdit {
/// <summary>
/// form1 控件。
/// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpUnitId 控件。
/// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// txtInspectionCode 控件。
/// </summary>
@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInspectionCode;
/// <summary>
/// drpCNProfessionalId 控件。
/// </summary>
@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessionalId;
/// <summary>
/// drpUnitWorkIds 控件。
/// </summary>
@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkIds;
/// <summary>
/// drpPostId 控件。
/// </summary>
@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPostId;
/// <summary>
/// txtPersonName 控件。
/// </summary>
@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// txtCertificateNumber 控件。
/// </summary>
@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateNumber;
/// <summary>
/// txtQualifiedProjectCode 控件。
/// </summary>
@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtQualifiedProjectCode;
/// <summary>
/// txtApprovalTime 控件。
/// </summary>
@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtApprovalTime;
/// <summary>
/// txtValidityDate 控件。
/// </summary>
@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtValidityDate;
/// <summary>
/// txtDepartureTime 控件。
/// </summary>
@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtDepartureTime;
/// <summary>
/// rblIsOnSite 控件。
/// </summary>
@ -148,7 +146,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsOnSite;
/// <summary>
/// rblIsTrain 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsTrain;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// Panel2 控件。
/// </summary>
@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// drpAudit 控件。
/// </summary>
@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAudit;
/// <summary>
/// agree 控件。
/// </summary>
@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow agree;
/// <summary>
/// rblIsAgree 控件。
/// </summary>
@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAgree;
/// <summary>
/// options 控件。
/// </summary>
@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options;
/// <summary>
/// txtidea 控件。
/// </summary>
@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtidea;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@ -247,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -256,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@ -265,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// WindowAtt 控件。
/// </summary>

13
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
View File

@ -42,6 +42,17 @@
<Items>
<f:TextBox ID="txtClass" runat="server" Label="控制等级" LabelWidth="180px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="180px">
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="tr1">
<Items>
@ -50,7 +61,7 @@
</f:FormRow>
<f:FormRow runat="server" ID="tr2">
<Items>
<f:TextBox ID="WuHuan" runat="server" Label="公司" LabelWidth="180px"></f:TextBox>
<f:TextBox ID="WuHuan" runat="server" Label="五环" LabelWidth="180px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="tr3">

45
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs
View File

@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
string divisionId = Request.Params["divisionId"];
BreakdownId = Request.Params["breakdownId"];
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
Model.WBS_Breakdown breakdown = BLL.BreakdownService.GetBreakdownById(BreakdownId);
var division = BLL.DivisionService.GetDivisionById(divisionId);
if (division != null)
@ -77,6 +78,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.txtSortIndex.Text = breakdown.SortIndex.ToString();
}
if (!string.IsNullOrEmpty(breakdown.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = breakdown.CheckAcceptType;
}
this.txtRemark.Text = breakdown.Remark;
}
}
@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.WuHuan = this.WuHuan.Text.Trim();
newBreakdown.JianLi = this.JianLi.Text.Trim();
newBreakdown.YeZhu = this.YeZhu.Text.Trim();
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@ -136,42 +145,6 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.BreakdownId = this.BreakdownId;
}
BLL.BreakdownService.AddBreakdown(newBreakdown);
//增加项目单位工程记录
var projects = BLL.ProjectService.GetProjectWorkList();
foreach (var project in projects)
{
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == project.ProjectId orderby x.UnitWorkCode select x;
foreach (var unitWork in unitWorks)
{
var divisionProject = BLL.DivisionProjectService.GetDivisionProjectByUnitWorkIdAndOldDivisionId(unitWork.UnitWorkId, divisionId);
if (divisionProject != null)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = project.ProjectId;
bp.BreakdownCode = newBreakdown.BreakdownCode;
bp.BreakdownName = newBreakdown.BreakdownName;
bp.DivisionProjectId = divisionProject.DivisionProjectId;
bp.Basis = newBreakdown.Basis;
bp.CheckPoints = newBreakdown.CheckPoints;
bp.RecordAndCode = newBreakdown.RecordAndCode;
bp.Class = newBreakdown.Class;
bp.SortIndex = newBreakdown.SortIndex;
bp.Remark = newBreakdown.Remark;
bp.ModelURL = newBreakdown.ModelURL;
bp.UnitWorkId = unitWork.UnitWorkId;
bp.IsAcceptance = newBreakdown.IsAcceptance;
bp.IsYellow = newBreakdown.IsYellow;
bp.WuHuan = newBreakdown.WuHuan;
bp.JianLi = newBreakdown.JianLi;
bp.FenBao = newBreakdown.FenBao;
bp.YeZhu = newBreakdown.YeZhu;
bp.SourceBreakdownId = newBreakdown.BreakdownId;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
}
}
BLL.LogService.AddSys_Log(this.CurrUser, newBreakdown.BreakdownCode, newBreakdown.BreakdownId, BLL.Const.ControlPointMenuId, "添加分项工程信息！");
}
if (Request.Params["type"] == "modify")

9
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs generated
View File

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

13
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
View File

@ -42,6 +42,17 @@
<Items>
<f:TextBox ID="txtClass" runat="server" Label="控制等级" LabelWidth="180px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="180px">
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="tr1">
<Items>
@ -50,7 +61,7 @@
</f:FormRow>
<f:FormRow runat="server" ID="tr2">
<Items>
<f:TextBox ID="WuHuan" runat="server" Label="公司" LabelWidth="180px"></f:TextBox>
<f:TextBox ID="WuHuan" runat="server" Label="五环" LabelWidth="180px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="tr3">

11
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
View File

@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
string divisionProjectId = Request.Params["divisionProjectId"];
BreakdownProjectId = Request.Params["breakdownProjectId"];
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(BreakdownProjectId);
var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId);
if (division != null)
@ -73,6 +74,10 @@ namespace FineUIPro.Web.CQMS.WBS
this.JianLi.Text = breakdownProject.JianLi;
this.WuHuan.Text = breakdownProject.WuHuan;
this.FenBao.Text = breakdownProject.FenBao;
if (!string.IsNullOrEmpty(breakdownProject.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = breakdownProject.CheckAcceptType;
}
if (breakdownProject.SortIndex != null)
{
this.txtSortIndex.Text = breakdownProject.SortIndex.ToString();
@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.WuHuan = this.WuHuan.Text.Trim();
newBreakdown.JianLi = this.JianLi.Text.Trim();
newBreakdown.YeZhu = this.YeZhu.Text.Trim();
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@ -143,7 +152,9 @@ namespace FineUIPro.Web.CQMS.WBS
}
if (Request.Params["type"] == "modify")
{
Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(BreakdownProjectId);
newBreakdown.BreakdownProjectId = BreakdownProjectId;
newBreakdown.IsSelected = breakdownProject.IsSelected;
BLL.BreakdownProjectService.UpdateBreakdownProject(newBreakdown);
BLL.LogService.AddSys_Log(this.CurrUser, newBreakdown.BreakdownCode, BreakdownProjectId, BLL.Const.ProjectControlPointMenuId, "修改分项工程信息！");
}

9
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs generated
View File

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

10
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx
View File

@ -23,6 +23,16 @@
<f:TextBox ID="txtDivisionCode" runat="server" Label="序号" LabelWidth="130px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpSubItemType" Label="分部分项类型" LabelWidth="130px">
<f:ListItem Value="1" Text="分部" />
<f:ListItem Value="2" Text="子分部" />
<f:ListItem Value="3" Text="分项" />
<f:ListItem Value="4" Text="子分项" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelWidth="130px" NoDecimal="true" NoNegative="true"></f:NumberBox>

57
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs
View File

@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
string selectedCode = Request.Params["selectedCode"];
Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode);
@ -50,6 +51,10 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_Division divisionProject = BLL.DivisionService.GetDivisionById(selectedCode);
this.txtDivisionCode.Text = divisionProject.DivisionCode;
this.txtDivisionName.Text = divisionProject.DivisionName;
if (!string.IsNullOrEmpty(divisionProject.SubItemType))
{
this.drpSubItemType.SelectedValue = divisionProject.SubItemType;
}
if (divisionProject.SortIndex != null)
{
this.txtSortIndex.Text = divisionProject.SortIndex.ToString();
@ -65,6 +70,11 @@ namespace FineUIPro.Web.CQMS.WBS
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim()))
{
string selectedCode = Request.Params["selectedCode"];
@ -75,6 +85,7 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_Division newDivision = new Model.WBS_Division();
newDivision.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivision.DivisionName = this.txtDivisionName.Text.Trim();
newDivision.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@ -102,51 +113,6 @@ namespace FineUIPro.Web.CQMS.WBS
newDivision.SuperDivisionId = selectedCode;
}
BLL.DivisionService.AddDivision(newDivision);
//增加项目单位工程记录
var projects = BLL.ProjectService.GetProjectWorkList();
foreach (var project in projects)
{
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == project.ProjectId orderby x.UnitWorkCode select x;
foreach (var unitWork in unitWorks)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim();
newDivisionProject.UnitWorkId = unitWork.UnitWorkId;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
{
newDivisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
}
catch (Exception)
{
ShowNotify("排序只能为整数！", MessageBoxIcon.Warning);
return;
}
}
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
newDivisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
}
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
if (cNProfessional != null) //专业节点增加分部
{
newDivisionProject.CNProfessionalId = selectedCode;
}
if (divisionProject != null) //分部节点增加子分部
{
var dp = BLL.DivisionProjectService.GetDivisionProjectByUnitWorkIdAndOldDivisionId(unitWork.UnitWorkId, selectedCode);
if (dp != null)
{
newDivisionProject.SuperDivisionId = dp.DivisionProjectId;
}
}
newDivisionProject.ProjectId = project.ProjectId;
newDivisionProject.OldDivisionId = newDivision.DivisionId;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject);
}
}
BLL.LogService.AddSys_Log(this.CurrUser, newDivision.DivisionCode, newKeyID, BLL.Const.ProjectControlPointMenuId, "添加分部或子分部工程信息！");
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(newKeyID) + ActiveWindow.GetHidePostBackReference());
}
@ -154,6 +120,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
divisionProject.DivisionName = this.txtDivisionName.Text.Trim();
divisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());

9
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs generated
View File

@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtDivisionCode;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// txtSortIndex 控件。
/// </summary>

10
SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx
View File

@ -23,6 +23,16 @@
<f:TextBox ID="txtDivisionCode" runat="server" Label="序号" LabelWidth="130px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpSubItemType" Label="分部分项类型" LabelWidth="130px">
<f:ListItem Value="1" Text="分部" />
<f:ListItem Value="2" Text="子分部" />
<f:ListItem Value="3" Text="分项" />
<f:ListItem Value="4" Text="子分项" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelWidth="130px" NoDecimal="true" NoNegative="true"></f:NumberBox>

12
SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs
View File

@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
string selectedCode = Request.Params["selectedCode"];
Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode);
@ -51,6 +52,10 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(selectedCode);
this.txtDivisionCode.Text = divisionProject.DivisionCode;
this.txtDivisionName.Text = divisionProject.DivisionName;
if (!string.IsNullOrEmpty(divisionProject.SubItemType))
{
this.drpSubItemType.SelectedValue = divisionProject.SubItemType;
}
if (divisionProject.SortIndex != null)
{
this.txtSortIndex.Text = divisionProject.SortIndex.ToString();
@ -66,6 +71,11 @@ namespace FineUIPro.Web.CQMS.WBS
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim()))
{
string selectedCode = Request.Params["selectedCode"];
@ -77,6 +87,7 @@ namespace FineUIPro.Web.CQMS.WBS
newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim();
newDivisionProject.UnitWorkId = Request.Params["unitWorkId"];
newDivisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@ -112,6 +123,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
divisionProject.DivisionName = this.txtDivisionName.Text.Trim();
divisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());

9
SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs generated
View File

@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtDivisionCode;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// txtSortIndex 控件。
/// </summary>

110
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
View File

@ -200,37 +200,97 @@ namespace FineUIPro.Web.CQMS.WBS
{
cNProfessionalId = e.NodeID.Split('|')[1];
}
var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
orderby x.SortIndex
select x).ToList();
foreach (var q in divisions)
if (cNProfessionalId == BLL.Const.CNProfessionalConstructId)
{
TreeNode newNode = new TreeNode();
newNode.Text = q.DivisionName;
newNode.NodeID = q.DivisionProjectId;
newNode.CommandName = "DivisionProject";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
newNode.EnableCheckBox = true;
newNode.EnableCheckEvent = true;
e.Node.Nodes.Add(newNode);
if (q.IsSelected == true)
{
newNode.Checked = true;
}
var list = (from x in Funs.DB.WBS_DivisionProject
where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
orderby x.SortIndex
select x).ToList();
if (list.Count > 0)
var divisionsCV = (from x in BLL.Funs.DB.WBS_DivisionProject
where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
orderby x.SortIndex
select x).ToList();
if (divisionsCV.Count > 0) //建筑工程下存在土建内容
{
TreeNode newNode = new TreeNode();
newNode.Text = "土建";
newNode.NodeID = BLL.Const.CNProfessionalCVId;
newNode.CommandName = "CNProfessional";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newNode.Nodes.Add(tempNode);
}
else
{
var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
orderby x.SortIndex
select x).ToList();
foreach (var q in divisions)
{
TreeNode newNode = new TreeNode();
newNode.Text = q.DivisionName;
newNode.NodeID = q.DivisionProjectId;
newNode.CommandName = "DivisionProject";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
newNode.EnableCheckEvent = true;
e.Node.Nodes.Add(newNode);
if (q.IsSelected == true)
{
newNode.Checked = true;
}
var list = (from x in Funs.DB.WBS_DivisionProject
where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
orderby x.SortIndex
select x).ToList();
if (list.Count > 0)
{
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
newNode.Nodes.Add(tempNode);
}
}
}
}
else
{
var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
orderby x.SortIndex
select x).ToList();
foreach (var q in divisions)
{
TreeNode newNode = new TreeNode();
newNode.Text = q.DivisionName;
newNode.NodeID = q.DivisionProjectId;
newNode.CommandName = "DivisionProject";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
newNode.EnableCheckBox = true;
newNode.EnableCheckEvent = true;
e.Node.Nodes.Add(newNode);
if (q.IsSelected == true)
{
newNode.Checked = true;
}
var list = (from x in Funs.DB.WBS_DivisionProject
where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
orderby x.SortIndex
select x).ToList();
if (list.Count > 0)
{
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
newNode.Nodes.Add(tempNode);
}
}
}
}
else if (e.Node.CommandName == "DivisionProject") //展开分部节点
@ -303,8 +363,8 @@ namespace FineUIPro.Web.CQMS.WBS
{
if (string.IsNullOrEmpty(superDivisionProject.SuperDivisionId))
{
// if (!string.IsNullOrEmpty(superDivisionProject.CNProfessionalId))
//{
// if (!string.IsNullOrEmpty(superDivisionProject.CNProfessionalId))
//{
superDivisionProject.IsSelected = b;
BLL.DivisionProjectService.UpdateDivisionProject(superDivisionProject);
}

2
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
View File

@ -27,7 +27,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
}
}

2
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
}
}

4
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
View File

@ -21,9 +21,9 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
// 绑定表格t
BindGrid();
this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
}
}

2
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
View File

@ -26,7 +26,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
}
}

2
SGGL/FineUIPro.Web/DataShow/Environmental.aspx
View File

@ -61,7 +61,7 @@
<f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption"
FieldType="Double" HeaderText="能耗总量(万吨标准煤)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption"
<f:RenderField Width="250px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption"
FieldType="Double" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CO2" DataField="CO2"

6
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
View File

@ -36,11 +36,11 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT NEWID() AS ID,Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
string strSql = @"SELECT NEWID() AS ID,Project.ProjectId,Project.ProjectCode,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
FROM CH_CheckItem AS Item
LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId
WHERE 1=1 ";
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
@ -59,7 +59,7 @@ namespace FineUIPro.Web.DataShow
// strSql += " AND h.RegisterDate <=@EndTime";
// listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
//}
strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Defects_Definition";
strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Project.ProjectCode,Defects_Definition";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;

2
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

4
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
View File

@ -168,7 +168,7 @@ namespace FineUIPro.Web.DataShow
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
url = BLL.UploadAttachmentService.ShowImage("../", registration.ImageUrl);
}
}
return url;
@ -194,7 +194,7 @@ namespace FineUIPro.Web.DataShow
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
url = BLL.UploadAttachmentService.ShowImage("../", registration.RectificationImageUrl);
}
}
return url;

2
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
View File

@ -44,7 +44,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/License.aspx.cs
View File

@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
string strSql = string.Empty;
List<SqlParameter> listStr = new List<SqlParameter>();
strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName
strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName,V.IsHighRisk
,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.WorkStatesStr,V.LicenseTypeId,V.UnitId,V.LicenseManageContents
,V.CompileMan,V.CompileDate,V.States,V.UserName
FROM View_License_LicenseManager AS V

2
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
View File

@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+ @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
+ @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) and (Project.isDelete IS NULL OR Project.isDelete =0) ";
+ @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.ckState.SelectedValue != "0")

2
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
View File

@ -28,7 +28,7 @@
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
<f:RadioButtonList runat="server" ID="rbType" Width="650px" Label="类型" LabelWidth="50px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
<f:RadioItem Text="总监" Value="0" Selected="true" />
<f:RadioItem Text="专职" Value="1" />

4
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
View File

@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量验收" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
@ -26,7 +26,7 @@
<f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
<f:RadioButtonList runat="server" ID="rbType" Width="640px" Label="类型" LabelWidth="50px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
<f:RadioItem Text="关键工序" Value="1" Selected="true" />
<f:RadioItem Text="特殊过程" Value="2" />

4
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
View File

@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
}
}
#endregion
@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
View File

@ -68,7 +68,7 @@
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="C级" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count4" Width="120px" HeaderText="C级" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>

2
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
View File

@ -36,7 +36,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
View File

@ -57,7 +57,7 @@ namespace FineUIPro.Web.DataShow
}
else
{
strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' when '2' then '女' else '男' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark
strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark
FROM SitePerson_Person AS Person
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId

2
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

4
SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
View File

@ -150,7 +150,7 @@ namespace FineUIPro.Web.DataShow
if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
}
url = BLL.UploadAttachmentService.ShowImage(httpUrl, AttachUrl.TrimEnd(','));
url = BLL.UploadAttachmentService.ShowImage("../", AttachUrl.TrimEnd(','));
}
}
return url;
@ -176,7 +176,7 @@ namespace FineUIPro.Web.DataShow
if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
}
url = BLL.UploadAttachmentService.ShowImage(httpUrl, AttachUrl.TrimEnd(','));
url = BLL.UploadAttachmentService.ShowImage("../", AttachUrl.TrimEnd(','));
}
}
return url;

2
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
View File

@ -36,7 +36,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
View File

@ -44,7 +44,7 @@ namespace FineUIPro.Web.DataShow
{
string strSql = @"select Item.HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
, Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,HazardJudge_D,Item.HazardJudge_E
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
,level.RiskLevelName,Item.ControlMeasures
from Hazard_HazardSelectedItem AS Item
LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId

14
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
@ -171,7 +171,7 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.SitePerson_DayReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
where y.ProjectState == Const.ProjectState_1
select x;
if (datetime1.HasValue)
{
@ -207,11 +207,11 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.Accident_AccidentHandle
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
where y.ProjectState == Const.ProjectState_1
select x;
var getD2 = from x in Funs.DB.Accident_AccidentReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
where y.ProjectState == Const.ProjectState_1
select x;
if (datetime1.HasValue)
{
@ -249,16 +249,16 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getC1 = from x in Funs.DB.SitePerson_DayReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
where y.ProjectState == Const.ProjectState_1
select x;
var getD1 = from x in Funs.DB.Accident_AccidentHandle
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
where y.ProjectState == Const.ProjectState_1
select x;
var getD2 = from x in Funs.DB.Accident_AccidentReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
where y.ProjectState == Const.ProjectState_1
select x;
if (datetime1.HasValue)

2031
SGGL/FineUIPro.Web/ErrLog.txt
View File

File diff suppressed because it is too large Load Diff

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

@ -74,9 +74,8 @@
<Reference Include="AxInterop.SYNCARDOCXLib">
<HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\BouncyCastle.Crypto.dll</HintPath>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="FastReport">
<HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
@ -249,6 +248,8 @@
<Content Include="BaseInfo\QuestionType.aspx" />
<Content Include="BaseInfo\RectificationMeasure.aspx" />
<Content Include="BaseInfo\RectificationMeasureEdit.aspx" />
<Content Include="BaseInfo\RiskLevel.aspx" />
<Content Include="BaseInfo\RiskLevelEdit.aspx" />
<Content Include="BaseInfo\RulesRegulationsType.aspx" />
<Content Include="BaseInfo\SafetyMeasures.aspx" />
<Content Include="BaseInfo\SafetyMeasuresEdit.aspx" />
@ -955,10 +956,13 @@
<Content Include="HSSE\Hazard\EnvironmentalRiskList.aspx" />
<Content Include="HSSE\Hazard\EnvironmentalRiskListEdit.aspx" />
<Content Include="HSSE\Hazard\EnvironmentalRiskListView.aspx" />
<Content Include="HSSE\Hazard\HazardInfo.aspx" />
<Content Include="HSSE\Hazard\HazardInfoEdit.aspx" />
<Content Include="HSSE\Hazard\HazardList.aspx" />
<Content Include="HSSE\Hazard\HazardListEdit.aspx" />
<Content Include="HSSE\Hazard\HazardListView.aspx" />
<Content Include="HSSE\Hazard\HazardPrompt.aspx" />
<Content Include="HSSE\Hazard\HazardReEvaluator.aspx" />
<Content Include="HSSE\Hazard\HazardTemplate.aspx" />
<Content Include="HSSE\Hazard\MajorHazardList.aspx" />
<Content Include="HSSE\Hazard\OtherHazard.aspx" />
@ -966,6 +970,10 @@
<Content Include="HSSE\Hazard\OtherHazardView.aspx" />
<Content Include="HSSE\Hazard\Response.aspx" />
<Content Include="HSSE\Hazard\ResponseItem.aspx" />
<Content Include="HSSE\Hazard\RiskControl.aspx" />
<Content Include="HSSE\Hazard\RoutingInspection.aspx" />
<Content Include="HSSE\Hazard\RoutingInspectionEdit.aspx" />
<Content Include="HSSE\Hazard\RoutingInspectionView.aspx" />
<Content Include="HSSE\Hazard\SetToolTipTime.aspx" />
<Content Include="HSSE\Hazard\ShowEnvironmentalItem.aspx" />
<Content Include="HSSE\Hazard\ShowHazardList.aspx" />
@ -2005,6 +2013,7 @@
<Content Include="ZHGL\Person\CompanyPersonEdit.aspx" />
<Content Include="ZHGL\Person\CompanyPersonIn.aspx" />
<Content Include="ZHGL\Person\CompanyPersonView.aspx" />
<Content Include="ZHGL\Person\ProjectPerson.aspx" />
<Content Include="ZHGL\ProjectAccident\AccidentAnalysis.aspx" />
<Content Include="ZHGL\ProjectAccident\AccidentAnalysisEdit.aspx" />
<Content Include="ZHGL\ProjectAccident\AccidentData.aspx" />
@ -6366,6 +6375,20 @@
<Compile Include="BaseInfo\RectificationMeasureEdit.aspx.designer.cs">
<DependentUpon>RectificationMeasureEdit.aspx</DependentUpon>
</Compile>
<Compile Include="BaseInfo\RiskLevel.aspx.cs">
<DependentUpon>RiskLevel.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BaseInfo\RiskLevel.aspx.designer.cs">
<DependentUpon>RiskLevel.aspx</DependentUpon>
</Compile>
<Compile Include="BaseInfo\RiskLevelEdit.aspx.cs">
<DependentUpon>RiskLevelEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BaseInfo\RiskLevelEdit.aspx.designer.cs">
<DependentUpon>RiskLevelEdit.aspx</DependentUpon>
</Compile>
<Compile Include="BaseInfo\RulesRegulationsType.aspx.cs">
<DependentUpon>RulesRegulationsType.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -11155,6 +11178,20 @@
<Compile Include="HSSE\Hazard\EnvironmentalRiskListView.aspx.designer.cs">
<DependentUpon>EnvironmentalRiskListView.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\HazardInfo.aspx.cs">
<DependentUpon>HazardInfo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\HazardInfo.aspx.designer.cs">
<DependentUpon>HazardInfo.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\HazardInfoEdit.aspx.cs">
<DependentUpon>HazardInfoEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\HazardInfoEdit.aspx.designer.cs">
<DependentUpon>HazardInfoEdit.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\HazardList.aspx.cs">
<DependentUpon>HazardList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -11183,6 +11220,13 @@
<Compile Include="HSSE\Hazard\HazardPrompt.aspx.designer.cs">
<DependentUpon>HazardPrompt.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\HazardReEvaluator.aspx.cs">
<DependentUpon>HazardReEvaluator.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\HazardReEvaluator.aspx.designer.cs">
<DependentUpon>HazardReEvaluator.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\HazardTemplate.aspx.cs">
<DependentUpon>HazardTemplate.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -11232,6 +11276,34 @@
<Compile Include="HSSE\Hazard\ResponseItem.aspx.designer.cs">
<DependentUpon>ResponseItem.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\RiskControl.aspx.cs">
<DependentUpon>RiskControl.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\RiskControl.aspx.designer.cs">
<DependentUpon>RiskControl.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\RoutingInspection.aspx.cs">
<DependentUpon>RoutingInspection.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\RoutingInspection.aspx.designer.cs">
<DependentUpon>RoutingInspection.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\RoutingInspectionEdit.aspx.cs">
<DependentUpon>RoutingInspectionEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\RoutingInspectionEdit.aspx.designer.cs">
<DependentUpon>RoutingInspectionEdit.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\RoutingInspectionView.aspx.cs">
<DependentUpon>RoutingInspectionView.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Hazard\RoutingInspectionView.aspx.designer.cs">
<DependentUpon>RoutingInspectionView.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Hazard\SetToolTipTime.aspx.cs">
<DependentUpon>SetToolTipTime.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -16890,6 +16962,13 @@
<Compile Include="ZHGL\Person\CompanyPersonView.aspx.designer.cs">
<DependentUpon>CompanyPersonView.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\Person\ProjectPerson.aspx.cs">
<DependentUpon>ProjectPerson.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ZHGL\Person\ProjectPerson.aspx.designer.cs">
<DependentUpon>ProjectPerson.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\ProjectAccident\AccidentAnalysis.aspx.cs">
<DependentUpon>AccidentAnalysis.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

8
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx
View File

@ -35,10 +35,10 @@
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true"
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" Text="查询"
OnClick="TextBox_TextChanged" runat="server" >
</f:Button>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
runat="server">
</f:Button>
</Items>
@ -91,10 +91,6 @@
<f:RenderField Width="100px" ColumnID="HssePersons" DataField="HssePersons" SortField="HssePersons"
FieldType="String" HeaderText="责任区安全员" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

4
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.cs
View File

@ -193,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Accident
var accidentPersonRecord = BLL.AccidentPersonRecordService.GetAccidentPersonRecordById(id);
if (accidentPersonRecord != null)
{
if (this.btnMenuEdit.Hidden || accidentPersonRecord.States == BLL.Const.State_2) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
if (this.btnMenuEdit.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("AccidentPersonRecordView.aspx?AccidentPersonRecordId={0}", id, "查看 - ")));
}
@ -225,7 +225,7 @@ namespace FineUIPro.Web.HSSE.Accident
BLL.AccidentPersonRecordService.DeleteAccidentPersonRecordById(rowID);
}
}
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
this.BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}

22
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx
View File

@ -1,8 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentPersonRecordEdit.aspx.cs"
Inherits="FineUIPro.Web.HSSE.Accident.AccidentPersonRecordEdit" ValidateRequest="false" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
@ -46,6 +44,11 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂"> </f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
@ -74,14 +77,6 @@
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@ -93,13 +88,10 @@
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Text="保存"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</Items>
</f:Toolbar>

70
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx.cs
View File

@ -92,6 +92,10 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.drpInjury.SelectedValue = accidentPersonRecord.Injury;
}
if (!string.IsNullOrEmpty(accidentPersonRecord.IsAttempt)&& accidentPersonRecord.IsAttempt=="1")
{
this.ckIsAttempt.Checked = true;
}
this.txtInjuryPart.Text = accidentPersonRecord.InjuryPart;
this.txtHssePersons.Text = accidentPersonRecord.HssePersons;
this.txtInjuryResult.Text = accidentPersonRecord.InjuryResult;
@ -110,11 +114,6 @@ namespace FineUIPro.Web.HSSE.Accident
// this.txtFileContents.Text = HttpUtility.HtmlDecode(codeTemplateRule.Template);
//}
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectAccidentPersonRecordMenuId;
this.ctlAuditFlow.DataId = this.AccidentPersonRecordId;
this.ctlAuditFlow.ProjectId = this.ProjectId;
this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
}
}
#endregion
@ -124,13 +123,13 @@ namespace FineUIPro.Web.HSSE.Accident
/// </summary>
private void InitDropDownList()
{
AccidentTypeService.InitAccidentTypeDropDownList(this.drpAccidentTypeId,true);
AccidentTypeService.InitAccidentTypeDropDownList(this.drpAccidentTypeId, true);
UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.ProjectId, true);
PersonService.InitPersonByProjectUnitDropDownList(this.drpPersonId, this.ProjectId, string.Empty, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpInjury, ConstValue.Group_Accident, true);
}
#region 保存、提交
#region 保存
/// <summary>
/// 保存按钮
/// </summary>
@ -157,37 +156,6 @@ namespace FineUIPro.Web.HSSE.Accident
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (this.drpAccidentTypeId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择事故类别！", MessageBoxIcon.Warning);
return;
}
if (this.drpWorkAreaId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择单位工程！", MessageBoxIcon.Warning);
return;
}
if (this.drpPersonId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择人员姓名！", MessageBoxIcon.Warning);
return;
}
if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
{
ShowNotify("请选择下一步办理人！", MessageBoxIcon.Warning);
return;
}
this.SaveData(BLL.Const.BtnSubmit);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 保存数据
/// </summary>
@ -218,7 +186,14 @@ namespace FineUIPro.Web.HSSE.Accident
{
accidentPersonRecord.Injury = this.drpInjury.SelectedValue;
}
if (this.ckIsAttempt.Checked==true)
{
accidentPersonRecord.IsAttempt = "1";
}
else
{
accidentPersonRecord.IsAttempt = "0";
}
accidentPersonRecord.InjuryPart = this.txtInjuryPart.Text.Trim();
accidentPersonRecord.HssePersons = this.txtHssePersons.Text.Trim();
accidentPersonRecord.InjuryResult = this.txtInjuryResult.Text.Trim();
@ -227,19 +202,7 @@ namespace FineUIPro.Web.HSSE.Accident
accidentPersonRecord.FileContent = HttpUtility.HtmlEncode(this.txtFileContents.Text);
accidentPersonRecord.CompileMan = this.CurrUser.UserId;
accidentPersonRecord.CompileDate = DateTime.Now;
accidentPersonRecord.States = BLL.Const.State_0;
if (type == BLL.Const.BtnSubmit)
{
var flowOperate = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == this.AccidentPersonRecordId && x.State == BLL.Const.State_2 && x.IsClosed == true);
if (flowOperate != null)
{
accidentPersonRecord.States = BLL.Const.State_2;
}
else
{
accidentPersonRecord.States = this.ctlAuditFlow.NextStep;
}
}
accidentPersonRecord.States = BLL.Const.State_2;
if (!string.IsNullOrEmpty(this.AccidentPersonRecordId))
{
accidentPersonRecord.AccidentPersonRecordId = this.AccidentPersonRecordId;
@ -253,8 +216,7 @@ namespace FineUIPro.Web.HSSE.Accident
BLL.AccidentPersonRecordService.AddAccidentPersonRecord(accidentPersonRecord);
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, this.AccidentPersonRecordId, BLL.Const.ProjectAccidentPersonRecordMenuId, Const.BtnAdd);
}
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectAccidentPersonRecordMenuId, this.AccidentPersonRecordId, (type == BLL.Const.BtnSubmit ? true : false), this.drpPersonId.SelectedText, "../Accident/AccidentPersonRecordView.aspx?AccidentPersonRecordId={0}");
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
}
#endregion

90
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Accident {
public partial class AccidentPersonRecordEdit {
namespace FineUIPro.Web.HSSE.Accident
{
public partial class AccidentPersonRecordEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// drpAccidentTypeId 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAccidentTypeId;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// txtAccidentDate 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtAccidentDate;
/// <summary>
/// drpPersonId 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPersonId;
/// <summary>
/// drpInjury 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInjury;
/// <summary>
/// txtInjuryPart 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtInjuryPart;
/// <summary>
/// txtHssePersons 控件。
/// </summary>
@ -110,7 +112,16 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHssePersons;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// txtInjuryResult 控件。
/// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtInjuryResult;
/// <summary>
/// txtPreventiveAction 控件。
/// </summary>
@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtPreventiveAction;
/// <summary>
/// txtHandleOpinion 控件。
/// </summary>
@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtHandleOpinion;
/// <summary>
/// txtFileContents 控件。
/// </summary>
@ -146,25 +157,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtFileContents;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -173,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbTemp 控件。
/// </summary>
@ -182,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTemp;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@ -191,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -200,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -209,16 +202,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -227,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Accident {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>

12
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx
View File

@ -1,8 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentPersonRecordView.aspx.cs"
Inherits="FineUIPro.Web.HSSE.Accident.AccidentPersonRecordView" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
@ -70,14 +68,6 @@
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@ -89,7 +79,7 @@
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</Items>
</f:Toolbar>

3
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx.cs
View File

@ -95,9 +95,6 @@ namespace FineUIPro.Web.HSSE.Accident
this.txtFileContents.Text = HttpUtility.HtmlDecode(accidentPersonRecord.FileContent);
}
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectAccidentPersonRecordMenuId;
this.ctlAuditFlow.DataId = this.AccidentPersonRecordId;
}
}
#endregion

18
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx.designer.cs generated
View File

@ -147,24 +147,6 @@ namespace FineUIPro.Web.HSSE.Accident {
/// </remarks>
protected global::FineUIPro.HtmlEditor txtFileContents;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
/// <summary>
/// Toolbar1 控件。
/// </summary>

10
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx
View File

@ -27,9 +27,9 @@
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server" >
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server" Text="查询" >
</f:Button>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
runat="server">
</f:Button>
</Items>
@ -69,10 +69,6 @@
<f:RenderField Width="100px" ColumnID="EconomicLoss" DataField="EconomicLoss" SortField="EconomicLoss"
FieldType="Float" HeaderText="经济损失" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -91,7 +87,7 @@
</f:Panel>
<f:Window ID="Window1" Title="事故调查报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
Height="600px">
Height="630px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"

6
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.cs
View File

@ -203,7 +203,7 @@ namespace FineUIPro.Web.HSSE.Accident
var accidentReport = BLL.AccidentReportService.GetAccidentReportById(id);
if (accidentReport != null)
{
if (this.btnMenuEdit.Hidden || accidentReport.States == BLL.Const.State_2) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
if (this.btnMenuEdit.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("AccidentReportView.aspx?AccidentReportId={0}", id, "查看 - ")));
}
@ -233,9 +233,11 @@ namespace FineUIPro.Web.HSSE.Accident
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.AccidentReportCode, getV.AccidentReportId, BLL.Const.ProjectAccidentReportMenuId, Const.BtnDelete);
BLL.AccidentReportService.DeleteAccidentReportById(rowID);
}
}
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkingHours);
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
this.BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}

368
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportEdit.aspx
View File

@ -1,8 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentReportEdit.aspx.cs"
Inherits="FineUIPro.Web.HSSE.Accident.AccidentReportEdit" ValidateRequest="false" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
@ -11,13 +9,12 @@
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css">
.BackColor
{
.BackColor {
color: Red;
background-color: Silver;
}
.titler
{
.titler {
color: Black;
font-size: medium;
}
@ -25,195 +22,176 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel2" runat="server" Height="80px" ShowBorder="false"
Title="事故调查报告表头" Layout="Table" TableConfigColumns="3" ShowHeader="false" BodyPadding="1px">
<Items>
<f:Panel ID="Panel1" Title="Panel1" Width="350px" Height="80px" MarginRight="0" TableRowspan="3"
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Image ID="Image1" runat="server" ImageUrl="../../Images/Null.jpg" LabelAlign="right">
</f:Image>
</Items>
</f:Panel>
<f:Panel ID="Panel3" Title="Panel1" Width="460px" Height="30px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false" BoxConfigAlign="Center">
<Items>
<f:Label ID="lblProjectName" runat="server" CssClass="titler" Margin="5 0 0 20">
</f:Label>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="Panel1" Width="250px" Height="30px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false" BoxConfigAlign="Center">
<Items>
<f:TextBox ID="txtAccidentReportName" runat="server" LabelAlign="Right" Width="250px">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel4" Title="Panel1" Width="300px" Height="50px" TableRowspan="2"
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Label ID="Label3" runat="server" Text="事故报告登记" CssClass="titler" Margin="5 0 0 95">
</f:Label>
</Items>
</f:Panel>
<f:Panel ID="Panel7" Title="Panel1" Width="250px" Height="30px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false">
<Items>
<f:TextBox ID="txtAccidentReportCode" runat="server" Label="事故编号" LabelAlign="Right"
LabelWidth="75px" Readonly="true">
</f:TextBox>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:TabStrip ID="TabStrip1" Height="220px" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
<Tabs>
<f:Tab ID="Tab1" Title="标签一" BodyPadding="5px" Layout="Fit" runat="server">
<Items>
<f:Form ID="Form2" runat="server" ShowHeader="false" AutoScroll="true">
<Items>
<f:FormRow>
<Items>
<f:DropDownList ID="drpAccidentTypeId" runat="server" Label="事故类型" LabelAlign="Right"
AutoPostBack="true" OnSelectedIndexChanged="drpAccidentTypeId_SelectedIndexChanged">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="frIsNotConfirm" Hidden="true">
<Items>
<f:RadioButtonList runat="server" ID="rbIsNotConfirm" Label="是否待定" Width="60px"
LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="rbIsNotConfirm_SelectedIndexChanged">
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Selected="true" Text="否" />
</f:RadioButtonList>
<f:Label runat="server" ID="lb1"></f:Label>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="frAbstract">
<Items>
<f:TextBox ID="txtAbstract" runat="server" Label="提要" LabelAlign="Right" ShowRedStar="true"
Required="true" MaxLength="20">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right"
EnableEdit="true" ShowRedStar="true" Required="true">
</f:DatePicker>
<f:TextBox ID="txtWorkArea" runat="server" Label="单位工程" LabelAlign="Right" MaxLength="200">
</f:TextBox>
<f:NumberBox ID="txtPeopleNum" runat="server" Label="人数" ShowRedStar="true" Required="true"
LabelAlign="Right" NoDecimal="true" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="trConfirm" ColumnWidths="40% 20% 20% 20%">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="事故责任单位" LabelAlign="Right" LabelWidth="120px">
</f:DropDownList>
<f:NumberBox ID="txtWorkingHoursLoss" runat="server" Label="工时损失" LabelAlign="Right"
NoDecimal="false" MinValue="0" NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtEconomicLoss" runat="server" Label="直接经济损失" LabelAlign="Right" LabelWidth="120px"
NoDecimal="false" MinValue="0" NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtEconomicOtherLoss" runat="server" Label="间接经济损失" LabelAlign="Right" LabelWidth="120px"
NoDecimal="false" MinValue="0" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="trNotConfirm" Hidden="true">
<Items>
<f:DropDownList ID="drpUnitId2" runat="server" Label="事故责任单位" LabelAlign="Right" >
</f:DropDownList>
<f:TextBox ID="txtNotConfirmWorkingHoursLoss" runat="server" Label="工时损失" LabelAlign="Right"
MaxLength="100">
</f:TextBox>
<f:TextBox ID="txtNotConfirmEconomicLoss" runat="server" Label="直接经济损失" LabelAlign="Right"
MaxLength="100">
</f:TextBox>
<f:TextBox ID="txtNotConfirmEconomicOtherLoss" runat="server" Label="间接经济损失" LabelAlign="Right"
MaxLength="100">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtReportMan" runat="server" Label="报告人" LabelAlign="Right" MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtReporterUnit" runat="server" Label="报告人单位" LabelAlign="Right" MaxLength="50">
</f:TextBox>
<f:DatePicker ID="txtReportDate" runat="server" Label="报告时间" LabelAlign="Right" EnableEdit="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtProcessDescription" runat="server" Label="事故过程描述" LabelAlign="Right"
MaxLength="500" Height="80px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtEmergencyMeasures" runat="server" Label="紧急措施" LabelAlign="Right"
MaxLength="500" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCompileMan" runat="server" Label="报告编制" LabelAlign="Right"
EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="txtCompileDate" runat="server" Label="日期" LabelAlign="Right" EnableEdit="true">
</f:DatePicker>
</Items>
</f:FormRow>
</Items>
</f:Form>
</Items>
</f:Tab>
<f:Tab ID="Tab2" Title="标签二" BodyPadding="5px" runat="server">
<Items>
<f:HtmlEditor runat="server" Label="事故调查报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="260" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
<f:Panel ID="Panel6" Title="Panel1" Height="160px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp">
</f:Label>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<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="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel2" runat="server" Height="80px" ShowBorder="false"
Title="事故调查报告表头" Layout="Table" TableConfigColumns="3" ShowHeader="false" BodyPadding="1px">
<Items>
<f:Panel ID="Panel1" Title="Panel1" Width="350px" Height="80px" MarginRight="0" TableRowspan="3"
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
</Items>
</f:Panel>
<f:Panel ID="Panel3" Title="Panel1" Width="460px" Height="30px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false" BoxConfigAlign="Center">
<Items>
<f:Label ID="lblProjectName" runat="server" CssClass="titler" Margin="5 0 0 20">
</f:Label>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="Panel1" Width="250px" Height="30px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false" BoxConfigAlign="Center">
<Items>
<f:TextBox ID="txtAccidentReportName" runat="server" LabelAlign="Right" Width="250px">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel4" Title="Panel1" Width="300px" Height="50px" TableRowspan="2"
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Label ID="Label3" runat="server" Text="事故报告登记" CssClass="titler" Margin="5 0 0 95">
</f:Label>
</Items>
</f:Panel>
<f:Panel ID="Panel7" Title="Panel1" Width="250px" Height="30px" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false">
<Items>
<f:TextBox ID="txtAccidentReportCode" runat="server" Label="事故编号" LabelAlign="Right"
LabelWidth="75px" Readonly="true">
</f:TextBox>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Panel ID="Panel6" Title="Panel1" runat="server" BodyPadding="1px"
ShowBorder="false" ShowHeader="false">
<Items>
<f:Form ID="Form2" runat="server" ShowHeader="false" AutoScroll="true">
<Items>
<f:FormRow>
<Items>
<f:DropDownList ID="drpAccidentTypeId" runat="server" Label="事故类型" LabelAlign="Right"
AutoPostBack="true" OnSelectedIndexChanged="drpAccidentTypeId_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpAccidentDegree" runat="server" Label="严重程度" LabelAlign="Right" >
<f:ListItem Value="1" Text="一般事故" />
<f:ListItem Value="2" Text="较大事故" />
<f:ListItem Value="3" Text="重大事故" />
<f:ListItem Value="4" Text="特别重大事故" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="frIsNotConfirm" Hidden="true">
<Items>
<f:RadioButtonList runat="server" ID="rbIsNotConfirm" Label="是否待定" Width="60px"
LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="rbIsNotConfirm_SelectedIndexChanged">
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Selected="true" Text="否" />
</f:RadioButtonList>
<f:Label runat="server" ID="lb1"></f:Label>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="frAbstract">
<Items>
<f:TextBox ID="txtAbstract" runat="server" Label="提要" LabelAlign="Right" ShowRedStar="true"
Required="true" MaxLength="20">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right"
EnableEdit="true" ShowRedStar="true" Required="true">
</f:DatePicker>
<f:TextBox ID="txtWorkArea" runat="server" Label="单位工程" LabelAlign="Right" MaxLength="200">
</f:TextBox>
<f:NumberBox ID="txtPeopleNum" runat="server" Label="人数" ShowRedStar="true" Required="true"
LabelAlign="Right" NoDecimal="true" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="trConfirm" ColumnWidths="40% 20% 20% 20%">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="事故责任单位" LabelAlign="Right" LabelWidth="120px">
</f:DropDownList>
<f:NumberBox ID="txtWorkingHoursLoss" runat="server" Label="工时损失" LabelAlign="Right"
NoDecimal="false" MinValue="0" NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtEconomicLoss" runat="server" Label="直接经济损失" LabelAlign="Right" LabelWidth="120px"
NoDecimal="false" MinValue="0" NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtEconomicOtherLoss" runat="server" Label="间接经济损失" LabelAlign="Right" LabelWidth="120px"
NoDecimal="false" MinValue="0" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="trNotConfirm" Hidden="true">
<Items>
<f:DropDownList ID="drpUnitId2" runat="server" Label="事故责任单位" LabelAlign="Right">
</f:DropDownList>
<f:TextBox ID="txtNotConfirmWorkingHoursLoss" runat="server" Label="工时损失" LabelAlign="Right"
MaxLength="100">
</f:TextBox>
<f:TextBox ID="txtNotConfirmEconomicLoss" runat="server" Label="直接经济损失" LabelAlign="Right"
MaxLength="100">
</f:TextBox>
<f:TextBox ID="txtNotConfirmEconomicOtherLoss" runat="server" Label="间接经济损失" LabelAlign="Right"
MaxLength="100">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtReportMan" runat="server" Label="报告人" LabelAlign="Right" MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtReporterUnit" runat="server" Label="报告人单位" LabelAlign="Right" MaxLength="50">
</f:TextBox>
<f:DatePicker ID="txtReportDate" runat="server" Label="报告时间" LabelAlign="Right" EnableEdit="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtProcessDescription" runat="server" Label="事故过程描述" LabelAlign="Right"
MaxLength="500" Height="80px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtEmergencyMeasures" runat="server" Label="紧急措施" LabelAlign="Right"
MaxLength="500" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCompileMan" runat="server" Label="报告编制" LabelAlign="Right"
EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="txtCompileDate" runat="server" Label="日期" LabelAlign="Right" EnableEdit="true">
</f:DatePicker>
</Items>
</f:FormRow>
</Items>
</f:Form>
</Items>
</f:Panel>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp">
</f:Label>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Text="保存"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</Items>
</f:Toolbar>
</form>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"

71
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportEdit.aspx.cs
View File

@ -48,19 +48,9 @@ namespace FineUIPro.Web.HSSE.Accident
{
if (!IsPostBack)
{
var unit = UnitService.GetUnitByUnitId(Const.UnitId_CD);
if (unit != null && !string.IsNullOrEmpty(unit.UnitCode))
{
string url = "../../Images/SUBimages/" + unit.UnitCode + ".jpg";
if (url.Contains('*'))
{
url = url.Replace('*', '-');
}
this.Image1.ImageUrl = url;
}
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.ProjectId = this.CurrUser.LoginProjectId;
Funs.FineUIPleaseSelect(this.drpAccidentDegree);
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName;
@ -89,6 +79,10 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.drpUnitId.SelectedValue = accidentReport.UnitId;
}
if(!string.IsNullOrEmpty(accidentReport.AccidentDegree))
{
this.drpAccidentDegree.SelectedValue = accidentReport.AccidentDegree;
}
if (!string.IsNullOrEmpty(accidentReport.CompileMan))
{
this.drpCompileMan.SelectedValue = accidentReport.CompileMan;
@ -97,7 +91,6 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", accidentReport.CompileDate);
}
this.txtFileContents.Text = HttpUtility.HtmlDecode(accidentReport.FileContent);
this.txtAccidentReportName.Text = accidentReport.AccidentReportName;
if (!string.IsNullOrEmpty(accidentReport.AccidentTypeId))
{
@ -191,11 +184,6 @@ namespace FineUIPro.Web.HSSE.Accident
this.drpCompileMan.SelectedValue = this.CurrUser.UserId;
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectAccidentReportMenuId;
this.ctlAuditFlow.DataId = this.AccidentReportId;
this.ctlAuditFlow.ProjectId = this.ProjectId;
this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
}
}
#endregion
@ -267,39 +255,36 @@ namespace FineUIPro.Web.HSSE.Accident
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
SaveData(BLL.Const.BtnSave);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
this.SaveData(BLL.Const.BtnSubmit);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
{
bool res = SaveData(BLL.Const.BtnSave);
if (res)
{
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
}
/// <summary>
/// 数据保存
/// </summary>
/// <param name="type"></param>
private void SaveData(string type)
private bool SaveData(string type)
{
if (this.drpAccidentTypeId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择事故类型！", MessageBoxIcon.Warning);
return;
return false;
}
if (this.drpAccidentDegree.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择严重程度！", MessageBoxIcon.Warning);
return false;
}
if (this.rbIsNotConfirm.SelectedValue == "True")
{
if (this.drpUnitId2.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择事故责任单位！", MessageBoxIcon.Warning);
return;
return false;
}
}
else
@ -307,7 +292,7 @@ namespace FineUIPro.Web.HSSE.Accident
if (this.drpUnitId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择事故责任单位！", MessageBoxIcon.Warning);
return;
return false;
}
}
@ -316,14 +301,17 @@ namespace FineUIPro.Web.HSSE.Accident
ProjectId = this.ProjectId,
AccidentReportCode = this.txtAccidentReportCode.Text.Trim(),
//accidentReport.AccidentReportType = this.drpAccidentReportType.SelectedValue;
FileContent = HttpUtility.HtmlEncode(this.txtFileContents.Text)
};
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
accidentReport.CompileMan = this.drpCompileMan.SelectedValue;
}
if (this.drpAccidentDegree.SelectedValue != BLL.Const._Null)
{
accidentReport.AccidentDegree = this.drpAccidentDegree.SelectedValue;
}
accidentReport.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
accidentReport.States = BLL.Const.State_0;
accidentReport.States = BLL.Const.State_2;
accidentReport.AccidentReportName = this.txtAccidentReportName.Text.Trim();
if (this.drpAccidentTypeId.SelectedValue != BLL.Const._Null)
{
@ -356,10 +344,6 @@ namespace FineUIPro.Web.HSSE.Accident
accidentReport.ReportDate = Funs.GetNewDateTime(this.txtReportDate.Text.Trim());
accidentReport.ProcessDescription = this.txtProcessDescription.Text.Trim();
accidentReport.EmergencyMeasures = this.txtEmergencyMeasures.Text.Trim();
if (type == BLL.Const.BtnSubmit)
{
accidentReport.States = this.ctlAuditFlow.NextStep;
}
if (!string.IsNullOrEmpty(this.AccidentReportId))
{
accidentReport.AccidentReportId = this.AccidentReportId;
@ -378,8 +362,9 @@ namespace FineUIPro.Web.HSSE.Accident
BLL.AccidentReportService.AddAccidentReport(accidentReport);
BLL.LogService.AddSys_Log(this.CurrUser, this.txtAccidentReportCode.Text, this.AccidentReportId, BLL.Const.ProjectAccidentReportMenuId, Const.BtnAdd);
}
//保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectAccidentReportMenuId, this.AccidentReportId, (type == BLL.Const.BtnSubmit ? true : false), accidentReport.AccidentReportCode, "../Accident/AccidentReportView.aspx?AccidentReportId={0}");
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkingHours);
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
return true;
}
#endregion

85
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportEdit.aspx.designer.cs generated
View File

@ -48,15 +48,6 @@ namespace FineUIPro.Web.HSSE.Accident {
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// Panel3 控件。
/// </summary>
@ -130,22 +121,13 @@ namespace FineUIPro.Web.HSSE.Accident {
protected global::FineUIPro.TextBox txtAccidentReportCode;
/// <summary>
/// TabStrip1 控件。
/// Panel6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Tab1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab1;
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// Form2 控件。
@ -165,6 +147,15 @@ namespace FineUIPro.Web.HSSE.Accident {
/// </remarks>
protected global::FineUIPro.DropDownList drpAccidentTypeId;
/// <summary>
/// drpAccidentDegree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAccidentDegree;
/// <summary>
/// frIsNotConfirm 控件。
/// </summary>
@ -390,51 +381,6 @@ namespace FineUIPro.Web.HSSE.Accident {
/// </remarks>
protected global::FineUIPro.DatePicker txtCompileDate;
/// <summary>
/// Tab2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab2;
/// <summary>
/// txtFileContents 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtFileContents;
/// <summary>
/// Panel6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -480,15 +426,6 @@ namespace FineUIPro.Web.HSSE.Accident {
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnClose 控件。
/// </summary>

6
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportView.aspx
View File

@ -2,8 +2,6 @@
EnableEventValidation="false" Inherits="FineUIPro.Web.HSSE.Accident.AccidentReportView"
ValidateRequest="false" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
@ -35,7 +33,7 @@
cellspacing="0" class="table" style="border-collapse: collapse;" border="1">
<tr>
<td rowspan="2" align="center" style="width: 30%;">
<img id="image" runat="server" alt="" src="../Images/Null.jpg" />
</td>
<td colspan="2" align="center" style="width: 40%;">
<asp:Label ID="lblProjectName" runat="server" Font-Size="11pt"></asp:Label>
@ -190,7 +188,7 @@
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</items>
</f:Toolbar>

10
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportView.aspx.cs
View File

@ -33,16 +33,6 @@ namespace FineUIPro.Web.HSSE.Accident
{
if (!IsPostBack)
{
var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_CD);
if (unit != null && !string.IsNullOrEmpty(unit.UnitCode))
{
string url = "../../Images/SUBimages/" + unit.UnitCode + ".jpg";
if (url.Contains('*'))
{
url = url.Replace('*', '-');
}
this.image.Src = url;
}
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();

9
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportView.aspx.designer.cs generated
View File

@ -84,15 +84,6 @@ namespace FineUIPro.Web.HSSE.Accident {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTable Table2;
/// <summary>
/// image 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlImage image;
/// <summary>
/// lblProjectName 控件。
/// </summary>

Some files were not shown because too many files have changed in this diff Show More