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

提交代码

Browse Source
This commit is contained in:
高飞
2023-09-21 15:54:21 +08:00
parent a274f30199
commit fe3341b8cc
51 changed files with 4488 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_WH_2023-09-20.sql
+474
View File
@@ -0,0 +1,474 @@
delete from Sys_MenuFlowOperate;
--动火作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('0c1a6c13-1cb8-45e8-a415-d93c4f2dd4c0','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',1,1,1,'分包商施工经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('211e7843-7986-4fd3-80ef-a0d01c0d1261','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',2,1,1,'分包商HSE经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('ac7d5fec-6bfe-4fbe-b385-1617691fa13f','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',3,1,1,'五环施工经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('d8477641-40ef-485e-92b7-3c5ddce7b9ce','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',4,1,1,'五环HSE经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('dc0fc1b6-f9bf-4810-94fb-473e8f9721d5','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',5,1,1,'完成',1)
GO
--高处作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('817F4373-5A30-4197-9793-5ACB0152E80F','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',1,1,1,'分包商施工经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('BF3A7FAD-6265-4228-ACB4-03DCA3581270','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',2,1,1,'分包商HSE经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A71C71E1-9BAB-4AF6-A0DC-BFF18299FFEA','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',3,1,1,'五环施工经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('6630FC39-44FB-4B50-BA0D-7DEDB628F5EE','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',4,1,1,'五环HSE经理意见',0)
GO
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('45CAC29E-986E-4FCE-BE6F-C1FE085A0AD6','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',5,1,1,'完成',1)
GO
--受限空间作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('034452AD-92AB-4956-ACF6-BE89FE01BECE','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A0F4DE31-59C6-4DF9-B6AB-B559BC70FCAB','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A41B5815-8D40-4EB7-89EC-2A5E18D8EE8A','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('B72FAA80-D647-41EB-89B7-0A4A48DC53ED','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('B34C3254-91A5-45B9-8592-CBE7BCA2AF60','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',5,1,1,'完成',1)
GO
--射线作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('FD0271ED-6CAB-4FC2-8645-E530F0724A79','F72FF20B-D3EB-46A5-97F7-C99B2473A140',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('98448443-8BB2-4D29-B174-FF0EADD4711D','F72FF20B-D3EB-46A5-97F7-C99B2473A140',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('EAC9F894-0ED7-49D3-A397-88B53E5C1D74','F72FF20B-D3EB-46A5-97F7-C99B2473A140',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('E5CE0A69-CF76-4685-A164-7F665DA26627','F72FF20B-D3EB-46A5-97F7-C99B2473A140',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('1D75313C-8C94-416B-84CE-37A41E376A76','F72FF20B-D3EB-46A5-97F7-C99B2473A140',5,1,1,'完成',1)
GO
--断路(占道)作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('FE783A32-17ED-4BFC-917B-413C8DB246CC','4E607E83-41FC-4F49-B26F-A21CFE38328F',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('EEA2A984-C229-48A5-972B-1D99D2C18475','4E607E83-41FC-4F49-B26F-A21CFE38328F',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('D0C91634-29A7-43E2-98A3-62FA148AA517','4E607E83-41FC-4F49-B26F-A21CFE38328F',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('13FE0C64-AE97-47E9-8637-6904A87ECCE9','4E607E83-41FC-4F49-B26F-A21CFE38328F',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('6BA6D160-3D1C-4333-92E1-996A3F13AECC','4E607E83-41FC-4F49-B26F-A21CFE38328F',5,1,1,'完成',1)
GO
--动土作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9071','755C6AC9-2E38-4D4F-AF33-33CB1744A907',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9072','755C6AC9-2E38-4D4F-AF33-33CB1744A907',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9073','755C6AC9-2E38-4D4F-AF33-33CB1744A907',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9074','755C6AC9-2E38-4D4F-AF33-33CB1744A907',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9077','755C6AC9-2E38-4D4F-AF33-33CB1744A907',5,1,1,'完成',1)
GO
--夜间施工作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B1','7BBAE649-7B00-4475-A911-BFE3A37AC55B',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B2','7BBAE649-7B00-4475-A911-BFE3A37AC55B',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B3','7BBAE649-7B00-4475-A911-BFE3A37AC55B',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B4','7BBAE649-7B00-4475-A911-BFE3A37AC55B',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B7','7BBAE649-7B00-4475-A911-BFE3A37AC55B',5,1,1,'完成',1)
GO
--吊装作业票
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654511','A1BE3AB6-9D4A-41E7-8870-E73423165451',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654512','A1BE3AB6-9D4A-41E7-8870-E73423165451',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654513','A1BE3AB6-9D4A-41E7-8870-E73423165451',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654514','A1BE3AB6-9D4A-41E7-8870-E73423165451',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654517','A1BE3AB6-9D4A-41E7-8870-E73423165451',5,1,1,'完成',1)
GO
--临时作业票审批流程
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF51','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',1,1,1,'分包商施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF52','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',2,1,1,'分包商HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF53','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,1,1,'五环施工经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF54','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',4,1,1,'五环HSE经理意见',0)
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF57','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',5,1,1,'完成',1);
GO
ALTER PROCEDURE [dbo].[Sp_APP_GetToDoItems]
@projectId NVARCHAR(50)=NULL,
@userId NVARCHAR(200)=NULL
AS
/*获取当前人待办事项*/
BEGIN
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检' AS MenuName
,register.RegisterDef AS Content
,UserId
,users.UserName
,register.RegisterDate AS DataTime
,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
,'/pagesHSSE/safe/inspecitonconfirm' AS UrlStr
FROM HSSE_Hazard_HazardRegister AS register
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE register.ProjectId=@projectId AND
((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') ))
OR (register.states = '2' AND register.CheckManId =@userId))
UNION ALL
SELECT PlanId AS DataId
,'B782A26B-D85C-4F84-8B45-F7AA47B3159E' AS MenuId
,'培训计划' AS MenuName
,PlanName AS Content
,UserId
,users.UserName
,DesignerDate AS DataTime
,CONVERT(varchar(100),DesignerDate, 23) AS DataTimeStr
,'/pagesTest/test/trainindex' AS UrlStr
FROM Training_Plan AS ePlan
LEFT JOIN Sys_User AS users ON ePlan.DesignerId= users.UserId
WHERE (ePlan.ProjectId=@projectId or (@projectId is null and ePlan.ProjectId is null))
AND (States = '0' OR States = '1' ) AND ePlan.DesignerId =@userId
UNION ALL
SELECT TestPlanId AS DataId
,'FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34' AS MenuId
,'考试计划' AS MenuName
,PlanName AS Content
,UserId
,users.UserName
,PlanDate AS DataTime
,CONVERT(varchar(100),PlanDate, 23) AS DataTimeStr
,'/pagesTest/test/testplan' AS UrlStr
FROM Training_TestPlan AS TPlan
LEFT JOIN Sys_User AS users ON users.UserId =TPlan.PlanManId
WHERE (TPlan.ProjectId=@projectId or (@projectId is null and TPlan.ProjectId is null))
AND (States = '0' OR States = '1' ) AND PlanManId =@userId
UNION ALL
SELECT TaskId AS DataId
,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId
,'培训任务' AS MenuName
,Plans.PlanName AS Content
,users.UserId
,users.UserName
,TaskDate AS DataTime
,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr
,('/pagesTest/test/taskindex') AS UrlStr
FROM Training_Task AS Task
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Training_Plan AS Plans ON Plans.PlanId =Task.PlanId
WHERE (Task.ProjectId=@projectId or (@projectId is null and Task.ProjectId is null))
AND (Task.States IS NULL OR Task.States != 2)
AND Task.UserId = @userId
UNION ALL
SELECT TestRecordId AS DataId
,'0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A' AS MenuId
,'扫码考试' AS MenuName
,TestPlan.PlanName AS Content
,TestRecord.TestManId
,Person.PersonName
,TestPlan.TestStartTime AS DataTime
,CONVERT(varchar(100),TestPlan.TestStartTime, 23) AS DataTimeStr
,('/pages/temp_index/index') AS UrlStr
FROM Training_TestRecord AS TestRecord
left join Training_TestPlan as TestPlan on TestRecord.TestPlanId = TestPlan.TestPlanId
left join SitePerson_Person as Person on Person.PersonId = TestRecord.TestManId
left join Sys_User as uses on Person.IdentityCard = uses.IdentityCard
WHERE (TestRecord.ProjectId=@projectId or (@projectId is null and TestRecord.ProjectId is null))
AND TestPlan.States ='1'
AND TestRecord.TestEndTime IS NULL
AND (TestRecord.TestManId = @userId or uses.UserId = @userId)
UNION ALL
SELECT FireWorkId AS DataId
,'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' AS MenuId
,'动火作业' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/dhuo/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_FireWork AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT HeightWorkId AS DataId
,'DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9' AS MenuId
,'高处作业' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/gchu/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_HeightWork AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT LimitedSpaceId AS DataId
,'AEC9166D-1C91-45F0-8BFE-D3D0479A28C7' AS MenuId
,'受限空间' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/sxkj/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_LimitedSpace AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT RadialWorkId AS DataId
,'F72FF20B-D3EB-46A5-97F7-C99B2473A140' AS MenuId
,'射线作业' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/sx/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_RadialWork AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT OpenCircuitId AS DataId
,'4E607E83-41FC-4F49-B26F-A21CFE38328F' AS MenuId
,'断路(占道)' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/dlu/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_OpenCircuit AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT BreakGroundId AS DataId
,'755C6AC9-2E38-4D4F-AF33-33CB1744A907' AS MenuId
,'动土作业' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/dtu/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_BreakGround AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT NightWorkId AS DataId
,'7BBAE649-7B00-4475-A911-BFE3A37AC55B' AS MenuId
,'夜间施工' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/yjsg/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_NightWork AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT LiftingWorkId AS DataId
,'A1BE3AB6-9D4A-41E7-8870-E73423165451' AS MenuId
,'吊装作业' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/dzhuang/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_LiftingWork AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT ElectricityId AS DataId
,'48F64E0F-38B2-4BDC-9B61-6200BD02CBF5' AS MenuId
,'临时用电' AS MenuName
,LicenseCode AS Content
,UserId
,users.UserName
,ApplyDate AS DataTime
,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
,(CASE WHEN States = '0' THEN '/pagesWork/ldian/add'
ELSE '/pagesWork/dhuo/approval' END) AS UrlStr
FROM License_Electricity AS License
LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' OR States= '6')
AND License.NextManId LIKE '%'+ @userId+'%'
UNION ALL
SELECT RectifyNoticesId AS DataId
,'0038D764-D628-46F0-94FF-D0A22C3C45A3' AS MenuId
,'隐患整改' AS MenuName
,(CASE WHEN Rectify.States =1 THEN '待签发：'
WHEN Rectify.States =2 THEN '待整改：'
WHEN Rectify.States =3 THEN '待审核：'
WHEN Rectify.States =4 THEN '待复查：'
WHEN Rectify.States =5 THEN '已完成：'
ELSE '待提交：' END + RectifyNoticesCode) AS Content
,users.UserId
,users.UserName
,CheckedDate AS DataTime
,CONVERT(varchar(100),CheckedDate, 23) AS DataTimeStr
,(CASE WHEN ISNULL(Rectify.States,0) =0 THEN '/pagesHSSE/rn/rn_add' --提交
WHEN Rectify.States =1 THEN '/pagesHSSE/rn/rn_approval' --签发
WHEN Rectify.States =2 THEN '/pagesHSSE/rn/rn_rectify' --整改
WHEN Rectify.States =3 THEN '/pagesHSSE/rn/rn_rectifycf' --审核
WHEN Rectify.States =4 THEN '/pagesHSSE/rn/rn_confirm' --复查
ELSE '/pagesHSSE/rn/rn_add' END) AS UrlStr
FROM Check_RectifyNotices AS Rectify
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Rectify.Projectid=@projectId AND Rectify.States <> 5
AND ((ISNULL(Rectify.States,0) =0 AND Rectify.CompleteManId LIKE '%'+ @userId+'%')
OR (Rectify.States =1 AND Rectify.SignPerson LIKE '%'+ @userId+'%')
OR (Rectify.States =2 AND Rectify.DutyPersonId LIKE '%'+ @userId+'%')
OR (Rectify.States =3 AND Rectify.UnitHeadManId LIKE '%'+ @userId+'%')
OR (Rectify.States =4 AND Rectify.CheckPerson LIKE '%'+ @userId+'%')
OR (Rectify.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND (ProfessionalEngineerTime1 IS NULL OR ProfessionalEngineerTime2 IS NULL))
OR (Rectify.ConstructionManagerId LIKE '%'+ @userId+'%' AND (ConstructionManagerTime1 IS NULL OR ConstructionManagerTime2 IS NULL))
OR (Rectify.ProjectManagerId LIKE '%'+ @userId+'%' AND (ProjectManagerTime1 IS NULL OR ProjectManagerTime2 IS NULL)))
UNION ALL
SELECT PersonId AS DataId
,'EE260447-028F-46AF-8864-9A5DC9DAA5BD' AS MenuId
,'现场人员' AS MenuName
,Person.PersonName AS Content
,users.UserId
,users.UserName
,Person.InTime AS DataTime
,CONVERT(varchar(100),Person.InTime, 23) AS DataTimeStr
,('/pagesHSSE/info/peopledetail') AS UrlStr
FROM SitePerson_Person AS Person
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Person.ProjectId=@projectId AND (Person.IsUsed IS NULL OR Person.IsUsed= 0)
AND Person.AuditorId = @userId AND Person.AuditorDate IS NULL
UNION ALL
SELECT PauseNoticeId AS DataId
,'C81DB7ED-165E-4C69-86B0-A3AAE37059FE' AS MenuId
,'暂停令' AS MenuName
,(CASE WHEN PauseNotice.PauseStates =1 THEN '待签发：'
WHEN PauseNotice.PauseStates =2 THEN '待批准：'
WHEN PauseNotice.PauseStates =3 THEN '待接收：'
ELSE '待提交：' END + PauseNoticeCode) AS Content
,users.UserId
,users.UserName
,PauseTime AS DataTime
,CONVERT(varchar(100),PauseTime, 23) AS DataTimeStr
,(CASE WHEN ISNULL(PauseNotice.PauseStates,0) =0 THEN '/pagesHSSE/info/stop_add ' --待提交
WHEN PauseNotice.PauseStates =1 AND PauseNotice.SignManId=@userId THEN '/pagesHSSE/info/stop_approval' --待签发
WHEN PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId=@userId THEN '/pagesHSSE/info/stop_confirm' --待批准
WHEN PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId=@userId THEN '/pagesHSSE/info/stop_feedback' --待接收
ELSE '/pagesHSSE/info/stop_detail' END) AS UrlStr
FROM Check_PauseNotice AS PauseNotice
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE PauseNotice.ProjectId=@projectId AND PauseNotice.PauseStates <> 4
AND ((ISNULL(PauseNotice.PauseStates,0) =0 AND PauseNotice.CompileManId LIKE '%'+ @userId+'%')
OR (PauseNotice.PauseStates =1 AND PauseNotice.SignManId LIKE '%'+ @userId+'%')
OR (PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId LIKE '%'+ @userId+'%')
OR (PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId LIKE '%'+ @userId+'%')
OR (PauseNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL)
OR (PauseNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL)
OR (PauseNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL)
OR (PauseNotice.SupervisorManId LIKE '%'+ @userId+'%' AND SupervisorManTime IS NULL)
OR (PauseNotice.OwnerId LIKE '%'+ @userId+'%' AND OwnerTime IS NULL))
UNION ALL
SELECT PunishNoticeId AS DataId
,'755F1C1D-2178-47D8-9F82-A501B53A2436' AS MenuId
,'处罚单' AS MenuName
,(CASE WHEN PunishNotice.PunishStates =1 THEN '待签发：'
WHEN PunishNotice.PunishStates =2 THEN '待批准：'
WHEN PunishNotice.PunishStates =3 THEN '待回执：'
ELSE '待提交：' END + PunishNoticeCode) AS Content
,users.UserId
,users.UserName
,PunishNoticeDate AS DataTime
,CONVERT(varchar(100),PunishNoticeDate, 23) AS DataTimeStr
,(CASE WHEN ISNULL(PunishNotice.PunishStates,0) =0 THEN '/pagesTest/punish/add' --待提交
WHEN PunishNotice.PunishStates =1 AND PunishNotice.SignMan=@userId THEN '/pagesTest/punish/approval' --待签发
WHEN PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan=@userId THEN '/pagesTest/punish/rectify' --待批准
WHEN PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId=@userId THEN '/pagesTest/punish/rectifycf' --待回执
ELSE '/pagesTest/punish/detail' END) AS UrlStr
FROM Check_PunishNotice AS PunishNotice
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE PunishNotice.ProjectId=@projectId AND PunishNotice.PunishStates <> 4
AND ((ISNULL(PunishNotice.PunishStates,0) =0 AND PunishNotice.CompileMan LIKE '%'+ @userId+'%')
OR (PunishNotice.PunishStates =1 AND PunishNotice.SignMan LIKE '%'+ @userId+'%')
OR (PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan LIKE '%'+ @userId+'%')
OR (PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId LIKE '%'+ @userId+'%')
OR (PunishNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL)
OR (PunishNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL)
OR (PunishNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL))
ORDER BY DataTime DESC
END
SGGL/BLL/API/HSSE/APILicenseDataService.cs
+791 -155
View File
File diff suppressed because it is too large Load Diff
SGGL/BLL/Common/Const.cs
+4
View File
@@ -3299,6 +3299,10 @@ namespace BLL
/// 作废
/// </summary>
public const string State_C = "-2";
/// <summary>
/// 关闭提交
/// </summary>
public const string State_6 = "6";
#endregion
#region 文档流程定义
SGGL/BLL/HSSE/License/LicensePublicService.cs
+5 -3
View File
@@ -16,13 +16,15 @@ namespace BLL
/// <returns></returns>
public static ListItem[] drpStatesItem()
{
ListItem[] list = new ListItem[6];
//修改日期，增加关闭审核中
ListItem[] list = new ListItem[7];
list[0] = new ListItem("全部", Const._Null);
list[1] = new ListItem("待提交", Const.State_0);
list[2] = new ListItem("审核中", Const.State_1);
list[3] = new ListItem("作业中", Const.State_2);
list[4] = new ListItem("已关闭", Const.State_3);
list[5] = new ListItem("已取消", Const.State_R);
list[4] = new ListItem("关闭审核中", Const.State_6);
list[5] = new ListItem("已关闭", Const.State_3);
list[6] = new ListItem("已取消", Const.State_R);
return list;
}
SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/夜间施工作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/断路（占道）作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx
+101 -7
View File
@@ -90,29 +90,111 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -150,3 +232,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs
+101 -1
View File
@@ -89,6 +89,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -100,6 +104,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -111,10 +116,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs
Generated
+173 -2
View File
@@ -150,13 +150,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -167,6 +167,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -176,6 +185,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx
+1 -1
View File
@@ -26,7 +26,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs
+1 -1
View File
@@ -343,7 +343,7 @@ namespace FineUIPro.Web.HSSE.License
Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//作业原因
if (bookmarkWorkDepth != null)
{
if (getElectricity != null)
if (getElectricity.Reason != null)
{
bookmarkWorkDepth.Text = getElectricity.Reason;
SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx
+100 -7
View File
@@ -92,32 +92,113 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -155,3 +236,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs
+101 -1
View File
@@ -90,6 +90,10 @@ namespace FineUIPro.Web.HSSE.License
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -101,6 +105,7 @@ namespace FineUIPro.Web.HSSE.License
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -112,10 +117,105 @@ namespace FineUIPro.Web.HSSE.License
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs
Generated
+173 -2
View File
@@ -150,13 +150,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -167,6 +167,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -176,6 +185,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx
+98 -6
View File
@@ -86,31 +86,111 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -139,3 +219,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs
+101 -1
View File
@@ -94,6 +94,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -105,6 +109,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -116,10 +121,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs
Generated
+173 -2
View File
@@ -141,13 +141,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -158,6 +158,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -167,6 +176,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx
+99 -6
View File
@@ -100,30 +100,111 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -152,3 +233,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs
+101 -1
View File
@@ -91,6 +91,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -102,6 +106,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -113,10 +118,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs
Generated
+173 -2
View File
@@ -168,13 +168,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -185,6 +185,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -194,6 +203,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx
+100 -7
View File
@@ -94,32 +94,113 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
@@ -149,3 +230,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs
+101 -1
View File
@@ -93,6 +93,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -104,6 +108,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -115,10 +120,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs
Generated
+173 -2
View File
@@ -168,13 +168,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -185,6 +185,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -194,6 +203,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/LimitedSpace.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx
+100 -7
View File
@@ -114,32 +114,113 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
@@ -178,3 +259,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs
+101 -1
View File
@@ -117,6 +117,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -128,6 +132,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -139,10 +144,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs
Generated
+173 -2
View File
@@ -195,13 +195,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -212,6 +212,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -221,6 +230,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/NightWork.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx
+65 -83
View File
@@ -82,23 +82,26 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
@@ -106,7 +109,7 @@
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位安全人员意见：">
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
@@ -114,24 +117,28 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label1" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位专业工程师意见：">
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
@@ -139,87 +146,50 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="Label2" runat="server" >
</f:Label>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位施工经理意见：">
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="Label5" runat="server" >
</f:Label>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm5" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="监理单位意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion5" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="Label9" runat="server" >
</f:Label>
<f:Label ID="txtName5" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Label ID="txtTime5" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm6" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="业主单位意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion6" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="Label12" runat="server" >
</f:Label>
<f:Label ID="txtName6" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Label ID="txtTime6" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCance" runat="server" Label="取消" Readonly="true" LabelWidth="90px">
@@ -247,3 +217,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs
+50 -40
View File
@@ -87,6 +87,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -98,6 +102,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -109,13 +114,23 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
@@ -127,13 +142,24 @@
{
this.txtOpinion2.Text = getF2.Opinion;
}
this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId);
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
@@ -145,13 +171,24 @@
{
this.txtOpinion3.Text = getF3.Opinion;
}
this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId);
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
@@ -163,46 +200,19 @@
{
this.txtOpinion4.Text = getF4.Opinion;
}
this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5);
if (getF5 != null)
{
this.txtForm5.Title = getF5.AuditFlowName + "：";
if (getF5.OperaterTime.HasValue)
{
if (getF5.IsAgree == true)
{
this.txtOpinion5.Text = "同意。";
}
else
{
this.txtOpinion5.Text = getF5.Opinion;
}
this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId);
this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime);
}
}
var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6);
if (getF6 != null)
{
this.txtForm6.Title = getF6.AuditFlowName + "：";
if (getF6.OperaterTime.HasValue)
{
if (getF6.IsAgree == true)
{
this.txtOpinion6.Text = "同意。";
}
else
{
this.txtOpinion6.Text = getF6.Opinion;
}
this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId);
this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime);
}
}
}
}
#endregion
SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.designer.cs
Generated
+48 -100
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.License {
namespace FineUIPro.Web.HSSE.License
{
public partial class NightWorkView {
public partial class NightWorkView
{
/// <summary>
/// form1 控件。
@@ -139,13 +141,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -156,6 +158,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -184,13 +195,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// Label1 控件。
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
@@ -201,6 +212,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
@@ -229,13 +249,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// Label2 控件。
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
@@ -246,6 +266,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
@@ -274,13 +303,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// Label5 控件。
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
@@ -291,6 +320,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
@@ -300,96 +338,6 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtForm5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm5;
/// <summary>
/// txtOpinion5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion5;
/// <summary>
/// Label9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label9;
/// <summary>
/// txtName5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName5;
/// <summary>
/// txtTime5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime5;
/// <summary>
/// txtForm6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm6;
/// <summary>
/// txtOpinion6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion6;
/// <summary>
/// Label12 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label12;
/// <summary>
/// txtName6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName6;
/// <summary>
/// txtTime6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime6;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/OpenCircuit.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx
+100 -7
View File
@@ -83,32 +83,113 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -137,3 +218,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs
+101 -1
View File
@@ -93,6 +93,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -104,6 +108,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -115,10 +120,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs
Generated
+173 -2
View File
@@ -132,13 +132,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -158,6 +167,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/RadialWork.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
<f:RadioButtonList ID="drpStates" runat="server" Width="650px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx
+100 -7
View File
@@ -96,32 +96,113 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商施工经理意见：">
<Rows>
<f:FormRow>
<f:FormRow >
<Items>
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:Label ID="Label6" runat="server" >
</f:Label>
<f:HyperLink ID="HyperLink2" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(1);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image1" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items>
<f:HyperLink ID="HyperLink1" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(2);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink3" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image3" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环HSE经理意见：">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items >
<f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(4);return false;"
runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -159,3 +240,15 @@
</form>
</body>
</html>
<script >
function showAttr(index) {
switch (index) {
case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return;
case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return;
case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return;
}
}
</script>
SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs
+101 -1
View File
@@ -90,6 +90,10 @@
#endregion
#region 获取审核记录信息
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
/// <summary>
///
/// </summary>
@@ -101,6 +105,7 @@
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
if (getF1 != null)
{
FlowOperateId1 = getF1.FlowOperateId;
this.txtForm1.Title = getF1.AuditFlowName + "：";
if (getF1.OperaterTime.HasValue)
{
@@ -112,10 +117,105 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
FlowOperateId2 = getF2.FlowOperateId;
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
FlowOperateId3 = getF3.FlowOperateId;
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs
Generated
+173 -2
View File
@@ -159,13 +159,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion1;
/// <summary>
/// Label6 控件。
/// HyperLink2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
protected global::FineUIPro.HyperLink HyperLink2;
/// <summary>
/// txtName1 控件。
@@ -176,6 +176,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtName1;
/// <summary>
/// Image1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image1;
/// <summary>
/// txtTime1 控件。
/// </summary>
@@ -185,6 +194,168 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.Label txtTime1;
/// <summary>
/// txtForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm2;
/// <summary>
/// txtOpinion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion2;
/// <summary>
/// HyperLink1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink1;
/// <summary>
/// txtName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName2;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// txtTime2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime2;
/// <summary>
/// txtForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm3;
/// <summary>
/// txtOpinion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion3;
/// <summary>
/// HyperLink3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink3;
/// <summary>
/// txtName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName3;
/// <summary>
/// Image3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image3;
/// <summary>
/// txtTime3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime3;
/// <summary>
/// txtForm4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form txtForm4;
/// <summary>
/// txtOpinion4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion4;
/// <summary>
/// HyperLink4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HyperLink HyperLink4;
/// <summary>
/// txtName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary>
/// txtTime4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTime4;
/// <summary>
/// txtCance 控件。
/// </summary>
SGGL/Model/APIItem/HSSE/LicenseDataItem.cs
+5
View File
@@ -517,5 +517,10 @@ namespace Model
get;
set;
}
/// <summary>
/// 审核人id
/// </summary>
public string OperaterId { get; set; }
}
}