1、车辆交易安全管理，现场车辆管理：补充批量退场和导入功能；

2、危大工程方案调整
3、企业安全检查调整
4、安全活动调整

DataBase/版本日志/SUBQHSE_V2026-03-11-xiaj.sql

@@ -1,5 +1,11 @@
 
-
+--现场车辆管理补充字段【进出场状态】
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Administrative_CarManager' AND COLUMN_NAME = 'InOutState')
+BEGIN
+	ALTER TABLE Administrative_CarManager ADD InOutState char(1);
+	EXEC sp_addextendedproperty 'MS_Description', N'进出场状态(0：已退场、1：在场)','SCHEMA', N'dbo','TABLE', N'Administrative_CarManager','COLUMN', N'InOutState'
+END
+GO
 
 
 IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'HSSEData_HSSE' AND COLUMN_NAME = 'LargerClosedNum')
@@ -21,3 +27,151 @@ END
 GO
 
 
+
+
+update  Sys_Menu
+set MenuName='安全活动',SortIndex=115
+where MenuName='信息管理' and MenuId='66DFD649-FBC2-463F-BD1A-04095D713C8E'
+GO
+
+
+update Sys_Menu
+set SortIndex=05
+where MenuId='16092FE7-938B-4713-8084-4FBFA030F386'
+GO
+
+
+
+--安全活动类型
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '79116536-BE80-4323-A46F-10222601D5B5')
+BEGIN
+INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+VALUES (N'79116536-BE80-4323-A46F-10222601D5B5', N'活动类型', N'BaseInfo/ActivityType.aspx', 150, '8A2CEE72-2793-49C6-9E2E-E83B2676E2DD', 'Menu_SysSet', 1,1, 1);
+END
+--活动类型
+IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '79116536-BE80-4323-A46F-10222601D5B5')
+BEGIN
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (N'475413A5-7551-4732-9603-6C8EAE5D69F5', N'79116536-BE80-4323-A46F-10222601D5B5', N'增加', 1);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (N'A8E7C65C-4BAC-48EC-B577-8626091334F2', N'79116536-BE80-4323-A46F-10222601D5B5', N'修改', 2);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (N'1CFD4BA8-3808-4CF0-8343-DA94457A5E7E', N'79116536-BE80-4323-A46F-10222601D5B5', N'删除', 3);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (N'CE1C1EFF-86A6-4DA5-85E0-3F1FC6A80821', N'79116536-BE80-4323-A46F-10222601D5B5', N'保存', 4);
+END
+GO
+
+
+
+
+--安全活动类型
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Base_ActivityType') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[Base_ActivityType](
+	[ActivityTypeId] [nvarchar](50) NOT NULL,
+	[ActivityTypeCode] [nvarchar](50) NULL,
+	[ActivityTypeName] [nvarchar](50) NULL,
+	[Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Base_ActivityType] PRIMARY KEY CLUSTERED 
+(
+	[ActivityTypeId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'ActivityTypeId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'ActivityTypeCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'ActivityTypeName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'Remark'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'活动类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType'
+END
+
+GO
+
+--初始化安全活动类型
+IF NOT EXISTS (SELECT * FROM Base_ActivityType WHERE ActivityTypeId = 'b8fc5fc8-7a40-4f0b-acf3-cee5f79322ed')
+BEGIN
+INSERT [dbo].[Base_ActivityType] ([ActivityTypeId], [ActivityTypeCode], [ActivityTypeName], [Remark]) 
+VALUES (N'b8fc5fc8-7a40-4f0b-acf3-cee5f79322ed', N'001', N'宣传活动', N'')
+INSERT [dbo].[Base_ActivityType] ([ActivityTypeId], [ActivityTypeCode], [ActivityTypeName], [Remark]) 
+VALUES (N'734ab4ff-5ec0-4ee2-bafa-b46b984f57ba', N'002', N'安全月活动', N'')
+INSERT [dbo].[Base_ActivityType] ([ActivityTypeId], [ActivityTypeCode], [ActivityTypeName], [Remark]) 
+VALUES (N'e00606a2-977f-40f7-9e13-5cb049927cae', N'003', N'三年行动活动', N'')
+END
+GO
+
+
+
+
+--安全活动补充类型id
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'InformationProject_PromotionalActivities' AND COLUMN_NAME = 'ActivityTypeId')
+BEGIN
+	ALTER TABLE InformationProject_PromotionalActivities ADD ActivityTypeId nvarchar(50);
+	EXEC sp_addextendedproperty 'MS_Description', N'安全活动类型','SCHEMA', N'dbo','TABLE', N'InformationProject_PromotionalActivities','COLUMN', N'ActivityTypeId';
+END
+GO
+
+
+--危大工程方案补充字段【审批状态	0：待审核、1：审核中、2：已完成】
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Solution_LargerHazard' AND COLUMN_NAME = 'ApprovalState')
+BEGIN
+	ALTER TABLE Solution_LargerHazard ADD ApprovalState char(1);
+	EXEC sp_addextendedproperty 'MS_Description', N'审批状态(0：待审核、1：审核中、2：已完成)','SCHEMA', N'dbo','TABLE', N'Solution_LargerHazard','COLUMN', N'ApprovalState'
+END
+GO
+
+
+--危大工程方案历史数据【审批状态】处理逻辑：
+--作业状态为未开始，审批状态默认为待审核；作业状态为作业中和已完工，审批状态默认为已完成
+--update Solution_LargerHazard set ApprovalState='0' where ApprovalState is null and States = '1'
+--GO
+update Solution_LargerHazard set ApprovalState='2' where ApprovalState is null and States <>'0'
+GO
+
+
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'HSSEData_HSSE' AND COLUMN_NAME = 'AwaitApprovalNum')
+BEGIN
+	ALTER TABLE HSSEData_HSSE ADD AwaitApprovalNum int;
+	ALTER TABLE HSSEData_HSSE ADD PendingApprovalNum int;
+	ALTER TABLE HSSEData_HSSE ADD CompletedApprovalNum int;
+	ALTER TABLE HSSEData_HSSE ADD SuperAwaitApprovalNum int;
+	ALTER TABLE HSSEData_HSSE ADD SuperPendingApprovalNum int;
+	ALTER TABLE HSSEData_HSSE ADD SuperCompletedApprovalNum int;
+	EXEC sp_addextendedproperty 'MS_Description', N'危大工程待审核个数','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'AwaitApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'危大工程审核中个数','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'PendingApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'危大工程已完成个数','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'CompletedApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'超危大工程待审核个数','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'SuperAwaitApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'超危大工程审核中个数','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'SuperPendingApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'超危大工程已完成个数','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'SuperCompletedApprovalNum';
+END
+GO
+
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_HSSEData_HSSE' AND COLUMN_NAME = 'AwaitApprovalNum')
+BEGIN
+	ALTER TABLE Project_HSSEData_HSSE ADD AwaitApprovalNum int;
+	ALTER TABLE Project_HSSEData_HSSE ADD PendingApprovalNum int;
+	ALTER TABLE Project_HSSEData_HSSE ADD CompletedApprovalNum int;
+	ALTER TABLE Project_HSSEData_HSSE ADD SuperAwaitApprovalNum int;
+	ALTER TABLE Project_HSSEData_HSSE ADD SuperPendingApprovalNum int;
+	ALTER TABLE Project_HSSEData_HSSE ADD SuperCompletedApprovalNum int;
+	EXEC sp_addextendedproperty 'MS_Description', N'危大工程待审核个数','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'AwaitApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'危大工程审核中个数','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'PendingApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'危大工程已完成个数','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'CompletedApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'超危大工程待审核个数','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'SuperAwaitApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'超危大工程审核中个数','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'SuperPendingApprovalNum';
+	EXEC sp_addextendedproperty 'MS_Description', N'超危大工程已完成个数','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'SuperCompletedApprovalNum';
+END
+GO
+
+
+--去除企业检查项目外键
+ALTER TABLE [Supervise_UnitHazardRegister]
+DROP CONSTRAINT [FK_UnitHazardRegister_Project];
+GO
+--企业检查补充字段【检查单位】
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Supervise_UnitHazardRegister' AND COLUMN_NAME = 'InspectionUnit')
+BEGIN
+	ALTER TABLE Supervise_UnitHazardRegister ADD InspectionUnit nvarchar(50);
+	EXEC sp_addextendedproperty 'MS_Description', N'检查单位','SCHEMA', N'dbo','TABLE', N'Supervise_UnitHazardRegister','COLUMN', N'InspectionUnit'
+END
+GO
+

SGGL/BLL/BLL.csproj

@@ -132,6 +132,7 @@
     <Compile Include="API\HSSE\APITrainingPlanService.cs" />
     <Compile Include="API\HSSE\APITrainingTaskService.cs" />
     <Compile Include="API\HSSE\APITrainRecordService.cs" />
+    <Compile Include="BaseInfo\ActivityTypeService.cs" />
     <Compile Include="BaseInfo\QualificationService.cs" />
     <Compile Include="BaseInfo\ReceivingDocTypeService.cs" />
     <Compile Include="BaseInfo\SuperviseCheckTypeService.cs" />

SGGL/BLL/BaseInfo/ActivityTypeService.cs

@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 活动类型
+    /// </summary>
+    public static class ActivityTypeService
+    {
+        /// <summary>
+        /// 根据主键获取活动类型
+        /// </summary>
+        /// <param name="ActivityTypeId"></param>
+        /// <returns></returns>
+        public static Model.Base_ActivityType GetActivityTypeById(string ActivityTypeId)
+        {
+            return Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityTypeId);
+        }
+
+        /// <summary>
+        /// 添加活动类型
+        /// </summary>
+        /// <param name="ActivityType"></param>
+        public static void AddActivityType(Model.Base_ActivityType ActivityType)
+        {
+            Model.Base_ActivityType newActivityType = new Model.Base_ActivityType
+            {
+                ActivityTypeId = ActivityType.ActivityTypeId,
+                ActivityTypeCode = ActivityType.ActivityTypeCode,
+                ActivityTypeName = ActivityType.ActivityTypeName,
+                Remark = ActivityType.Remark
+            };
+            Funs.DB.Base_ActivityType.InsertOnSubmit(newActivityType);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改活动类型
+        /// </summary>
+        /// <param name="ActivityType"></param>
+        public static void UpdateActivityType(Model.Base_ActivityType ActivityType)
+        {
+            Model.Base_ActivityType newActivityType = Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityType.ActivityTypeId);
+            if (newActivityType != null)
+            {
+                newActivityType.ActivityTypeCode = ActivityType.ActivityTypeCode;
+                newActivityType.ActivityTypeName = ActivityType.ActivityTypeName;
+                newActivityType.Remark = ActivityType.Remark;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除活动类型
+        /// </summary>
+        /// <param name="ActivityTypeId"></param>
+        public static void DeleteActivityTypeById(string ActivityTypeId)
+        {
+            Model.Base_ActivityType ActivityType = Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityTypeId);
+            if (ActivityType != null)
+            {
+                Funs.DB.Base_ActivityType.DeleteOnSubmit(ActivityType);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        ///获取活动类型下拉选择项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_ActivityType> GetActivityTypeList()
+        {
+            return (from x in Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x).ToList();
+        }
+
+        #region 活动类型下拉框
+        /// <summary>
+        ///  活动类型下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitActivityTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "ActivityTypeId";
+            dropName.DataTextField = "ActivityTypeName";
+            dropName.DataSource = GetActivityTypeList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+        #endregion
+    }
+}

SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs

@@ -225,6 +225,7 @@ namespace BLL
                 States = majorPlanApproval.States,
                 TrainPersonNum = majorPlanApproval.TrainPersonNum,
                 OperativesNum = majorPlanApproval.OperativesNum,
+                ApprovalState = "2",
                 IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false,
             };
 
@@ -252,6 +253,7 @@ namespace BLL
                 newLargerHazard.States = majorPlanApproval.States;
                 newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum;
                 newLargerHazard.OperativesNum = majorPlanApproval.OperativesNum;
+                newLargerHazard.ApprovalState = "2";
                 newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false;
                 db.SubmitChanges();
             }

SGGL/BLL/Common/Const.cs

@@ -1130,6 +1130,10 @@ namespace BLL
         /// 移交专业
         /// </summary>
         public const string TransferMajorMenuId = "D0850615-BF32-4CFA-84CA-EEA261676EA8";
+        /// <summary>
+        /// 活动类型
+        /// </summary>
+        public const string ActivityTypeMenuId = "79116536-BE80-4323-A46F-10222601D5B5";
         #endregion
 
         #region 质量基础信息
@@ -3197,6 +3201,11 @@ namespace BLL
         /// 专项检查明细导入模板
         /// </summary>
         public const string CheckSpecialDetailTemplateUrl = "File\\Excel\\DataIn\\专项检查明细导入模板.xls";
+        /// <summary>
+        /// 企业大检查明细导入模板
+        /// </summary>
+        public const string UnitHazardRegisterDetailTemplateUrl = "File\\Excel\\DataIn\\企业大检查明细导入模板.xls";
+
         /// <summary>
         /// 综合检查导入模板
         /// </summary>
@@ -3457,6 +3466,11 @@ namespace BLL
         /// 资料收发文登记记录导入模板原始虚拟路径
         /// </summary>
         public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls";
+        /// <summary>
+        /// 现场车辆管理导入模板
+        /// </summary>
+        public const string CarManagerTemplateUrl = "File\\Excel\\DataIn\\现场车辆管理导入模板.xls";
+
 
         /// <summary>
         /// 培训记录导入模板原始虚拟路径

SGGL/BLL/HSSE/Administrative/CarManagerService.cs

@@ -40,7 +40,8 @@ namespace BLL
                 Remark = carManager.Remark,
                 CompileMan = carManager.CompileMan,
                 CompileDate = carManager.CompileDate,
-                States = carManager.States
+                States = carManager.States,
+                InOutState = carManager.InOutState,
             };
             Funs.DB.Administrative_CarManager.InsertOnSubmit(newCarManager);
             Funs.DB.SubmitChanges();
@@ -66,7 +67,8 @@ namespace BLL
                 newCarManager.Remark = carManager.Remark;
                 newCarManager.CompileMan = carManager.CompileMan;
                 newCarManager.CompileDate = carManager.CompileDate;
-                newCarManager.States = carManager.States;
+                newCarManager.States = carManager.States; 
+                newCarManager.InOutState = carManager.InOutState;
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/InformationProject/PromotionalActivitiesService.cs

@@ -64,7 +64,8 @@ namespace BLL
                 AttachUrl = promotionalActivities.AttachUrl,
                 CompileMan = promotionalActivities.CompileMan,
                 CompileDate = System.DateTime.Now,
-                States = promotionalActivities.States
+                States = promotionalActivities.States,
+                ActivityTypeId = promotionalActivities.ActivityTypeId
             };
             Funs.DB.InformationProject_PromotionalActivities.InsertOnSubmit(newPromotionalActivities);
             Funs.DB.SubmitChanges();
@@ -93,6 +94,7 @@ namespace BLL
                 newPromotionalActivities.CompileMan = promotionalActivities.CompileMan;
                 newPromotionalActivities.CompileDate = promotionalActivities.CompileDate;
                 newPromotionalActivities.States = promotionalActivities.States;
+                newPromotionalActivities.ActivityTypeId = promotionalActivities.ActivityTypeId;
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/Solution/LargerHazardService.cs

@@ -45,7 +45,8 @@ namespace BLL
                 TrainPersonNum = largerHazard.TrainPersonNum,
                 IsSuperLargerHazard = largerHazard.IsSuperLargerHazard,
                 Descriptions = largerHazard.Descriptions,
-                OperativesNum = largerHazard.OperativesNum
+                OperativesNum = largerHazard.OperativesNum,
+                ApprovalState = largerHazard.ApprovalState,
             };
 
             db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard);
@@ -88,7 +89,8 @@ namespace BLL
                 newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard;
                 newLargerHazard.Descriptions = largerHazard.Descriptions;
                 newLargerHazard.IsUpdate = null;
-                newLargerHazard.OperativesNum = largerHazard.OperativesNum;
+                newLargerHazard.OperativesNum = largerHazard.OperativesNum; 
+                newLargerHazard.ApprovalState = largerHazard.ApprovalState;
                 db.SubmitChanges();
                 //判断是否有数据 有数据则更新 没有数据则添加
                 var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId);

SGGL/BLL/SysManage/UserService.cs

@@ -1519,6 +1519,40 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        /// 根据单位Id获取用户下拉选项【单位本部在职人员】
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Sys_User> GetIsOfficeUserListByUnitId(string unitId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.Sys_User> list = new List<Model.Sys_User>();
+                list = (from x in db.Sys_User
+                        where x.UnitId == unitId && x.IsOffice == true && x.IsPost == true
+                        orderby x.UserName
+                        select x).ToList();
+                return list;
+            }
+        }
+
+        /// <summary>
+        /// 用户下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitIsOfficeUserUnitIdDropDownList(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
+        {
+            dropName.DataValueField = "UserId";
+            dropName.DataTextField = "UserName";
+            dropName.DataSource = BLL.UserService.GetIsOfficeUserListByUnitId(unitId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
         /// <summary>
         /// 用户下拉框
         /// </summary>

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -122,6 +122,12 @@ namespace BLL
                     SuperConstructionNum = newtable.SuperConstructionNum,
                     SuperFinishedNum = newtable.SuperFinishedNum,
                     SuperArgumentNum = newtable.SuperArgumentNum,
+                    AwaitApprovalNum = newtable.AwaitApprovalNum,
+                    PendingApprovalNum = newtable.PendingApprovalNum,
+                    CompletedApprovalNum = newtable.CompletedApprovalNum,
+                    SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum,
+                    SuperPendingApprovalNum = newtable.SuperPendingApprovalNum,
+                    SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum,
                     State = newtable.State,
                     CreateDate = newtable.CreateDate,
                     CreateMan = newtable.CreateMan
@@ -250,6 +256,12 @@ namespace BLL
                 item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum;
                 item.SuperOperativesNum = dataHsse.SuperOperativesNum;
                 item.SuperArgumentNum = dataHsse.SuperArgumentNum;
+                item.AwaitApprovalNum = dataHsse.AwaitApprovalNum;
+                item.PendingApprovalNum = dataHsse.PendingApprovalNum;
+                item.CompletedApprovalNum = dataHsse.CompletedApprovalNum;
+                item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum;
+                item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum;
+                item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum;
                 item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption;
                 item.TotalWorkingHour = dataHsse.TotalWorkingHour;
                 item.TrainPersonNum = dataHsse.TrainPersonNum;
@@ -375,6 +387,12 @@ namespace BLL
                 item.SuperArgumentNum = dataHsse.SuperArgumentNum;
                 item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum;
                 item.SuperOperativesNum = dataHsse.SuperOperativesNum;
+                item.AwaitApprovalNum = dataHsse.AwaitApprovalNum;
+                item.PendingApprovalNum = dataHsse.PendingApprovalNum;
+                item.CompletedApprovalNum = dataHsse.CompletedApprovalNum;
+                item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum;
+                item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum;
+                item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum;
                 item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption;
                 item.TotalWorkingHour = dataHsse.TotalWorkingHour;
                 item.TrainPersonNum = dataHsse.TrainPersonNum;
@@ -551,6 +569,12 @@ namespace BLL
                 SuperTrainPersonNum = projectData.Sum(x => x.SuperTrainPersonNum),
                 SuperConstructionNum = projectData.Sum(x => x.SuperConstructionNum),
                 SuperFinishedNum = projectData.Sum(x => x.SuperFinishedNum),
+                AwaitApprovalNum = projectData.Sum(x => x.AwaitApprovalNum),
+                PendingApprovalNum = projectData.Sum(x => x.PendingApprovalNum),
+                CompletedApprovalNum = projectData.Sum(x => x.CompletedApprovalNum),
+                SuperAwaitApprovalNum = projectData.Sum(x => x.SuperAwaitApprovalNum),
+                SuperPendingApprovalNum = projectData.Sum(x => x.SuperPendingApprovalNum),
+                SuperCompletedApprovalNum = projectData.Sum(x => x.SuperCompletedApprovalNum),
                 CreateMan = Const.sysglyId,
                 CreateDate = DateTime.Now
             };
@@ -640,7 +664,7 @@ namespace BLL
             var licensesTask = HSSEData_HSSEService.GetLicensesAsync();
             var licensesCloseTask = HSSEData_HSSEService.GetLicensesCloseAsync();
             var generalHiddenRectificationOutputsTask = HSSEData_HSSEService.GetGeneralHiddenRectificationOutputsAsync();
-            var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync();            
+            var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync();
             var majorHiddenRectificationOutputsTask = HSSEData_HSSEService.GetMajorHiddenRectificationOutputsAsync();
 
             // 等待所有异步方法执行完成
@@ -880,7 +904,13 @@ namespace BLL
                 SuperOperativesNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperOperativesNum),
                 SuperConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperConstructionNum),
                 SuperFinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperFinishedNum),
-                SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum)
+                SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum),
+                AwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.AwaitApprovalNum),
+                PendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.PendingApprovalNum),
+                CompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.CompletedApprovalNum),
+                SuperAwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperAwaitApprovalNum),
+                SuperPendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperPendingApprovalNum),
+                SuperCompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperCompletedApprovalNum),
             };
 
             #region 添加项目统计数据
@@ -936,7 +966,13 @@ namespace BLL
                         SuperOperativesNum = g.Sum(x => x.SuperOperativesNum),
                         SuperConstructionNum = g.Sum(x => x.SuperConstructionNum),
                         SuperFinishedNum = g.Sum(x => x.SuperFinishedNum),
-                        SuperArgumentNum = g.Sum(x => x.SuperArgumentNum)
+                        SuperArgumentNum = g.Sum(x => x.SuperArgumentNum),
+                        AwaitApprovalNum = g.Sum(x => x.AwaitApprovalNum),
+                        PendingApprovalNum = g.Sum(x => x.PendingApprovalNum),
+                        CompletedApprovalNum = g.Sum(x => x.CompletedApprovalNum),
+                        SuperAwaitApprovalNum = g.Sum(x => x.SuperAwaitApprovalNum),
+                        SuperPendingApprovalNum = g.Sum(x => x.SuperPendingApprovalNum),
+                        SuperCompletedApprovalNum = g.Sum(x => x.SuperCompletedApprovalNum),
                     }
                 );
             foreach (var projectid in BeUnderConstructionList)
@@ -1041,7 +1077,13 @@ namespace BLL
                     SuperOperativesNum = largeEngineeringOutputs?.SuperOperativesNum ?? 0,
                     SuperConstructionNum = largeEngineeringOutputs?.SuperConstructionNum ?? 0,
                     SuperFinishedNum = largeEngineeringOutputs?.SuperFinishedNum ?? 0,
-                    SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0
+                    SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0,
+                    AwaitApprovalNum = largeEngineeringOutputs?.AwaitApprovalNum ?? 0,
+                    PendingApprovalNum = largeEngineeringOutputs?.PendingApprovalNum ?? 0,
+                    CompletedApprovalNum = largeEngineeringOutputs?.CompletedApprovalNum ?? 0,
+                    SuperAwaitApprovalNum = largeEngineeringOutputs?.SuperAwaitApprovalNum ?? 0,
+                    SuperPendingApprovalNum = largeEngineeringOutputs?.SuperPendingApprovalNum ?? 0,
+                    SuperCompletedApprovalNum = largeEngineeringOutputs?.SuperCompletedApprovalNum ?? 0,
                 };
                 Project_HSSEData_HSSEService.AddProject_HSSEData_HSSE(projectHsseData);
             }
@@ -1167,7 +1209,13 @@ namespace BLL
                     table.SuperOperativesNum = newtable.SuperOperativesNum;
                     table.SuperConstructionNum = newtable.SuperConstructionNum;
                     table.SuperFinishedNum = newtable.SuperFinishedNum;
-                    table.SuperArgumentNum = newtable.SuperArgumentNum;
+                    table.SuperArgumentNum = newtable.SuperArgumentNum; 
+                    table.AwaitApprovalNum = newtable.AwaitApprovalNum;
+                    table.PendingApprovalNum = newtable.PendingApprovalNum;
+                    table.CompletedApprovalNum = newtable.CompletedApprovalNum;
+                    table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum;
+                    table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum;
+                    table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum;
                     table.State = newtable.State;
                     table.CreateMan = newtable.CreateMan;
                     table.CreateDate = newtable.CreateDate;
@@ -4136,6 +4184,12 @@ namespace BLL
                              SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true),
                              SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true),
                              SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true),
+                             AwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == false),
+                             PendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == false),
+                             CompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == false),
+                             SuperAwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == true),
+                             SuperPendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == true),
+                             SuperCompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == true),
                          }).ToList();
             return query;
         }
@@ -4376,6 +4430,12 @@ namespace BLL
                        x.SuperConstructionNum,
                        x.SuperFinishedNum,
                        x.SuperArgumentNum,
+                       x.AwaitApprovalNum,
+                       x.PendingApprovalNum,
+                       x.CompletedApprovalNum,
+                       x.SuperAwaitApprovalNum,
+                       x.SuperPendingApprovalNum,
+                       x.SuperCompletedApprovalNum,
                        x.State,
                        x.CreateDate,
                        x.CreateMan

SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs

@@ -207,7 +207,13 @@ namespace BLL
                     SuperOperativesNum = newtable.SuperOperativesNum,
                     SuperConstructionNum = newtable.SuperConstructionNum,
                     SuperFinishedNum = newtable.SuperFinishedNum,
-                    SuperArgumentNum = newtable.SuperArgumentNum
+                    SuperArgumentNum = newtable.SuperArgumentNum,
+                    AwaitApprovalNum = newtable.AwaitApprovalNum,
+                    PendingApprovalNum = newtable.PendingApprovalNum,
+                    CompletedApprovalNum = newtable.CompletedApprovalNum,
+                    SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum,
+                    SuperPendingApprovalNum = newtable.SuperPendingApprovalNum,
+                    SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum,
                 };
                 db.Project_HSSEData_HSSE.InsertOnSubmit(table);
                 db.SubmitChanges();
@@ -347,7 +353,15 @@ namespace BLL
                     table.SuperTrainPersonNum = newtable.SuperTrainPersonNum;
                     table.SuperOperativesNum = newtable.SuperOperativesNum;
                     table.SuperConstructionNum = newtable.SuperConstructionNum;
-                    table.SuperFinishedNum = newtable.SuperFinishedNum;
+                    table.SuperFinishedNum = newtable.SuperFinishedNum; 
+                    table.ArgumentNum = newtable.ArgumentNum;
+                    table.SuperArgumentNum = newtable.SuperArgumentNum;
+                    table.AwaitApprovalNum = newtable.AwaitApprovalNum;
+                    table.PendingApprovalNum = newtable.PendingApprovalNum;
+                    table.CompletedApprovalNum = newtable.CompletedApprovalNum;
+                    table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum;
+                    table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum;
+                    table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum;
                     db.SubmitChanges();
                 }
             }
@@ -623,7 +637,15 @@ namespace BLL
                 table.SuperTrainPersonNum = GetSuperTrainPersonNum(projectid);
                 table.SuperOperativesNum = GetSuperOperativesNum(projectid);
                 table.SuperConstructionNum = GetSuperConstructionNum(projectid);
-                table.SuperFinishedNum = GetSuperFinishedNum(projectid);
+                table.SuperFinishedNum = GetSuperFinishedNum(projectid); 
+                table.ArgumentNum = GetArgumentNum(projectid);
+                table.SuperArgumentNum = GetSuperArgumentNum(projectid);
+                table.AwaitApprovalNum = GetAwaitApprovalNum(projectid);
+                table.PendingApprovalNum = GetPendingApprovalNum(projectid);
+                table.CompletedApprovalNum = GetCompletedApprovalNum(projectid);
+                table.SuperAwaitApprovalNum = GetSuperAwaitApprovalNum(projectid);
+                table.SuperPendingApprovalNum = GetSuperPendingApprovalNum(projectid);
+                table.SuperCompletedApprovalNum = GetSuperCompletedApprovalNum(projectid);
             }
 
             if (IsReportByToday(projectid))
@@ -1589,6 +1611,106 @@ namespace BLL
             return result;
         }
 
+        /// <summary>
+        ///     获取危大工程论证个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetArgumentNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.IsArgument == true && x.IsSuperLargerHazard == false &&
+                                x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取超危大工程论证个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetSuperArgumentNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.IsArgument == true && x.IsSuperLargerHazard == true &&
+                                x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取危大工程待审核个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetAwaitApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.ApprovalState == "0" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取超危大工程待审核个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetSuperAwaitApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.ApprovalState == "0" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取危大工程审核中个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetPendingApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.ApprovalState == "1" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取超危大工程审核中个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetSuperPendingApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.ApprovalState == "1" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取危大工程已完成个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetCompletedApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.ApprovalState == "2" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取超危大工程已完成个数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetSuperCompletedApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where x.ProjectId == projectid && x.ApprovalState == "2" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
+                          select x).Count();
+            return result;
+        }
+
+
+
         /// <summary>
         ///     获取超危大工程审批完成数
         /// </summary>
@@ -1765,7 +1887,15 @@ namespace BLL
                        x.SuperCompletedNum,
                        x.SuperTrainPersonNum,
                        x.SuperConstructionNum,
-                       x.SuperFinishedNum
+                       x.SuperFinishedNum,
+                       x.ArgumentNum,
+                       x.SuperArgumentNum,
+                       x.AwaitApprovalNum,
+                       x.PendingApprovalNum,
+                       x.CompletedApprovalNum,
+                       x.SuperAwaitApprovalNum,
+                       x.SuperPendingApprovalNum,
+                       x.SuperCompletedApprovalNum,
                    };
         }
 

SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx

@@ -0,0 +1,159 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActivityType.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.ActivityType" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>活动类型</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="活动类型" Layout="HBox" ShowHeader="false">
+            <Items>
+                <f:Grid ID="Grid1" Title="活动类型" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true"
+                    ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="760px"
+                    DataKeyNames="ActivityTypeId" DataIDField="ActivityTypeId" OnPageIndexChange="Grid1_PageIndexChange"
+                    AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField Width="150px" ColumnID="ActivityTypeCode" DataField="ActivityTypeCode" FieldType="String"
+                            HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="ActivityTypeName" DataField="ActivityTypeName" FieldType="String"
+                            HeaderText="类型" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                            HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="rowselect" Handler="onGridRowSelect" />
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+                <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
+                    LabelWidth="80px" BodyPadding="5px" Width="350px">
+                    <Items>
+                        <f:TextBox ID="hfFormID" Hidden="true"
+                            runat="server" LabelAlign="right">
+                        </f:TextBox>
+                        <f:TextBox ID="txtActivityTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
+                            LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" FocusOnPageLoad="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtActivityTypeName" Label="类型" ShowRedStar="true" Required="true" runat="server"
+                            LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                        </f:TextBox>
+                        <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
+                        </f:TextArea>
+                    </Items>
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">
+                            <Items>
+                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Text="新增">
+                                    <Listeners>
+                                        <f:Listener Event="click" Handler="onNewButtonClick" />
+                                    </Listeners>
+                                </f:Button>
+                                <f:Button ID="btnDelete" Enabled="false" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？" Text="删除"
+                                    OnClick="btnDelete_Click" runat="server">
+                                </f:Button>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Text="保存"
+                                    OnClick="btnSave_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                </f:SimpleForm>
+            </Items>
+        </f:Panel>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+
+
+        var gridClientID = '<%= Grid1.ClientID %>';
+        var btnDeleteClientID = '<%= btnDelete.ClientID %>';
+        var btnSaveClientID = '<%= btnSave.ClientID %>';
+
+        var formClientID = '<%= SimpleForm1.ClientID %>';
+        var hfFormIDClientID = '<%= hfFormID.ClientID %>';
+        var txtCodeClientID = '<%= txtActivityTypeCode.ClientID %>';
+        var txtNameClientID = '<%= txtActivityTypeName.ClientID %>';
+        var txtRemarkClientID = '<%=txtRemark.ClientID %>';
+
+        function onGridRowSelect(event, rowId) {
+            var grid = F(gridClientID);
+
+            // 启用删除按钮
+            F(btnDeleteClientID).enable();
+
+            // 当前行数据
+            var rowValue = grid.getRowValue(rowId);
+
+            // 使用当前行数据填充表单字段
+            F(hfFormIDClientID).setValue(rowId);
+            F(txtCodeClientID).setValue(rowValue['ActivityTypeCode']);
+            F(txtNameClientID).setValue(rowValue['ActivityTypeName']);
+            F(txtRemarkClientID).setValue(rowValue['Remark']);
+
+            // 更新保存按钮文本
+            //            F(btnSaveClientID).setText('保存数据（编辑）');
+        }
+
+        function onNewButtonClick() {
+            // 重置表单字段
+            F(formClientID).reset();
+            F(hfFormIDClientID).reset();
+            // 清空表格选中行
+            F(gridClientID).clearSelections();
+            // 禁用删除按钮
+            F(btnDeleteClientID).disable();
+
+            // 更新保存按钮文本
+            //            F(btnSaveClientID).setText('保存数据（新增）');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.cs

@@ -0,0 +1,277 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.BaseInfo
+{
+    public partial class ActivityType : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ////权限按钮方法
+                this.GetButtonPower();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            var q = from x in Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x;
+            Grid1.RecordCount = q.Count();
+            // 2.获取当前分页数据
+            var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <returns></returns>
+        private List<Model.Base_ActivityType> GetPagedDataTable(int pageIndex, int pageSize)
+        {
+            List<Model.Base_ActivityType> source = (from x in BLL.Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x).ToList();
+            List<Model.Base_ActivityType> paged = new List<Model.Base_ActivityType>();
+
+            int rowbegin = pageIndex * pageSize;
+            int rowend = (pageIndex + 1) * pageSize;
+            if (rowend > source.Count())
+            {
+                rowend = source.Count();
+            }
+
+            for (int i = rowbegin; i < rowend; i++)
+            {
+                paged.Add(source[i]);
+            }
+
+            return paged;
+        }
+
+        /// <summary>
+        /// 过滤表头
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页下拉选择
+        /// <summary>
+        /// 分页下拉选择
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            var ActivityType = BLL.ActivityTypeService.GetActivityTypeById(hfFormID.Text);
+            if (ActivityType != null)
+            {
+                BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnDelete);
+
+                BLL.ActivityTypeService.DeleteActivityTypeById(hfFormID.Text);
+                // 重新绑定表格，并模拟点击[新增按钮]
+                BindGrid();
+                PageContext.RegisterStartupScript("onNewButtonClick();");
+            }
+        }
+
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var ActivityType = BLL.ActivityTypeService.GetActivityTypeById(rowID);
+                    if (ActivityType != null)
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnDelete);
+                        BLL.ActivityTypeService.DeleteActivityTypeById(rowID);
+                    }
+                }
+
+                BindGrid();
+                PageContext.RegisterStartupScript("onNewButtonClick();");
+            }
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string Id = Grid1.SelectedRowID;
+            var ActivityType = BLL.ActivityTypeService.GetActivityTypeById(Id);
+            if (ActivityType != null)
+            {
+                this.txtActivityTypeCode.Text = ActivityType.ActivityTypeCode;
+                this.txtActivityTypeName.Text = ActivityType.ActivityTypeName;
+                this.txtRemark.Text = ActivityType.Remark;
+                hfFormID.Text = Id;
+                this.btnDelete.Enabled = true;
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            string strRowID = hfFormID.Text;
+            Model.Base_ActivityType ActivityType = new Model.Base_ActivityType
+            {
+                ActivityTypeCode = this.txtActivityTypeCode.Text.Trim(),
+                ActivityTypeName = this.txtActivityTypeName.Text.Trim(),
+                Remark = txtRemark.Text.Trim()
+            };
+            if (string.IsNullOrEmpty(strRowID))
+            {
+                ActivityType.ActivityTypeId = SQLHelper.GetNewID(typeof(Model.Base_ActivityType));
+                BLL.ActivityTypeService.AddActivityType(ActivityType);
+                BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnAdd);
+            }
+            else
+            {
+                ActivityType.ActivityTypeId = strRowID;
+                BLL.ActivityTypeService.UpdateActivityType(ActivityType);
+                BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnModify);
+            }
+            this.SimpleForm1.Reset();
+            // 重新绑定表格，并点击当前编辑或者新增的行
+            BindGrid();
+            PageContext.RegisterStartupScript(String.Format("F('{0}').selectRow('{1}');", Grid1.ClientID, ActivityType.ActivityTypeId));
+        }
+        #endregion
+
+        #region 验证费用类别名称、编号是否存在
+        /// <summary>
+        /// 验证费用类别名称、编号是否存在
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            var q = Funs.DB.Base_ActivityType.FirstOrDefault(x => x.ActivityTypeCode == this.txtActivityTypeCode.Text.Trim() && (x.ActivityTypeId != hfFormID.Text || (hfFormID.Text == null && x.ActivityTypeId != null)));
+            if (q != null)
+            {
+                ShowNotify("输入的类别编号已存在！", MessageBoxIcon.Warning);
+            }
+
+            var q2 = Funs.DB.Base_ActivityType.FirstOrDefault(x => x.ActivityTypeName == this.txtActivityTypeName.Text.Trim() && (x.ActivityTypeId != hfFormID.Text || (hfFormID.Text == null && x.ActivityTypeId != null)));
+            if (q2 != null)
+            {
+                ShowNotify("输入的类别名称已存在！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActivityTypeMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnDelete.Hidden = false;
+                    this.btnMenuDelete.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion        
+    }
+}

SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.designer.cs

@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.BaseInfo
+{
+
+
+    public partial class ActivityType
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm1;
+
+        /// <summary>
+        /// hfFormID 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hfFormID;
+
+        /// <summary>
+        /// txtActivityTypeCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActivityTypeCode;
+
+        /// <summary>
+        /// txtActivityTypeName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActivityTypeName;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// btnDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -234,6 +234,7 @@
     <Content Include="AttachFile\uploader.aspx" />
     <Content Include="AttachFile\webuploader.aspx" />
     <Content Include="BaseInfo\AccidentType.aspx" />
+    <Content Include="BaseInfo\ActivityType.aspx" />
     <Content Include="BaseInfo\BaseFactory.aspx" />
     <Content Include="BaseInfo\BaseFactoryEdit.aspx" />
     <Content Include="BaseInfo\Certificate.aspx" />
@@ -965,6 +966,7 @@
     <Content Include="HSSE\ActionPlan\SubManageRuleView.aspx" />
     <Content Include="HSSE\Administrative\CarManager.aspx" />
     <Content Include="HSSE\Administrative\CarManagerEdit.aspx" />
+    <Content Include="HSSE\Administrative\CarManagerIn.aspx" />
     <Content Include="HSSE\Administrative\CarManagerView.aspx" />
     <Content Include="HSSE\Administrative\DriverManager.aspx" />
     <Content Include="HSSE\Administrative\DriverManagerEdit.aspx" />
@@ -2426,6 +2428,7 @@
     <Content Include="common\font\DIN-Medium.otf" />
     <Content Include="ZHGL\Supervise\SuperviseCheckReportFinalizeEdit.aspx" />
     <Content Include="ZHGL\Supervise\UnitHazardRegister.aspx" />
+    <Content Include="ZHGL\Supervise\UnitHazardRegisterDetailIn.aspx" />
     <Content Include="ZHGL\Supervise\UnitHazardRegisterEdit.aspx" />
     <Content Include="ZHGL\Supervise\UnitHazardRegisterRecord.aspx" />
     <Content Include="ZHGL\Supervise\UnitHazardRegisterRecordEdit.aspx" />
@@ -6621,6 +6624,13 @@
     <Compile Include="BaseInfo\AccidentType.aspx.designer.cs">
       <DependentUpon>AccidentType.aspx</DependentUpon>
     </Compile>
+    <Compile Include="BaseInfo\ActivityType.aspx.cs">
+      <DependentUpon>ActivityType.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\ActivityType.aspx.designer.cs">
+      <DependentUpon>ActivityType.aspx</DependentUpon>
+    </Compile>
     <Compile Include="BaseInfo\BaseFactory.aspx.cs">
       <DependentUpon>BaseFactory.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -11244,6 +11254,13 @@
     <Compile Include="HSSE\Administrative\CarManagerEdit.aspx.designer.cs">
       <DependentUpon>CarManagerEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\Administrative\CarManagerIn.aspx.cs">
+      <DependentUpon>CarManagerIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Administrative\CarManagerIn.aspx.designer.cs">
+      <DependentUpon>CarManagerIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\Administrative\CarManagerView.aspx.cs">
       <DependentUpon>CarManagerView.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -20260,6 +20277,13 @@
     <Compile Include="ZHGL\Supervise\UnitHazardRegister.aspx.designer.cs">
       <DependentUpon>UnitHazardRegister.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterDetailIn.aspx.cs">
+      <DependentUpon>UnitHazardRegisterDetailIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterDetailIn.aspx.designer.cs">
+      <DependentUpon>UnitHazardRegisterDetailIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\Supervise\UnitHazardRegisterEdit.aspx.cs">
       <DependentUpon>UnitHazardRegisterEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx

@@ -4,109 +4,126 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>现场车辆管理</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场车辆管理" EnableCollapse="true"
-                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CarManagerId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="CarManagerId" AllowSorting="true"
-                SortField="CarManagerCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox ID="txtCarManagerCode" runat="server" Label="编号" EmptyText="输入查询条件" LabelAlign="Right"
-                                Width="320px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
-                                runat="server">
-                            </f:Button>                 
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="120px" ColumnID="CarManagerCode" DataField="CarManagerCode"
-                        SortField="CarManagerCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="CarName" DataField="CarName" SortField="CarName"
-                        FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="CarModel" DataField="CarModel" SortField="CarModel"
-                        FieldType="String" HeaderText="车型" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="BuyDate" DataField="BuyDate" SortField="BuyDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="购买日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="LastYearCheckDate" DataField="LastYearCheckDate"
-                        SortField="LastYearCheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="年检有效期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField> 
-                    <f:RenderField Width="110px" ColumnID="InsuranceDate" DataField="InsuranceDate"
-                        SortField="InsuranceDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="保险有效期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" SortField="Remark"
-                        FieldType="String" HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        <f:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="20" Value="20" />
-                        <f:ListItem Text="25" Value="25" />
-                        <f:ListItem Text="所有行" Value="10000" />
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="现场车辆管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="900px" Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
-            Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场车辆管理" EnableCollapse="true"
+                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CarManagerId"
+                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="CarManagerId" AllowSorting="true"
+                    SortField="CarManagerCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" EnableCheckBoxSelect="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtCarManagerCode" runat="server" Label="编号" EmptyText="输入查询条件" LabelAlign="Right"
+                                    Width="320px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                                </f:TextBox>
+                                <f:RadioButtonList runat="server" ID="ckInOutState" AutoPostBack="true" Label="在场状态" LabelWidth="90px" LabelAlign="Right"
+                                    OnSelectedIndexChanged="TextBox_TextChanged" Width="300px">
+                                    <f:RadioItem Text="全部" Value="" />
+                                    <f:RadioItem Text="在场" Value="1" Selected="true" />
+                                    <f:RadioItem Text="已退场" Value="0" />
+                                </f:RadioButtonList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnCarOut" ToolTip="批量退场" Icon="CarDelete" runat="server" Hidden="true" Text="批量退场" OnClick="btnCarOut_Click">
+                                </f:Button>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
+                                    runat="server">
+                                </f:Button>
+                                <f:Button ID="btnImport" ToolTip="导入" Text="导入" Icon="ApplicationPut" Hidden="true" runat="server"
+                                    OnClick="btnImport_Click">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="120px" ColumnID="CarManagerCode" DataField="CarManagerCode"
+                            SortField="CarManagerCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="CarName" DataField="CarName" SortField="CarName"
+                            FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="CarModel" DataField="CarModel" SortField="CarModel"
+                            FieldType="String" HeaderText="车型" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="InOutState" Width="120px" HeaderText="在场状态" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbInOutState" runat="server" Text='<%# ConvertInOutState(Eval("InOutState")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="90px" ColumnID="BuyDate" DataField="BuyDate" SortField="BuyDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="购买日期"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="LastYearCheckDate" DataField="LastYearCheckDate"
+                            SortField="LastYearCheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="年检有效期" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="InsuranceDate" DataField="InsuranceDate"
+                            SortField="InsuranceDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="保险有效期" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                            SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="10000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="现场车辆管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="900px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';

SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx.cs

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Administrative
         private void BindGrid()
         {
             string strSql = "SELECT CarManager.CarManagerId,CarManager.ProjectId,CodeRecords.Code AS CarManagerCode,CarManager.CarName,"
-                + @"CarManager.CarModel,CarManager.BuyDate,CarManager.LastYearCheckDate,CarManager.Remark,CarManager.CompileMan,"
+                + @"CarManager.CarModel,CarManager.BuyDate,CarManager.LastYearCheckDate,CarManager.Remark,CarManager.CompileMan,CarManager.InOutState,"
                 + @"CarManager.CompileDate,CarManager.InsuranceDate,CarManager.States,"
                 + @"(CASE WHEN CarManager.States = " + BLL.Const.State_0 + " OR CarManager.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN CarManager.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                 + @" FROM Administrative_CarManager AS CarManager  "
@@ -59,6 +59,12 @@ namespace FineUIPro.Web.HSSE.Administrative
                 strSql += " AND CarManager.CarManagerCode LIKE @CarManagerCode ";
                 listStr.Add(new SqlParameter("@CarManagerCode", "%" + this.txtCarManagerCode.Text.Trim() + "%"));
             }
+            string inOutState = this.ckInOutState.SelectedValue;
+            if (!string.IsNullOrWhiteSpace(inOutState))
+            {
+                strSql += " AND CarManager.InOutState = @InOutState ";
+                listStr.Add(new SqlParameter("@InOutState", this.ckInOutState.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -78,7 +84,20 @@ namespace FineUIPro.Web.HSSE.Administrative
         {
             this.BindGrid();
         }
-
+        /// <summary>
+        /// 车辆在场状态
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        protected string ConvertInOutState(object data)
+        {
+            string result = string.Empty;
+            if (data != null && !string.IsNullOrWhiteSpace(data.ToString()))
+            {
+                result = data.ToString() == "1" ? "在场" : "已退场";
+            }
+            return result;
+        }
         /// <summary>
         /// 改变索引事件
         /// </summary>
@@ -216,9 +235,11 @@ namespace FineUIPro.Web.HSSE.Administrative
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     this.btnNew.Hidden = false;
+                    this.btnImport.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
+                    this.btnCarOut.Hidden = false;
                     this.btnMenuEdit.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
@@ -273,6 +294,10 @@ namespace FineUIPro.Web.HSSE.Administrative
                     {
                         html = (row.FindControl("lblNumber") as AspNet.Label).Text;
                     }
+                    else if (column.ColumnID == "InOutState")
+                    {
+                        html = (row.FindControl("lbInOutState") as AspNet.Label).Text;
+                    }
                     sb.AppendFormat("<td>{0}</td>", html);
                 }
 
@@ -284,5 +309,56 @@ namespace FineUIPro.Web.HSSE.Administrative
             return sb.ToString();
         }
         #endregion
+
+
+        #region 退场
+
+        /// <summary>
+        /// 批量退场按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnCarOut_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                int succ = 0;
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var rows = BLL.CarManagerService.GetCarManagerById(rowID);
+                    if (rows != null && rows.InOutState != "0")
+                    {
+                        rows.InOutState = "0";
+                        BLL.CarManagerService.UpdateCarManager(rows);
+                        succ++;
+                    }
+                }
+                BindGrid();
+                ShowNotify("操作完成，已退场" + succ + "条", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify("请选择需要退场的车辆", MessageBoxIcon.Warning);
+            }
+        }
+
+        #endregion
+
+        #region 导入
+
+        /// <summary>
+        /// 导入按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("CarManagerIn.aspx?ProjectId={0}", this.CurrUser.LoginProjectId), "导入"));
+        }
+
+        #endregion
+
+
     }
 }

SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Administrative {
-    
-    
-    public partial class CarManager {
-        
+namespace FineUIPro.Web.HSSE.Administrative
+{
+
+
+    public partial class CarManager
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtCarManagerCode 控件。
         /// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarManagerCode;
-        
+
+        /// <summary>
+        /// ckInOutState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList ckInOutState;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +85,16 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
+        /// <summary>
+        /// btnCarOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnCarOut;
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +103,16 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +130,16 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
+        /// <summary>
+        /// lbInOutState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbInOutState;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerEdit.aspx

@@ -45,6 +45,15 @@
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList ID="rblInOutState" runat="server" Label="在场状态" LabelAlign="Right" Required="True" ShowRedStar="True" LabelWidth="120px">
+                            <f:RadioItem Value="1" Text="在场" Selected="true" />
+                            <f:RadioItem Value="0" Text="已退场" />
+                        </f:RadioButtonList>
+                    </Items>
+                </f:FormRow>
+
                 <f:FormRow>
                     <Items>
                         <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" MaxLength="500"

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerEdit.aspx.cs

@@ -62,6 +62,11 @@ namespace FineUIPro.Web.HSSE.Administrative
                         this.txtLastYearCheckDate.Text = string.Format("{0:yyyy-MM-dd}", carManager.LastYearCheckDate);
                         this.txtInsuranceDate.Text = string.Format("{0:yyyy-MM-dd}", carManager.InsuranceDate);
                         this.txtRemark.Text = carManager.Remark;
+                        if (carManager.InOutState != null)
+                        {
+                            this.rblInOutState.SelectedValue = carManager.InOutState;
+                        }
+
                     }
                 }
                 else
@@ -126,6 +131,7 @@ namespace FineUIPro.Web.HSSE.Administrative
                 InsuranceDate = Funs.GetNewDateTime(this.txtInsuranceDate.Text.Trim()),
                 Remark = this.txtRemark.Text.Trim(),
                 CompileMan = this.CurrUser.UserId,
+                InOutState = this.rblInOutState.SelectedValue,
                 CompileDate = DateTime.Now,
                 States = BLL.Const.State_0
             };

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Administrative {
-    
-    
-    public partial class CarManagerEdit {
-        
+namespace FineUIPro.Web.HSSE.Administrative
+{
+
+
+    public partial class CarManagerEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCarManagerCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarManagerCode;
-        
+
         /// <summary>
         /// txtCarName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarName;
-        
+
         /// <summary>
         /// txtCarModel 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarModel;
-        
+
         /// <summary>
         /// txtBuyDate 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtBuyDate;
-        
+
         /// <summary>
         /// txtLastYearCheckDate 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtLastYearCheckDate;
-        
+
         /// <summary>
         /// txtInsuranceDate 控件。
         /// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtInsuranceDate;
-        
+
+        /// <summary>
+        /// rblInOutState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblInOutState;
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// ctlAuditFlow 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerIn.aspx

@@ -0,0 +1,80 @@
+<%@ Page Language="C#" CodeBehind="CarManagerIn.aspx.cs" Inherits="FineUIPro.Web.HSSE.Administrative.CarManagerIn" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>导入</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />   
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        <Toolbars>
+            <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                <Items>                  
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                    <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                        OnClick="btnAudit_Click">
+                    </f:Button>
+                    <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                              OnClick="btnImport_Click">
+                    </f:Button>
+                    <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                        LabelWidth="150px">
+                    </f:FileUpload>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="导入质量隐患" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                        <Columns>
+                            <f:TemplateField ColumnID="tfPageIndex" Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                             EnableLock="true" Locked="False">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                </ItemTemplate>
+                            </f:TemplateField>
+                            <f:BoundField DataField="Row" HeaderText="错误行号" Width="50px">
+                            </f:BoundField>
+                            <f:BoundField DataField="Column" HeaderText="错误列" Width="100px">
+                            </f:BoundField>
+                            <f:BoundField DataField="Reason" HeaderText="错误类型" MinWidth="220px">
+                            </f:BoundField>
+                        </Columns>
+                    </f:Grid>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:HiddenField ID="hdFileName" runat="server">
+                    </f:HiddenField>
+                    <f:HiddenField ID="hdCheckResult" runat="server">
+                    </f:HiddenField>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lblBottom" runat="server" Text="说明：1 导入模板为.xls后缀的EXCEL文件，有背景色列为必填项。2 数据导入完成，成功后自动返回，如果有不成功数据页面弹出提示框，列表显示导入成功数据。">
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+        </Rows>
+    </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerIn.aspx.cs

@@ -0,0 +1,520 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+
+namespace FineUIPro.Web.HSSE.Administrative
+{
+    public partial class CarManagerIn : PageBase
+    {
+        #region 定义变量
+
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        public static int Cols = 7;//列数
+
+        public static Dictionary<string, string> imgDic = new Dictionary<string, string>();
+
+        public static List<string> validStateStrings = new List<string> { "在场", "已退场" };
+
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = Request.Params["ProjectId"];
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+
+                //if (this.CurrUser.UserId == Const.AdminId)
+                //{
+                //    this.btnFastImport.Hidden = false;
+                //}
+            }
+        }
+
+        #region 下载模板
+
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            //这里要注意了，如果传过来的没有记录
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", string.Empty,
+                MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"),
+                PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + Const.CarManagerTemplateUrl;
+                string filePath = Const.CarManagerTemplateUrl;
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0]);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds)
+        {
+            string result = string.Empty;
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var oldViewInfos = from x in Funs.DB.Administrative_CarManager
+                                   where x.ProjectId == this.CurrUser.LoginProjectId
+                                   select x;
+
+                var listCar = new List<string>();
+                for (int i = 0; i < ir; i++)
+                {
+                    string row0 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row0))
+                    {
+                        result += (i + 2).ToString() + "," + "车牌号" + "," + "此项为必填项！" + "|";
+                    }
+                    else
+                    {
+                        var u = oldViewInfos.Where(x => x.CarName == row0).FirstOrDefault();
+                        if (u != null)
+                        {
+                            result += (i + 2).ToString() + "," + "车牌号" + "," + "系统中已存在车牌号[" + row0 + "]！" + "|";
+                        }
+                        else
+                        {
+                            if (listCar.Where(x => x == row0).Any())
+                            {
+                                result += (i + 2).ToString() + "," + "车牌号" + "," + "导入数据中已存在车牌号[" + row0 + "]！" + "|";
+                            }
+                            else
+                            {
+                                listCar.Add(row0);
+                            }
+                        }
+                    }
+
+                    string row2 = pds.Rows[i][2].ToString();
+                    if (!string.IsNullOrEmpty(row2))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row2.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "购买日期" + "," + "[" + row2 + "]错误！" + "|";
+                        }
+                    }
+                    string row3 = pds.Rows[i][3].ToString();
+                    if (!string.IsNullOrEmpty(row3))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row3.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "年检有效期" + "," + "[" + row3 + "]错误！" + "|";
+                        }
+                    }
+                    string row4 = pds.Rows[i][4].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row4.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "保险有效期" + "," + "[" + row4 + "]错误！" + "|";
+                        }
+                    }
+
+                    string row5 = pds.Rows[i][5].ToString();
+                    if (string.IsNullOrEmpty(row5))
+                    {
+                        result += (i + 2).ToString() + "," + "在场状态" + "," + "此项为必填项！" + "|";
+                    }
+                    else
+                    {
+                        if (!validStateStrings.Any(x => x == row5))
+                        {
+                            result += (i + 2).ToString() + "," + "在场状态" + "," + "在场状态只能是[在场/已出场]！" + "|";
+                        }
+                    }
+                }
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(0, result.LastIndexOf("|"));
+                }
+                errorInfos.Clear();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    string results = result;
+                    List<string> errorInfoList = results.Split('|').ToList();
+                    foreach (var item in errorInfoList)
+                    {
+                        string[] errors = item.Split(',');
+                        Model.ErrorInfo errorInfo = new Model.ErrorInfo();
+                        errorInfo.Row = errors[0];
+                        errorInfo.Column = errors[1];
+                        errorInfo.Reason = errors[2];
+                        errorInfos.Add(errorInfo);
+                    }
+                    if (errorInfos.Count > 0)
+                    {
+                        this.gvErrorInfo.DataSource = errorInfos;
+                        this.gvErrorInfo.DataBind();
+                    }
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0]);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var oldViewInfos = from x in Funs.DB.Administrative_CarManager
+                                   where x.ProjectId == this.CurrUser.LoginProjectId
+                                   select x;
+
+                var cns = from x in Funs.DB.Base_CNProfessional select x;
+
+                for (int i = 0; i < ir; i++)
+                {
+                    var oldViewInfo = oldViewInfos.Where(x => x.CarName == pds.Rows[i][0].ToString()).FirstOrDefault();
+                    if (oldViewInfo == null)
+                    {
+                        Model.Administrative_CarManager des = new Model.Administrative_CarManager();
+                        des.CarManagerId = SQLHelper.GetNewID(typeof(Model.Administrative_CarManager));
+                        des.ProjectId = this.CurrUser.LoginProjectId;
+                        des.CarManagerCode = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.CarManagerMenuId, this.ProjectId, this.CurrUser.UnitId);
+                        des.CarName = pds.Rows[i][0].ToString().Trim();
+                        des.CarModel = pds.Rows[i][1].ToString().Trim();
+                        string row2 = pds.Rows[i][2].ToString();
+                        if (!string.IsNullOrEmpty(row2))
+                        {
+                            try
+                            {
+                                des.BuyDate = Convert.ToDateTime(row2.Trim());
+                            }
+                            catch (Exception)
+                            {
+
+                            }
+                        }
+                        string row3 = pds.Rows[i][3].ToString();
+                        if (!string.IsNullOrEmpty(row3))
+                        {
+                            try
+                            {
+                                des.LastYearCheckDate = Convert.ToDateTime(row3.Trim());
+                            }
+                            catch (Exception)
+                            {
+
+                            }
+                        }
+                        string row4 = pds.Rows[i][4].ToString();
+                        if (!string.IsNullOrEmpty(row4))
+                        {
+                            try
+                            {
+                                des.InsuranceDate = Convert.ToDateTime(row4.Trim());
+                            }
+                            catch (Exception)
+                            {
+
+                            }
+                        }
+                        string row5 = pds.Rows[i][5].ToString().Trim();
+                        switch (row5)
+                        {
+                            case "在场":
+                                des.InOutState = "1"; break;
+                            case "已退场":
+                                des.InOutState = "0"; break;
+                            default:
+                                des.InOutState = null; break;
+                        }
+                        des.Remark = pds.Rows[i][6].ToString().Trim();
+                        BLL.CarManagerService.AddCarManager(des);
+                    }
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerIn.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Administrative
+{
+
+
+    public partial class CarManagerIn
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+
+        /// <summary>
+        /// lblBottom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblBottom;
+    }
+}

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerView.aspx

@@ -46,6 +46,14 @@
                     </f:DatePicker>
                 </Items>
             </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList ID="rblInOutState" runat="server" Label="在场状态" LabelAlign="Right" Readonly="true" LabelWidth="120px">
+                            <f:RadioItem Value="1" Text="在场" Selected="true" />
+                            <f:RadioItem Value="0" Text="已退场" />
+                        </f:RadioButtonList>
+                    </Items>
+                </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" Readonly="true"

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerView.aspx.cs

@@ -45,7 +45,12 @@ namespace FineUIPro.Web.HSSE.Administrative
                         this.txtBuyDate.Text = string.Format("{0:yyyy-MM-dd}", carManager.BuyDate);
                         this.txtLastYearCheckDate.Text = string.Format("{0:yyyy-MM-dd}", carManager.LastYearCheckDate);
                         this.txtInsuranceDate.Text = string.Format("{0:yyyy-MM-dd}", carManager.InsuranceDate);
-                        this.txtRemark.Text = carManager.Remark;
+                        this.txtRemark.Text = carManager.Remark; 
+                        if (carManager.InOutState != null)
+                        {
+                            this.rblInOutState.SelectedValue = carManager.InOutState;
+                        }
+
                     }
                 }
                 ///初始化审核菜单

SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerView.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Administrative {
-    
-    
-    public partial class CarManagerView {
-        
+namespace FineUIPro.Web.HSSE.Administrative
+{
+
+
+    public partial class CarManagerView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCarManagerCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarManagerCode;
-        
+
         /// <summary>
         /// txtCarName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarName;
-        
+
         /// <summary>
         /// txtCarModel 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCarModel;
-        
+
         /// <summary>
         /// txtBuyDate 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtBuyDate;
-        
+
         /// <summary>
         /// txtLastYearCheckDate 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtLastYearCheckDate;
-        
+
         /// <summary>
         /// txtInsuranceDate 控件。
         /// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtInsuranceDate;
-        
+
+        /// <summary>
+        /// rblInOutState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblInOutState;
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// ctlAuditFlow 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Administrative {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx

@@ -33,10 +33,13 @@
                                     AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                     LabelAlign="right">
                                 </f:TextBox>
-                                <f:TextBox runat="server" Label="活动主题" ID="txtTitle" EmptyText="输入查询条件"
+                                <f:TextBox runat="server" Label="活动名称" ID="txtTitle" EmptyText="输入查询条件"
                                     AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                     LabelAlign="right">
                                 </f:TextBox>
+                                <f:DropDownList ID="drpActivityType" runat="server" Label="活动类型" Width="210px" LabelWidth="80px" LabelAlign="Right"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                </f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
@@ -60,7 +63,11 @@
                             TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="Title" DataField="Title"
-                            SortField="Title" FieldType="String" HeaderText="活动主题" HeaderTextAlign="Center"
+                            SortField="Title" FieldType="String" HeaderText="活动名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ActivityTypeName" DataField="ActivityTypeName"
+                            SortField="ActivityTypeName" FieldType="String" HeaderText="活动类型" HeaderTextAlign="Center"
                             TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="ActivitiesDate" DataField="ActivitiesDate"

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs

@@ -9,7 +9,7 @@ using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.InformationProject
 {
-    public partial class PromotionalActivities :PageBase
+    public partial class PromotionalActivities : PageBase
     {
         #region 加载
         /// <summary>
@@ -21,6 +21,9 @@ namespace FineUIPro.Web.HSSE.InformationProject
         {
             if (!IsPostBack)
             {
+                //活动类型
+                ActivityTypeService.InitActivityTypeDropDownList(this.drpActivityType, true);
+
                 ////权限按钮方法
                 this.GetButtonPower();
                 this.btnNew.OnClientClick = Window1.GetShowReference("PromotionalActivitiesEdit.aspx") + "return false;";
@@ -32,17 +35,17 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 // 绑定表格
                 this.BindGrid();
             }
-        }
-        /// <summary>
-        /// 绑定数据
-        /// </summary>
+        }        /// <summary>
+                 /// 绑定数据
+                 /// </summary>
         private void BindGrid()
         {
             string strSql = @"SELECT PromotionalActivities.PromotionalActivitiesId,PromotionalActivities.ProjectId,CodeRecords.Code AS Code,PromotionalActivities.Title,PromotionalActivities.ActivitiesDate,PromotionalActivities.UnitNames"
-                          + @" ,PromotionalActivities.CompileMan,Users.UserName AS CompileManName,PromotionalActivities.CompileDate,PromotionalActivities.States "
+                          + @" ,PromotionalActivities.CompileMan,Users.UserName AS CompileManName,PromotionalActivities.CompileDate,PromotionalActivities.States,ActivityType.ActivityTypeName "
                           + @" ,(CASE WHEN PromotionalActivities.States = " + BLL.Const.State_0 + " OR PromotionalActivities.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN PromotionalActivities.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" FROM InformationProject_PromotionalActivities AS PromotionalActivities "
                           + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON PromotionalActivities.PromotionalActivitiesId=CodeRecords.DataId "
+                          + @" LEFT JOIN Base_ActivityType AS ActivityType ON PromotionalActivities.ActivityTypeId=ActivityType.ActivityTypeId "
                           + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON PromotionalActivities.PromotionalActivitiesId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
                           + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
                           + @" LEFT JOIN Sys_User AS Users ON PromotionalActivities.CompileMan=Users.UserId WHERE 1=1 ";
@@ -58,6 +61,11 @@ namespace FineUIPro.Web.HSSE.InformationProject
             {
                 listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             }
+            if (this.drpActivityType.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND PromotionalActivities.ActivityTypeId = @ActType";
+                listStr.Add(new SqlParameter("@ActType", this.drpActivityType.SelectedValue));
+            }
 
             if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
             {

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class PromotionalActivities {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class PromotionalActivities
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtCode 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCode;
-        
+
         /// <summary>
         /// txtTitle 控件。
         /// </summary>
@@ -74,7 +76,16 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTitle;
-        
+
+        /// <summary>
+        /// drpActivityType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpActivityType;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivitiesEdit.aspx

@@ -20,11 +20,17 @@
                         <f:TextBox ID="txtCode" runat="server" Label="活动编号" LabelAlign="Right"
                             MaxLength="50" Readonly="true">
                         </f:TextBox>
-                        <f:TextBox ID="txtTitle" runat="server" Label="活动主题" Required="true" ShowRedStar="true"
+                        <f:TextBox ID="txtTitle" runat="server" Label="活动名称" Required="true" ShowRedStar="true"
                             LabelAlign="Right" MaxLength="500" FocusOnPageLoad="true">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpActivityType" runat="server" Label="活动类型" Required="true" ShowRedStar="true" AutoSelectFirstItem="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpUnits" runat="server" Label="参与单位" EnableEdit="true" EnableMultiSelect="true"

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivitiesEdit.aspx.cs

@@ -78,6 +78,10 @@ namespace FineUIPro.Web.HSSE.InformationProject
                             this.drpCompileMan.SelectedValue = PromotionalActivities.CompileMan;
                         }
                         this.txtMainContent.Text = HttpUtility.HtmlDecode(PromotionalActivities.MainContent);
+                        if (!string.IsNullOrEmpty(PromotionalActivities.ActivityTypeId))
+                        {
+                            this.drpActivityType.SelectedValue = PromotionalActivities.ActivityTypeId;
+                        }
                     }
                 }
                 else
@@ -116,6 +120,8 @@ namespace FineUIPro.Web.HSSE.InformationProject
             BLL.UnitService.InitUnitDropDownList(this.drpUnits, this.ProjectId, false);
             BLL.UserService.InitUserDropDownList(this.drpUsers, this.ProjectId, false);
             BLL.UserService.InitUserDropDownList(this.drpCompileMan, this.ProjectId, true);
+            //活动类型
+            ActivityTypeService.InitActivityTypeDropDownList(this.drpActivityType, false);
         }
         #endregion
 
@@ -200,6 +206,10 @@ namespace FineUIPro.Web.HSSE.InformationProject
             {
                 PromotionalActivities.CompileMan = this.drpCompileMan.SelectedValue;
             }
+            if (this.drpActivityType.SelectedValue != BLL.Const._Null)
+            {
+                PromotionalActivities.ActivityTypeId = this.drpActivityType.SelectedValue;
+            }
             PromotionalActivities.MainContent = HttpUtility.HtmlEncode(this.txtMainContent.Text);
             PromotionalActivities.CompileDate = DateTime.Now;
             ////单据状态

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivitiesEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class PromotionalActivitiesEdit {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class PromotionalActivitiesEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCode;
-        
+
         /// <summary>
         /// txtTitle 控件。
         /// </summary>
@@ -56,7 +58,16 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTitle;
-        
+
+        /// <summary>
+        /// drpActivityType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpActivityType;
+
         /// <summary>
         /// drpUnits 控件。
         /// </summary>
@@ -65,7 +76,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnits;
-        
+
         /// <summary>
         /// drpUsers 控件。
         /// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUsers;
-        
+
         /// <summary>
         /// txtActivitiesDate 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtActivitiesDate;
-        
+
         /// <summary>
         /// drpCompileMan 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCompileMan;
-        
+
         /// <summary>
         /// txtMainContent 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HtmlEditor txtMainContent;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// ctlAuditFlow 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivitiesView.aspx

@@ -21,11 +21,17 @@
                         <f:TextBox ID="txtCode" runat="server" Label="活动编号" LabelAlign="Right"
                             Readonly="true">
                         </f:TextBox>
-                        <f:TextBox ID="txtTitle" runat="server" Label="活动主题"
+                        <f:TextBox ID="txtTitle" runat="server" Label="活动名称"
                             LabelAlign="Right" Readonly="true">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpActivityType" runat="server" Label="活动类型" Readonly="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:TextArea ID="txtUnits" runat="server" Label="参与单位" Readonly="true" LabelAlign="Right" Height="50px">

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivitiesView.aspx.cs

@@ -1,4 +1,5 @@
-using System;
+using BLL;
+using System;
 using System.Web;
 
 namespace FineUIPro.Web.HSSE.InformationProject
@@ -34,6 +35,9 @@ namespace FineUIPro.Web.HSSE.InformationProject
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 this.PromotionalActivitiesId = Request.Params["PromotionalActivitiesId"];
+                //活动类型
+                ActivityTypeService.InitActivityTypeDropDownList(this.drpActivityType, false);
+
                 if (!string.IsNullOrEmpty(this.PromotionalActivitiesId))
                 {
                     Model.InformationProject_PromotionalActivities PromotionalActivities = BLL.PromotionalActivitiesService.GetPromotionalActivitiesById(this.PromotionalActivitiesId);
@@ -51,6 +55,10 @@ namespace FineUIPro.Web.HSSE.InformationProject
                         {
                             this.drpCompileMan.Text = users.UserName;
                         }
+                        if (!string.IsNullOrEmpty(PromotionalActivities.ActivityTypeId))
+                        {
+                            this.drpActivityType.SelectedValue = PromotionalActivities.ActivityTypeId;
+                        }
 
                         this.txtUnits.Text = PromotionalActivities.UnitNames;
                         this.txtUsers.Text = PromotionalActivities.UserNames;

SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivitiesView.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class PromotionalActivitiesView {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class PromotionalActivitiesView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCode;
-        
+
         /// <summary>
         /// txtTitle 控件。
         /// </summary>
@@ -56,7 +58,16 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTitle;
-        
+
+        /// <summary>
+        /// drpActivityType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpActivityType;
+
         /// <summary>
         /// txtUnits 控件。
         /// </summary>
@@ -65,7 +76,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtUnits;
-        
+
         /// <summary>
         /// txtUsers 控件。
         /// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUsers;
-        
+
         /// <summary>
         /// txtActivitiesDate 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtActivitiesDate;
-        
+
         /// <summary>
         /// drpCompileMan 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox drpCompileMan;
-        
+
         /// <summary>
         /// txtMainContent 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HtmlEditor txtMainContent;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// ctlAuditFlow 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx

@@ -41,23 +41,27 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-
                         <f:RadioButtonList ID="rblIsSuperLargerHazard" runat="server" Label="超危大工程" LabelWidth="100px" Required="true" ShowRedStar="true">
                         </f:RadioButtonList>
                         <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
-                        <f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right">
-                            <f:ListItem Text="审批完成" Value="1" />
-                            <f:ListItem Text="作业中" Value="2" />
-                            <f:ListItem Text="已关闭" Value="3" />
-                            <f:ListItem Text="已取消" Value="0" />
-                        </f:DropDownList>
+                        <f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
+                        <f:DropDownList ID="drpStates" runat="server" Label="作业状态" LabelAlign="Right">
+                            <f:ListItem Text="未开始" Value="1" />
+                            <%--<f:ListItem Text="审批完成" Value="1" />--%>
+                            <f:ListItem Text="作业中" Value="2" />
+                            <f:ListItem Text="已关闭" Value="3" />
+                            <f:ListItem Text="已取消" Value="0" />
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpApprovalState" runat="server" Label="审批状态" LabelAlign="Right">
+                            <f:ListItem Text="待审核" Value="0" />
+                            <f:ListItem Text="审核中" Value="1" />
+                            <f:ListItem Text="已完成" Value="2" />
+                        </f:DropDownList>
                         <f:Label runat="server" ID="txtOperativesNum1"></f:Label>
-                        <f:Label runat="server" ID="txtOperativesNum2"></f:Label>
                     </Items>
                 </f:FormRow>
 

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs

@@ -106,8 +106,9 @@ namespace FineUIPro.Web.HSSE.Solution
                         this.txtOperativesNum.Text = largerHazard.OperativesNum.ToString();
                     }
                     this.drpStates.SelectedValue = largerHazard.States;
+                    this.drpApprovalState.SelectedValue = largerHazard.ApprovalState;
                     this.txtRemark.Text = HttpUtility.HtmlDecode(largerHazard.Remark);
-                    this.txtDescriptions.Text = largerHazard.Descriptions;
+                    this.txtDescriptions.Text = largerHazard.Descriptions; 
                     this.txtHazardName.Text = largerHazard.HazardName;
                 }
                 else
@@ -204,6 +205,7 @@ namespace FineUIPro.Web.HSSE.Solution
                 RecordTime = Funs.GetNewDateTime(this.txtRecordTime.Text.Trim()),
                 ProjectId = this.ProjectId,
                 States = this.drpStates.SelectedValue,
+                ApprovalState = this.drpApprovalState.SelectedValue,
                 HazardName = txtHazardName.Text.Trim()
             };
             if (!string.IsNullOrEmpty(this.HazardId))

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs

@@ -122,15 +122,6 @@ namespace FineUIPro.Web.HSSE.Solution
         /// </remarks>
         protected global::FineUIPro.NumberBox txtTrainPersonNum;
 
-        /// <summary>
-        /// drpStates 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpStates;
-
         /// <summary>
         /// txtOperativesNum 控件。
         /// </summary>
@@ -140,6 +131,24 @@ namespace FineUIPro.Web.HSSE.Solution
         /// </remarks>
         protected global::FineUIPro.NumberBox txtOperativesNum;
 
+        /// <summary>
+        /// drpStates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpStates;
+
+        /// <summary>
+        /// drpApprovalState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpApprovalState;
+
         /// <summary>
         /// txtOperativesNum1 控件。
         /// </summary>
@@ -149,15 +158,6 @@ namespace FineUIPro.Web.HSSE.Solution
         /// </remarks>
         protected global::FineUIPro.Label txtOperativesNum1;
 
-        /// <summary>
-        /// txtOperativesNum2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label txtOperativesNum2;
-
         /// <summary>
         /// txtDescriptions 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx

@@ -111,9 +111,13 @@
                                     FieldType="String" HeaderText="专家论证" TextAlign="Center" HeaderTextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="StatesStr" DataField="StatesStr"
-                                    SortField="StatesStr" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    SortField="StatesStr" FieldType="String" HeaderText="作业状态" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ApprovalStateStr" DataField="ApprovalStateStr"
+                                    SortField="ApprovalStateStr" FieldType="String" HeaderText="审批状态" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
                             </Columns>
                             <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs

@@ -72,11 +72,15 @@ namespace FineUIPro.Web.HSSE.Solution
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT LargerHazard.HazardId,LargerHazard.ProjectId,LargerHazard.HazardCode,LargerHazard.Address,Users.UserName,LargerHazard.ExpectedTime,LargerHazard.RecordTime "
-                          + @" ,case LargerHazard.States when '1' then '审批完成'
+                          + @" ,case LargerHazard.States when '1' then '未开始'
 	                               when '2' then '作业中'
 								   when '3' then '已关闭'
 								   when '0' then '已取消'
 								   else '' end as StatesStr"
+                          + @" ,case LargerHazard.ApprovalState when '0' then '待审核'
+	                               when '1' then '审核中'
+								   when '2' then '已完成'
+								   else '' end as ApprovalStateStr"
                           + @", case when LargerHazard.IsArgument=1 then '是' else '否' end as IsArgumentStr,Const.ConstText as TypeName,Project.ProjectName"
                           + @", case when LargerHazard.IsSuperLargerHazard=1 then '超危大工程' else '危大工程' end as IsSuperLargerHazard "
                           + @" FROM Solution_LargerHazard AS LargerHazard "

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx

@@ -1,4 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LargerHazardView.aspx.cs" ValidateRequest="false" Inherits="FineUIPro.Web.HSSE.Solution.LargerHazardView" %>
+
 <%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl" TagPrefix="uc1" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -8,216 +9,227 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtLargerHazardCode" runat="server" Label="文件编号"
-                        LabelWidth="100px" Readonly="true" >
-                    </f:TextBox>
-                     <f:TextBox ID="txtHazardType" runat="server" Label="类型" LabelWidth="100px" Readonly="true" >
-                    </f:TextBox>
-                      <f:TextBox ID="txtExpectedTime" runat="server" Label="预计施工" LabelWidth="100px" Readonly="true" >
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                        <f:TextBox ID="txtIsArgument" runat="server" Label="专家论证" LabelWidth="100px"  Readonly="true" >
-                    </f:TextBox>
-                     <f:TextBox ID="txtRecordTime" runat="server" Label="编制时间" LabelWidth="100px" Readonly="true" >
-                    </f:TextBox>
-                    <%-- <f:TextBox ID="txtAddress" runat="server" Label="地点" Readonly="true" LabelWidth="100px" > --%>
-                    <%-- </f:TextBox> --%>
-                    <f:DropDownList ID="drpAddress" runat="server" Label="地点" EnableCheckBoxSelect="true" EnableMultiSelect="true" MaxLength="50" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>                   
-                    
-                     <f:TextBox ID="txtIsSuperLargerHazard" runat="server" Label="专家论证" LabelWidth="100px"  Readonly="true" >
-                    </f:TextBox>
-                    <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" Label="培训人次" LabelWidth="100px" Readonly="true"></f:NumberBox>
-                    <f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right" Readonly="true">
-                              <f:ListItem Text="审批完成"  Value="1"/>
-                              <f:ListItem Text="作业中" Value="2"/>
-                               <f:ListItem Text="已关闭" Value="3"/>
-                              <f:ListItem Text="已取消" Value="-1"/>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtLargerHazardCode" runat="server" Label="文件编号"
+                            LabelWidth="100px" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtHazardType" runat="server" Label="类型" LabelWidth="100px" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtExpectedTime" runat="server" Label="预计施工" LabelWidth="100px" Readonly="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtRecordTime" runat="server" Label="编制时间" LabelWidth="100px" Readonly="true">
+                        </f:TextBox>
+                        <%-- <f:TextBox ID="txtAddress" runat="server" Label="地点" Readonly="true" LabelWidth="100px" > --%>
+                        <%-- </f:TextBox> --%>
+                        <f:DropDownList ID="drpAddress" runat="server" Label="地点" EnableCheckBoxSelect="true" EnableMultiSelect="true" MaxLength="50" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtIsSuperLargerHazard" runat="server" Label="专家论证" LabelWidth="100px" Readonly="true">
+                        </f:TextBox>
+                        <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" Label="培训人次" LabelWidth="100px" Readonly="true"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px" Readonly="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpStates" runat="server" Label="作业状态" LabelAlign="Right" Readonly="true">
+                            <f:ListItem Text="审批完成" Value="1" />
+                            <f:ListItem Text="作业中" Value="2" />
+                            <f:ListItem Text="已关闭" Value="3" />
+                            <f:ListItem Text="已取消" Value="-1" />
                         </f:DropDownList>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                      <f:TextArea ID="txtDescriptions" runat="server" Label="描述" LabelWidth="100px" 
-                        LabelAlign="Right" MaxLength="500" Height="100px"></f:TextArea>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>          
-                    <f:HtmlEditor runat="server" Label="描述" ID="txtRemark" ShowLabel="false" Hidden="true"
-                        Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="200px" LabelAlign="Right">
-                    </f:HtmlEditor>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px">
-                        <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
+                        <f:DropDownList ID="drpApprovalState" runat="server" Label="审批状态" LabelAlign="Right" Readonly="true">
+                            <f:ListItem Text="待审核" Value="0" />
+                            <f:ListItem Text="审核中" Value="1" />
+                            <f:ListItem Text="已完成" Value="2" />
+                        </f:DropDownList>
+                        <f:Label runat="server" ID="txtOperativesNum1"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtDescriptions" runat="server" Label="描述" LabelWidth="100px"
+                            LabelAlign="Right" MaxLength="500" Height="100px">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:HtmlEditor runat="server" Label="描述" ID="txtRemark" ShowLabel="false" Hidden="true"
+                            Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="200px" LabelAlign="Right">
+                        </f:HtmlEditor>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
+                            BodyPadding="0px">
+                            <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
 
 
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                        <Items>
-                            <f:Label ID="Label1" runat="server" Label="附件1-论证后的方案"
-                                     LabelAlign="Right" LabelWidth="180px">
-                            </f:Label>
-                            <f:ContentPanel ID="ContentPanel0" runat="server" ShowHeader="false" ShowBorder="false">
-                                <table>
-                                    <tr style="height: 28px">
-                                        <td align="left">
-                                            <div id="AttachUrl1" runat="server">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel3" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                        <Items>
-                            <f:Label ID="Label2" runat="server" Label="附件2-专家论证报告"
-                                     LabelAlign="Right" LabelWidth="180px">
-                            </f:Label>
-                            <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" ShowBorder="false">
-                                <table>
-                                    <tr style="height: 28px">
-                                        <td align="left">
-                                            <div id="AttachUrl2" runat="server">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel4" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                        <Items>
-                            <f:Label ID="Label3" runat="server" Label="附件3-论证会签到表"
-                                     LabelAlign="Right" LabelWidth="180px">
-                            </f:Label>
-                            <f:ContentPanel ID="ContentPanel3" runat="server" ShowHeader="false" ShowBorder="false">
-                                <table>
-                                    <tr style="height: 28px">
-                                        <td align="left">
-                                            <div id="AttachUrl3" runat="server">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel5" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                        <Items>
-                            <f:Label ID="Label4" runat="server" Label="附件4-论证会会议照片"
-                                     LabelAlign="Right" LabelWidth="180px">
-                            </f:Label>
-                            <f:ContentPanel ID="ContentPanel4" runat="server" ShowHeader="false" ShowBorder="false">
-                                <table>
-                                    <tr style="height: 28px">
-                                        <td align="left">
-                                            <div id="AttachUrl4" runat="server">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel6" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                        <Items>
-                            <f:Label ID="Label5" runat="server" Label="附件5-方案交底记录"
-                                     LabelAlign="Right" LabelWidth="180px">
-                            </f:Label>
-                            <f:ContentPanel ID="ContentPanel5" runat="server" ShowHeader="false" ShowBorder="false">
-                                <table>
-                                    <tr style="height: 28px">
-                                        <td align="left">
-                                            <div id="AttachUrl5" runat="server">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel7" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                        <Items>
-                            <f:Label ID="Label6" runat="server" Label="附件6-方案交底会议照片"
-                                     LabelAlign="Right" LabelWidth="180px">
-                            </f:Label>
-                            <f:ContentPanel ID="ContentPanel6" runat="server" ShowHeader="false" ShowBorder="false">
-                                <table>
-                                    <tr style="height: 28px">
-                                        <td align="left">
-                                            <div id="AttachUrl6" runat="server">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-        </Rows>
-        <Toolbars>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
-                <Items>
-                    <f:Label runat="server" ID="lbTemp">
-                    </f:Label>
-                    <%-- <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" --%>
-                    <%--     OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> --%>
-                    <%-- </f:Button> --%>
-                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                    </f:ToolbarFill>
-                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
-                    </f:Button>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-    </f:Form>
-    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label1" runat="server" Label="附件1-论证后的方案"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:Label>
+                                <f:ContentPanel ID="ContentPanel0" runat="server" ShowHeader="false" ShowBorder="false">
+                                    <table>
+                                        <tr style="height: 28px">
+                                            <td align="left">
+                                                <div id="AttachUrl1" runat="server">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel3" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label2" runat="server" Label="附件2-专家论证报告"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:Label>
+                                <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" ShowBorder="false">
+                                    <table>
+                                        <tr style="height: 28px">
+                                            <td align="left">
+                                                <div id="AttachUrl2" runat="server">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel4" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label3" runat="server" Label="附件3-论证会签到表"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:Label>
+                                <f:ContentPanel ID="ContentPanel3" runat="server" ShowHeader="false" ShowBorder="false">
+                                    <table>
+                                        <tr style="height: 28px">
+                                            <td align="left">
+                                                <div id="AttachUrl3" runat="server">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel5" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label4" runat="server" Label="附件4-论证会会议照片"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:Label>
+                                <f:ContentPanel ID="ContentPanel4" runat="server" ShowHeader="false" ShowBorder="false">
+                                    <table>
+                                        <tr style="height: 28px">
+                                            <td align="left">
+                                                <div id="AttachUrl4" runat="server">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel6" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label5" runat="server" Label="附件5-方案交底记录"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:Label>
+                                <f:ContentPanel ID="ContentPanel5" runat="server" ShowHeader="false" ShowBorder="false">
+                                    <table>
+                                        <tr style="height: 28px">
+                                            <td align="left">
+                                                <div id="AttachUrl5" runat="server">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel7" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label6" runat="server" Label="附件6-方案交底会议照片"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:Label>
+                                <f:ContentPanel ID="ContentPanel6" runat="server" ShowHeader="false" ShowBorder="false">
+                                    <table>
+                                        <tr style="height: 28px">
+                                            <td align="left">
+                                                <div id="AttachUrl6" runat="server">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Label runat="server" ID="lbTemp">
+                        </f:Label>
+                        <%-- <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" --%>
+                        <%--     OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> --%>
+                        <%-- </f:Button> --%>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs

@@ -78,11 +78,16 @@ namespace FineUIPro.Web.HSSE.Solution
                     {
                         this.txtTrainPersonNum.Text = largerHazard.TrainPersonNum.ToString();
                     }
+                    if (largerHazard.OperativesNum != null)
+                    {
+                        this.txtOperativesNum.Text = largerHazard.OperativesNum.ToString();
+                    }
                     this.drpStates.SelectedValue = largerHazard.States;
+                    this.drpApprovalState.SelectedValue = largerHazard.ApprovalState;
                     this.txtDescriptions.Text = largerHazard.Descriptions;
                     this.txtRemark.Text = HttpUtility.HtmlDecode(largerHazard.Remark);
-                    
-                    
+
+
                     this.AttachUrl1.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_1"));
                     this.AttachUrl2.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_2"));
                     this.AttachUrl3.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_3"));

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs

@@ -113,6 +113,15 @@ namespace FineUIPro.Web.HSSE.Solution
         /// </remarks>
         protected global::FineUIPro.NumberBox txtTrainPersonNum;
 
+        /// <summary>
+        /// txtOperativesNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtOperativesNum;
+
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -122,6 +131,24 @@ namespace FineUIPro.Web.HSSE.Solution
         /// </remarks>
         protected global::FineUIPro.DropDownList drpStates;
 
+        /// <summary>
+        /// drpApprovalState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpApprovalState;
+
+        /// <summary>
+        /// txtOperativesNum1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtOperativesNum1;
+
         /// <summary>
         /// txtDescriptions 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegister.aspx

@@ -30,22 +30,18 @@
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
                                 <f:TextBox runat="server" ID="txtSearch" Label="查询" EmptyText="编号/检查对象/检查组/评价结果"
-                                    Width="300px" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged">
+                                    Width="300px" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" LabelWidth="50px" LabelAlign="right">
                                 </f:TextBox>
-
-                                <f:DropDownList ID="drpCheckMainType" runat="server" AutoPostBack="true"
+                                <f:DropDownList ID="drpCheckMainType" runat="server" AutoPostBack="true" LabelWidth="100px" LabelAlign="right"
                                     OnSelectedIndexChanged="drpCheckMainType_SelectedIndexChanged" Label="检查大类" Width="200px" Readonly="true">
                                     <f:ListItem Value="0" Text="安全" />
                                     <f:ListItem Value="1" Text="质量" />
                                 </f:DropDownList>
-
-                                <f:DropDownList runat="server" ID="drpCheckType" EnableSimulateTree="True"
+                                <f:DropDownList runat="server" ID="drpCheckType" EnableSimulateTree="True" LabelWidth="100px" LabelAlign="right"
                                     Label="检查类别" AutoPostBack="true" Width="260px" AutoSelectFirstItem="true"
                                     OnSelectedIndexChanged="txtSearch_TextChanged">
                                 </f:DropDownList>
-
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" Text="新增" Hidden="true">
                                 </f:Button>
                                 <f:Button ID="btnEdit" Icon="Pencil" runat="server" OnClick="btnEdit_Click" Text="编辑" Hidden="true">
@@ -68,8 +64,8 @@
                                 </asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField Width="120px" ColumnID="UnitHazardRegisterCode" DataField="UnitHazardRegisterCode"
-                            SortField="UnitHazardRegisterCode" FieldType="String" HeaderText="编号" TextAlign="Left"
+                        <f:RenderField Width="100px" ColumnID="UnitHazardRegisterCode" DataField="UnitHazardRegisterCode"
+                            SortField="UnitHazardRegisterCode" FieldType="String" HeaderText="编号" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
@@ -80,19 +76,22 @@
                             FieldType="String" HeaderText="检查大类" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="CheckTypeName" DataField="CheckTypeName"
-                            SortField="CheckTypeName" FieldType="String" HeaderText="检查类别" TextAlign="Left"
+                            SortField="CheckTypeName" FieldType="String" HeaderText="检查类别" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="InspectionUnitName" DataField="InspectionUnitName"
+                            FieldType="String" HeaderText="检查单位" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="200px" ColumnID="CheckObjectText" DataField="CheckObjectText"
                             FieldType="String" HeaderText="检查对象" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="CheckUnitName" DataField="CheckUnitName"
-                            FieldType="String" HeaderText="检查单位" TextAlign="Left" HeaderTextAlign="Center">
+                        <f:RenderField Width="200px" ColumnID="CheckUnitName" DataField="CheckUnitName"
+                            FieldType="String" HeaderText="受检单位" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="CheckTeam" DataField="CheckTeam" SortField="CheckTeam"
+                        <f:RenderField Width="200px" ColumnID="CheckTeam" DataField="CheckTeam" SortField="CheckTeam"
                             FieldType="String" HeaderText="检查组/人" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="StatesName" DataField="StatesName"
+                        <f:RenderField Width="120px" ColumnID="StatesName" DataField="StatesName"
                             FieldType="String" HeaderText="状态" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
                     </Columns>
@@ -115,7 +114,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="编辑企业级检查" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="1000px" Height="660px">
+            Width="1280px" Height="760px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegister.aspx.cs

@@ -34,7 +34,8 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 CheckMainType = drpCheckMainType.SelectedValue,
                 SearchText = this.txtSearch.Text.Trim(),
                 CheckType = this.drpCheckType.SelectedValue,
-                ProjectId = this.CurrUser.LoginProjectId
+                ProjectId = this.CurrUser.LoginProjectId,
+                CheckUnitId = this.CurrUser.UnitId
             };
 
             int totalCount;

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterDetailIn.aspx

@@ -0,0 +1,80 @@
+<%@ Page Language="C#" CodeBehind="UnitHazardRegisterDetailIn.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Supervise.UnitHazardRegisterDetailIn" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>导入明细</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />   
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        <Toolbars>
+            <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                    <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                        OnClick="btnAudit_Click">
+                    </f:Button>
+                    <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                              OnClick="btnImport_Click">
+                    </f:Button>
+                    <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                        LabelWidth="150px">
+                    </f:FileUpload>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="导入质量隐患" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                        <Columns>
+                            <f:TemplateField ColumnID="tfPageIndex" Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                             EnableLock="true" Locked="False">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                </ItemTemplate>
+                            </f:TemplateField>
+                            <f:BoundField DataField="Row" HeaderText="错误行号" Width="50px">
+                            </f:BoundField>
+                            <f:BoundField DataField="Column" HeaderText="错误列" Width="100px">
+                            </f:BoundField>
+                            <f:BoundField DataField="Reason" HeaderText="错误类型" MinWidth="220px">
+                            </f:BoundField>
+                        </Columns>
+                    </f:Grid>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:HiddenField ID="hdFileName" runat="server">
+                    </f:HiddenField>
+                    <f:HiddenField ID="hdCheckResult" runat="server">
+                    </f:HiddenField>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lblBottom" runat="server" Text="说明：1 导入模板为.xls后缀的EXCEL文件，有背景色列为必填项。2 数据导入完成，成功后自动返回，如果有不成功数据页面弹出提示框，列表显示导入成功数据。">
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+        </Rows>
+    </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterDetailIn.aspx.cs

@@ -0,0 +1,450 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web.Services.Description;
+
+namespace FineUIPro.Web.ZHGL.Supervise
+{
+    public partial class UnitHazardRegisterDetailIn : PageBase
+    {
+        #region 定义变量
+
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+
+        /// <summary>
+        /// 检查id
+        /// </summary>
+        public string UnitHazardRegisterId
+        {
+            get
+            {
+                return (string)ViewState["UnitHazardRegisterId"];
+            }
+            set
+            {
+                ViewState["UnitHazardRegisterId"] = value;
+            }
+        }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string Type
+        {
+            get
+            {
+                return (string)ViewState["Type"];
+            }
+            set
+            {
+                ViewState["Type"] = value;
+            }
+        }
+        public static int Cols = 4;//列数
+
+        public static Dictionary<string, string> imgDic = new Dictionary<string, string>();
+
+        public static List<string> validLevelStrings = new List<string> { "一般", "较大", "重大" };
+        public static List<string> validRegisterTypesStrings = new List<string>();
+
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.Type = Request.Params["Type"];
+                this.UnitHazardRegisterId = Request.Params["UnitHazardRegisterId"];
+
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                if (this.Type == "0")
+                {//安全类型
+                    validRegisterTypesStrings = (from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x.RegisterTypesName).ToList();
+                }
+                else
+                { //质量类型
+                    validRegisterTypesStrings = (from x in Funs.DB.Base_QualityQuestionType orderby x.SortIndex select x.QualityQuestionType).ToList();
+                }
+                //if (this.CurrUser.UserId == Const.AdminId)
+                //{
+                //    this.btnFastImport.Hidden = false;
+                //}
+            }
+        }
+
+        #region 下载模板
+
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            //这里要注意了，如果传过来的没有记录
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty,
+                MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"),
+                PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + Const.UnitHazardRegisterDetailTemplateUrl;
+                string filePath = Const.UnitHazardRegisterDetailTemplateUrl;
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls" && IsXls != ".xlsx")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                AuditExcelAndShowResult(filePath);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 审核Excel并展示校验结果
+        /// </summary>
+        private void AuditExcelAndShowResult(string fileName)
+        {
+            try
+            {
+                string msg = string.Empty;
+                var dt = BLL.NPOIHelper.ExcelToDataSet(fileName, out msg, true);
+                if (dt != null)
+                {
+                    //string rootPath = Server.MapPath("~/");
+                    //var localPath = ConfigurationManager.AppSettings["localRoot"];
+                    //imgDic = NPOIHelper.ExtractDispimgImagesFromXml(rootPath + initPath + this.hdFileName.Text, localPath + "FileUpload/CheckSpecial");
+                    ValidateExcelData(dt.Tables[0], false);
+                    hdCheckResult.Text = "1";
+                }
+            }
+            catch (Exception exc)
+            {
+                BLL.ErrLogInfo.WriteLog("", exc);
+                Response.Write(exc);
+            }
+        }
+
+        /// <summary>
+        /// 校验Excel数据（仅校验）
+        /// </summary>
+        /// <param name="pds"></param>
+        /// <param name="import">true:导入；false:审核</param>
+        /// <returns></returns>
+        private bool ValidateExcelData(DataTable pds, bool import)
+        {
+            int ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify($"导入Excel格式错误！Excel只有{ic}列", MessageBoxIcon.Warning);
+                return false;
+            }
+            int ir = pds.Rows.Count;
+            if (pds == null || ir <= 0)
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+                return false;
+            }
+            var errors = new List<ErrorInfo>();
+            for (int i = 0; i < ir; i++)
+            {
+                var (error, _) = ValidateRowAndBuildEntity(pds.Rows[i], (i + 2).ToString(), import);
+                if (error.Any()) { errors.AddRange(error); }
+            }
+            errorInfos.Clear();
+            errorInfos.AddRange(errors);
+            this.gvErrorInfo.DataSource = errorInfos;
+            this.gvErrorInfo.DataBind();
+            if (errors.Count > 0)
+            {
+                ShowNotify("存在校验错误，请查看错误列表并修正后再次导入。", MessageBoxIcon.Warning);
+                return false;
+            }
+            ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+            return true;
+        }
+
+
+        /// <summary>
+        /// 校验单行并生成实体（字段顺序与新模板一致）
+        /// </summary>
+        private (List<ErrorInfo> lstError, Model.Supervise_UnitHazardRegisterItem entity) ValidateRowAndBuildEntity(DataRow row, string displayRow, bool import)
+        {
+            List<ErrorInfo> lstError = new List<ErrorInfo>();
+            // 新模板字段顺序
+            string row0 = row[0]?.ToString().Trim();        // 问题描述
+            string row1 = row[1]?.ToString().Trim();        // 问题类型
+            string row2 = row[2]?.ToString().Trim();        // 风险级别
+            string row3 = row[3]?.ToString().Trim();        // 整改要求
+            //string row4 = row[4]?.ToString().Trim();      // 问题图片地址
+
+            string data0 = string.Empty;
+            string data1 = string.Empty;
+            string data2 = string.Empty;
+            string data3 = string.Empty;
+            string data4 = string.Empty;
+
+            // 校验并转换
+            if (!string.IsNullOrEmpty(row0))
+            {
+                data0 = row0;
+            }
+            else
+            {
+                lstError.Add(new ErrorInfo { Row = displayRow, Column = "问题描述", Reason = "不能为空" });
+            }
+            if (!string.IsNullOrEmpty(row1))
+            {
+                if (validRegisterTypesStrings.Any(x => x == row1))
+                {
+                    data1 = row1;
+                }
+                else
+                {
+                    lstError.Add(new ErrorInfo { Row = displayRow, Column = "问题类型", Reason = $"{(this.Type == "0" ? "安全" : "质量")}问题类型不存在[{row1}]" });
+                }
+            }
+            else
+            {
+                lstError.Add(new ErrorInfo { Row = displayRow, Column = "问题类型", Reason = "不能为空" });
+            }
+
+            if (string.IsNullOrEmpty(row2))
+            {
+                lstError.Add(new ErrorInfo { Row = displayRow, Column = "风险级别", Reason = "不能为空" });
+            }
+
+            if (!string.IsNullOrEmpty(row2))
+            {
+                if (validLevelStrings.Any(x => x == row2))
+                {
+                    data2 = row2;
+                }
+                else
+                {
+                    lstError.Add(new ErrorInfo { Row = displayRow, Column = "风险级别", Reason = $"风险级别[{row2}]不存在" });
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(row3))
+            {
+                data3 = row3;
+            }
+            //if (import)
+            //{图片待处理
+            //    try
+            //    {
+            //        urls = urls.Substring(urls.IndexOf('"') + 1, urls.LastIndexOf('"') - urls.IndexOf('"') - 1);
+            //        var sss = imgDic.ContainsKey(urls) ? imgDic[urls].Replace(Funs.RootPath, "") : "";
+            //    }
+            //    catch (Exception e) { }
+            //}
+
+            if (lstError.Any())
+            {
+                return (lstError, null);
+            }
+
+            // 其余字段可根据实际业务映射到实体
+            var entity = new Model.Supervise_UnitHazardRegisterItem
+            {
+                UnitHazardRegisterItemId = SQLHelper.GetNewID(),
+                UnitHazardRegisterId = this.UnitHazardRegisterId,
+                ProblemDescription = data0,
+                ProblemType = data1,
+                RiskLevel = data2,
+                RectifyRequirement = data3,
+                CompleteStatus = 0,
+                //CompletedDate = DateTime.Now,
+                ////SortIndex = 1,
+                //RectificationMeasures = null,
+                //IsUpdate = null
+            };
+            return (lstError, entity);
+        }
+
+        #endregion
+
+        #region 导入
+
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (hdCheckResult.Text == "1")
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    var localPath = ConfigurationManager.AppSettings["localRoot"];
+                    //imgDic = NPOIHelper.ExtractDispimgImagesFromXml(rootPath + initPath + this.hdFileName.Text, localPath + "FileUpload/CheckSpecial");
+                    ImportExcelToDatabase(rootPath + initPath + this.hdFileName.Text, true);
+
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+        /// <summary>
+        /// 导入Excel到数据库
+        /// </summary>
+        private void ImportExcelToDatabase(string fileName, bool import)
+        {
+            try
+            {
+                string msg = string.Empty;
+                var dt = BLL.NPOIHelper.ExcelToDataSet(fileName, out msg, true);
+                BLL.ErrLogInfo.WriteLog(msg);
+                SaveExcelDataToDatabase(fileName, dt.Tables[0], import);
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog("", ex);
+            }
+        }
+
+        /// <summary>
+        /// 校验并保存数据到数据库
+        /// </summary>
+        private bool SaveExcelDataToDatabase(string fileName, DataTable pds, bool import)
+        {
+            int ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify($"导入Excel格式错误！Excel只有{ic}列", MessageBoxIcon.Warning);
+                return false;
+            }
+            int ir = pds.Rows.Count;
+            if (pds == null || ir <= 0)
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+                return false;
+            }
+            var errors = new List<ErrorInfo>();
+            var toInsert = new List<Model.Supervise_UnitHazardRegisterItem>();
+
+            for (int i = 0; i < ir; i++)
+            {
+                var (error, entity) = ValidateRowAndBuildEntity(pds.Rows[i], (i + 2).ToString(), import);
+                if (error.Any())
+                    errors.AddRange(error);
+                else
+                    toInsert.Add(entity);
+            }
+            if (errors.Count > 0)
+            {
+                errorInfos.Clear();
+                errorInfos.AddRange(errors);
+                this.gvErrorInfo.DataSource = errorInfos;
+                this.gvErrorInfo.DataBind();
+                ShowNotify("存在校验错误，请先审核并修正后再导入。", MessageBoxIcon.Warning);
+                return false;
+            }
+            try
+            {
+                if (toInsert.Any())
+                {
+                    Funs.DB.Supervise_UnitHazardRegisterItem.InsertAllOnSubmit(toInsert);
+                    Funs.DB.SubmitChanges();
+                }
+                ShowNotify($"成功导入 {toInsert.Count} 条记录。", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog("导入 Hazard_HazardRegister_Unit 失败", ex);
+                ShowNotify("导入失败：" + ex.Message, MessageBoxIcon.Error);
+                return false;
+            }
+        }
+
+        #endregion // 导入
+    }
+}

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterDetailIn.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Supervise
+{
+
+
+    public partial class UnitHazardRegisterDetailIn
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+
+        /// <summary>
+        /// lblBottom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblBottom;
+    }
+}

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterEdit.aspx

@@ -44,25 +44,27 @@
                             Label="检查类别" AutoSelectFirstItem="true" Required="true" ShowRedStar="true">
                         </f:DropDownList>
                     </Items>
-                </f:FormRow> 
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlCheckUnitId" runat="server" EmptyText="请选择检查单位"  OnSelectedIndexChanged="ddlCheckUnitId_SelectedIndexChanged"
+                        <f:DropDownList ID="ddlInspectionUnit" runat="server" EmptyText="请选择检查单位" OnSelectedIndexChanged="ddlInspectionUnit_SelectedIndexChanged"
                             Label="检查单位" ShowRedStar="true" Required="true" AutoSelectFirstItem="true" AutoPostBack="true">
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlProjectId" runat="server" EmptyText="请选择项目" EnableEdit="true"
-                            Label="检查对象" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="ddlProjectId_SelectedIndexChanged" Required="true">
-                        </f:DropDownList> 
-                        <f:DropDownList ID="ddlInsResponsibleUserId" runat="server" EmptyText="请选择受检责任人" ShowRedStar="true">
+                        <f:DropDownList ID="ddlCheckUnitId" runat="server" EmptyText="请选择受检单位" OnSelectedIndexChanged="ddlCheckUnitId_SelectedIndexChanged"
+                            Label="受检单位" ShowRedStar="true" Required="true" AutoSelectFirstItem="true" AutoPostBack="true">
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlProjectId" runat="server" EmptyText="请选择受检项目" EnableEdit="true" Label="检查项目" AutoPostBack="true" OnSelectedIndexChanged="ddlProjectId_SelectedIndexChanged">
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
+                        <f:DropDownList ID="ddlInsResponsibleUserId" runat="server" Label="受检责任人" EmptyText="请选择受检责任人" ShowRedStar="true">
+                        </f:DropDownList>
                         <f:TextBox ID="txtCheckTeam" runat="server" Label="检查组/人" MaxLength="200" Width="400px">
                         </f:TextBox>
                     </Items>
@@ -81,6 +83,9 @@
                                                 <f:Button ID="btnAdd" Icon="Add" runat="server" Text="新增问题" ValidateForms="SimpleForm1"
                                                     OnClick="btnAdd_Click">
                                                 </f:Button>
+                                                <f:Button ID="btnImport" ToolTip="导入" Text="导入" Icon="ApplicationGet" runat="server"
+                                                    OnClick="btnImport_Click">
+                                                </f:Button>
                                             </Items>
                                         </f:Toolbar>
                                     </Toolbars>
@@ -161,6 +166,10 @@
             Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="600px" Height="400px">
         </f:Window>
+        <f:Window ID="Window2" Title="导入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true"
+            CloseAction="HidePostBack" Width="720px" Height="560px">
+        </f:Window>
         <f:Window ID="WindowAtt" Title="上传附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="true" runat="server" OnClose="WindowAtt_Close" IsModal="true" Width="750px" Height="500px">
         </f:Window>

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterEdit.aspx.cs

@@ -1,12 +1,10 @@
 using BLL;
-using FineUIPro.Web.BaseInfo;
-using FineUIPro.Web.SysManage;
-using Microsoft.Win32;
 using Model;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace FineUIPro.Web.ZHGL.Supervise
 {
@@ -42,13 +40,14 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 btnClose.OnClientClick = ActiveWindow.GetHideReference();
 
                 InitDropList();
-                
+                var unitModel = UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
+                var thisUnitId = BLL.CommonService.GetThisUnitId();
+
                 this.UnitHazardRegisterId = Request.Params["UnitHazardRegisterId"];
                 var register = BLL.UnitHazardRegisterService.GetUnitHazardRegisterById(this.UnitHazardRegisterId);
 
                 if (register != null)
-                {
-                    // 编辑模式 - 加载数据
+                {// 编辑模式 - 加载数据
                     this.txtUnitHazardRegisterCode.Text = register.UnitHazardRegisterCode;
                     if (register.CheckDate != null)
                     {
@@ -58,11 +57,23 @@ namespace FineUIPro.Web.ZHGL.Supervise
 
                     if (!string.IsNullOrWhiteSpace(register.CheckType))
                     {
-                        BLL.SuperviseCheckTypeService.InitCheckTypeDropDownListByMainType(
-                            this.drpCheckType, register.CheckMainType, false);
+                        BLL.SuperviseCheckTypeService.InitCheckTypeDropDownListByMainType(this.drpCheckType, register.CheckMainType, false);
                         this.drpCheckType.SelectedValue = register.CheckType;
                     }
 
+                    if (!string.IsNullOrWhiteSpace(register.CheckUnitId))
+                    {
+                        this.ddlCheckUnitId.SelectedValue = register.CheckUnitId;
+                    }
+                    if (!string.IsNullOrWhiteSpace(register.InspectionUnit))
+                    {
+                        this.ddlInspectionUnit.SelectedValue = register.InspectionUnit;
+                        if (register.InspectionUnit != thisUnitId)
+                        {
+                            this.ddlCheckUnitId.Readonly = true;
+                        }
+                    }
+
                     if (!string.IsNullOrWhiteSpace(register.ProjectId))
                     {
                         this.ddlProjectId.SelectedValue = register.ProjectId;
@@ -73,71 +84,93 @@ namespace FineUIPro.Web.ZHGL.Supervise
                             this.ddlInsResponsibleUserId.SelectedValue = register.InsResponsibleUserId;
                         }
                     }
-
-                    if (!string.IsNullOrWhiteSpace(register.CheckUnitId))
+                    else
                     {
-                        this.ddlCheckUnitId.SelectedValue = register.CheckUnitId;
+                        UserService.InitIsOfficeUserUnitIdDropDownList(this.ddlInsResponsibleUserId, this.ddlCheckUnitId.SelectedValue, true);
+                        if (!string.IsNullOrWhiteSpace(register.InsResponsibleUserId))
+                        {
+                            this.ddlInsResponsibleUserId.SelectedValue = register.InsResponsibleUserId;
+                        }
                     }
 
                     this.txtCheckTeam.Text = register.CheckTeam;
 
-                    // 加载明细
-                    items = BLL.UnitHazardRegisterItemService.GetItemsByRegisterId(this.UnitHazardRegisterId)
-                        .Select(x => new View_UnitHazardRegisterItem
-                        {
-                            UnitHazardRegisterItemId = x.UnitHazardRegisterItemId,
-                            ProblemDescription = x.ProblemDescription, 
-                            ProblemType = x.ProblemType,
-                            RiskLevel = x.RiskLevel,
-                            RectifyRequirement = x.RectifyRequirement,
-                            CompleteStatus = x.CompleteStatus,
-                            CompletedDate = x.CompletedDate
-                        }).ToList();
+                    BindDetailGrid();
 
-                    if (register.States> (int)UnitHazardRegisterService.StateInt.待提交)
+                    if (register.States > (int)UnitHazardRegisterService.StateInt.待提交)
                     {
+                        btnImport.Hidden = true;
                         btnAdd.Hidden = true;
                         btnSave.Hidden = true;
-                        btnSubmit.Hidden = true; 
+                        btnSubmit.Hidden = true;
                     }
                 }
                 else
-                {
-                    // 新增模式
-                    var unitModel = UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
+                {// 新增模式
                     if (unitModel?.IsBranch == true)
                     {
+                        this.ddlInspectionUnit.SelectedValue = this.CurrUser.UnitId;
                         this.ddlCheckUnitId.SelectedValue = this.CurrUser.UnitId;
                     }
                     else
                     {
-                        var thisUnit = BLL.CommonService.GetIsThisUnit();
-                        this.ddlCheckUnitId.SelectedValue = thisUnit.UnitId;
+                        this.ddlCheckUnitId.SelectedValue = thisUnitId;
                     }
+                    BLL.UserService.InitUserDropDownList(this.ddlInsResponsibleUserId, null, true, this.ddlCheckUnitId.SelectedValue);
+                    BLL.UserService.InitIsOfficeUserUnitIdDropDownList(this.ddlInsResponsibleUserId, this.ddlCheckUnitId.SelectedValue, true);
+                    BLL.ProjectService.InitProjectDropDownList(this.ddlProjectId, this.ddlCheckUnitId.SelectedValue, true);//检查项目
                     this.txtCheckTeam.Text = BLL.UnitService.GetUnitNameByUnitId(this.CurrUser.UnitId) + " " + this.CurrUser.UserName;
                     this.dpkCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
 
                     // 自动生成编号
-                    int newCount= UnitHazardRegisterService.GetCount(type)+1; 
-                    this.txtUnitHazardRegisterCode.Text = newCount.ToString().PadLeft(5,'0');
+                    int newCount = UnitHazardRegisterService.GetCount(type) + 1;
+                    this.txtUnitHazardRegisterCode.Text = newCount.ToString().PadLeft(5, '0');
+                }
+                if (unitModel?.IsBranch == true)
+                {
+                    this.ddlInspectionUnit.Readonly = true;
+                    this.ddlCheckUnitId.Readonly = true;
                 }
-
-                Grid1.DataSource = items;
-                Grid1.DataBind();
             }
         }
 
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindDetailGrid()
+        {
+            if (string.IsNullOrEmpty(this.UnitHazardRegisterId))
+            {
+                return;
+            }
+            // 加载明细
+            items = BLL.UnitHazardRegisterItemService.GetItemsByRegisterId(this.UnitHazardRegisterId)
+                .Select(x => new View_UnitHazardRegisterItem
+                {
+                    UnitHazardRegisterItemId = x.UnitHazardRegisterItemId,
+                    ProblemDescription = x.ProblemDescription,
+                    ProblemType = x.ProblemType,
+                    RiskLevel = x.RiskLevel,
+                    RectifyRequirement = x.RectifyRequirement,
+                    CompleteStatus = x.CompleteStatus,
+                    CompletedDate = x.CompletedDate
+                }).ToList();
+            Grid1.DataSource = items;
+            Grid1.DataBind();
+        }
+
+
         protected void InitDropList()
         {
             drpCheckMainType.SelectedValue = type;
             // 初始化下拉框
-            BLL.UnitService.InitBranchUnitDropDownList(this.ddlCheckUnitId, false);
-            BLL.ProjectService.InitProjectDropDownList(this.ddlProjectId, ddlCheckUnitId.SelectedValue, true);
-            BLL.UserService.InitUserDropDownList(this.ddlInsResponsibleUserId, this.ddlProjectId.SelectedValue, true, null);
-            BLL.SuperviseCheckTypeService.InitCheckTypeDropDownListByMainType(
-                this.drpCheckType, type, false);
-
-            if (type=="0")
+            BLL.UnitService.InitBranchUnitDropDownList(this.ddlInspectionUnit, false);//检查单位
+            BLL.UnitService.InitBranchUnitDropDownList(this.ddlCheckUnitId, false);//受检单位
+            BLL.ProjectService.InitProjectDropDownList(this.ddlProjectId, ddlCheckUnitId.SelectedValue, true);//检查项目
+            //BLL.UserService.InitUserDropDownList(this.ddlInsResponsibleUserId, this.ddlProjectId.SelectedValue, true, null);
+            BLL.SuperviseCheckTypeService.InitCheckTypeDropDownListByMainType(this.drpCheckType, type, false);
+            if (type == "0")
             {
                 this.drpProblemType.DataTextField = "RegisterTypesName";
                 this.drpProblemType.DataValueField = "RegisterTypesName";
@@ -148,9 +181,6 @@ namespace FineUIPro.Web.ZHGL.Supervise
             {
                 QualityQuestionTypeService.InitQualityQuestionType(drpProblemType, false);
             }
-            
-
-
         }
         protected void btnAdd_Click(object sender, EventArgs e)
         {
@@ -187,20 +217,25 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 Alert.ShowInTop("请选择检查类别!", MessageBoxIcon.Warning);
                 return;
             }
-            if (this.ddlProjectId.SelectedValue == BLL.Const._Null)
-            {
-                Alert.ShowInTop("请选择检查对象!", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.ddlCheckUnitId.SelectedValue == BLL.Const._Null)
+            if (this.ddlInspectionUnit.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("请选择检查单位!", MessageBoxIcon.Warning);
                 return;
             }
+            if (this.ddlCheckUnitId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择受检单位!", MessageBoxIcon.Warning);
+                return;
+            }
+            //if (this.ddlProjectId.SelectedValue == BLL.Const._Null)
+            //{
+            //    Alert.ShowInTop("请选择检查对象!", MessageBoxIcon.Warning);
+            //    return;
+            //}
             SaveNew();
             SaveItem();
 
-            ShowNotify("保存成功!", MessageBoxIcon.Success); 
+            ShowNotify("保存成功!", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         protected void btnSubmit_Click(object sender, EventArgs e)
@@ -215,56 +250,96 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 Alert.ShowInTop("请选择检查类别!", MessageBoxIcon.Warning);
                 return;
             }
-            if (this.ddlProjectId.SelectedValue == BLL.Const._Null)
-            {
-                Alert.ShowInTop("请选择检查对象!", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.ddlCheckUnitId.SelectedValue == BLL.Const._Null)
+            if (this.ddlInspectionUnit.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("请选择检查单位!", MessageBoxIcon.Warning);
                 return;
             }
+            if (this.ddlCheckUnitId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择受检单位!", MessageBoxIcon.Warning);
+                return;
+            }
+            //if (this.ddlProjectId.SelectedValue == BLL.Const._Null)
+            //{
+            //    Alert.ShowInTop("请选择检查对象!", MessageBoxIcon.Warning);
+            //    return;
+            //}
             SaveNew(Const.BtnSubmit);
             SaveItem();
 
             ShowNotify("提交成功!", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
+        /// <summary>
+        /// 检查单位下拉触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlInspectionUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.ddlProjectId.Items.Clear();
+            this.ddlInsResponsibleUserId.Items.Clear();
+            var inspectionUnit = this.ddlInspectionUnit.SelectedValue;
+            this.ddlCheckUnitId.SelectedValue = inspectionUnit;
+            BLL.ProjectService.InitProjectDropDownList(this.ddlProjectId, this.ddlCheckUnitId.SelectedValue, true);
+            UserService.InitIsOfficeUserUnitIdDropDownList(this.ddlInsResponsibleUserId, this.ddlCheckUnitId.SelectedValue, true);
+            if (inspectionUnit == CommonService.GetIsThisUnit().UnitId)
+            {
+                this.ddlCheckUnitId.Readonly = false;
+            }
+            else
+            {
+                this.ddlCheckUnitId.Readonly = true;
+            }
+        }
+        /// <summary>
+        /// 受检单位下拉触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void ddlCheckUnitId_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.ddlProjectId.Items.Clear();
             this.ddlInsResponsibleUserId.Items.Clear();
-            BLL.ProjectService.InitProjectDropDownList(this.ddlProjectId,ddlCheckUnitId.SelectedValue, true);
-
-        }
-        protected void ddlProjectId_SelectedIndexChanged(object sender, EventArgs e)
-        { 
-            this.ddlInsResponsibleUserId.Items.Clear();
-            //BLL.UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.ddlUnitId, this.ddlProjectId.SelectedValue, Const.ProjectUnitType_1, true);
-            BLL.UserService.InitUserDropDownList(this.ddlInsResponsibleUserId, this.ddlProjectId.SelectedValue, true, null);
-
-        }
-
-        protected void drpCheckMainType_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            BLL.SuperviseCheckTypeService.InitCheckTypeDropDownListByMainType(
-                this.drpCheckType, this.drpCheckMainType.SelectedValue, false);
+            BLL.ProjectService.InitProjectDropDownList(this.ddlProjectId, this.ddlCheckUnitId.SelectedValue, true);
+            UserService.InitIsOfficeUserUnitIdDropDownList(this.ddlInsResponsibleUserId, this.ddlCheckUnitId.SelectedValue, true);
         }
 
         /// <summary>
-        ///
+        /// 受检项目下拉触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlProjectId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.ddlInsResponsibleUserId.Items.Clear();
+            //BLL.UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.ddlUnitId, this.ddlProjectId.SelectedValue, Const.ProjectUnitType_1, true);
+            BLL.UserService.InitUserDropDownList(this.ddlInsResponsibleUserId, this.ddlProjectId.SelectedValue, true, null);
+        }
+        /// <summary>
+        /// 检查大类下拉触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpCheckMainType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BLL.SuperviseCheckTypeService.InitCheckTypeDropDownListByMainType(this.drpCheckType, this.drpCheckMainType.SelectedValue, false);
+        }
+
+        /// <summary>
+        ///设置LinkButtonField的点击客户端事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void Grid1_PreDataBound(object sender, EventArgs e)
-        { 
+        {
             // 设置LinkButtonField的点击客户端事件
             LinkButtonField deleteField = Grid1.FindColumn("Delete") as LinkButtonField;
             deleteField.OnClientClick = GetDeleteScript();
             var register = BLL.UnitHazardRegisterService.GetUnitHazardRegisterById(this.UnitHazardRegisterId);
 
-            if (register!=null&& register.States > (int)UnitHazardRegisterService.StateInt.待提交)
+            if (register != null && register.States > (int)UnitHazardRegisterService.StateInt.待提交)
             {
                 LinkButtonField lbUpload = Grid1.FindColumn(6) as LinkButtonField;
                 LinkButtonField lbDelete = Grid1.FindColumn(7) as LinkButtonField;
@@ -272,8 +347,6 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 lbUpload.Enabled = false;
                 lbDelete.Enabled = false;
             }
-
-               
         }
 
         protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
@@ -303,8 +376,8 @@ namespace FineUIPro.Web.ZHGL.Supervise
                     ProblemType = values.Value<string>("ProblemType"),
                     RiskLevel = values.Value<string>("RiskLevel"),
                     RectifyRequirement = values.Value<string>("RectifyRequirement"),
-                    CompleteStatus = 0 
-                }; 
+                    CompleteStatus = 0
+                };
                 if (UnitHazardRegisterItemService.GetUnitHazardRegisterItemById(registerItem.UnitHazardRegisterItemId) != null)
                 {
                     UnitHazardRegisterItemService.UpdateUnitHazardRegisterItem(registerItem);
@@ -313,10 +386,10 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 {
                     BLL.UnitHazardRegisterItemService.AddUnitHazardRegisterItem(registerItem);
                 }
-            } 
+            }
         }
 
-        protected void SaveNew(string type="")
+        protected void SaveNew(string type = "")
         {
             Supervise_UnitHazardRegister register = new Supervise_UnitHazardRegister
             {
@@ -324,16 +397,20 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 CheckDate = Funs.GetNewDateTime(this.dpkCheckDate.Text.Trim()),
                 CheckMainType = this.drpCheckMainType.SelectedValue,
                 CheckType = this.drpCheckType.SelectedValue,
-                ProjectId = this.ddlProjectId.SelectedValue, 
+                InspectionUnit = this.ddlInspectionUnit.SelectedValue,
+                //ProjectId = this.ddlProjectId.SelectedValue,
                 CheckUnitId = this.ddlCheckUnitId.SelectedValue,
                 InsResponsibleUserId = this.ddlInsResponsibleUserId.SelectedValue,
                 CheckTeam = this.txtCheckTeam.Text.Trim(),
                 CompileMan = this.CurrUser.UserId,
                 States = (int)UnitHazardRegisterService.StateInt.待提交
             };
+            if (!string.IsNullOrEmpty(this.ddlProjectId.SelectedValue) && this.ddlProjectId.SelectedValue != Const._Null)
+            {
+                register.ProjectId = this.ddlProjectId.SelectedValue;
+            }
             if (!string.IsNullOrEmpty(type))
             {
-                
                 register.States = (int)UnitHazardRegisterService.StateInt.待整改;
             }
             if (string.IsNullOrWhiteSpace(this.UnitHazardRegisterId))
@@ -363,7 +440,7 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 .Select(x => new View_UnitHazardRegisterItem
                 {
                     UnitHazardRegisterItemId = x.UnitHazardRegisterItemId,
-                    ProblemDescription = x.ProblemDescription, 
+                    ProblemDescription = x.ProblemDescription,
                     ProblemType = x.ProblemType,
                     RiskLevel = x.RiskLevel,
                     RectifyRequirement = x.RectifyRequirement,
@@ -374,7 +451,7 @@ namespace FineUIPro.Web.ZHGL.Supervise
             Grid1.DataSource = items;
             Grid1.DataBind();
         }
-        
+
         protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
         {
             // 刷新Grid数据
@@ -402,24 +479,52 @@ namespace FineUIPro.Web.ZHGL.Supervise
         #endregion Methods
 
 
+        #region 导入
+        /// <summary>
+        /// 导入按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.UnitHazardRegisterId))
+            {
+                SaveNew();
+            }
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UnitHazardRegisterDetailIn.aspx?Type={0}&UnitHazardRegisterId={1}", type, this.UnitHazardRegisterId, "导入 - ")));
+        }
+
+        /// <summary>
+        /// 关闭导入弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window2_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindDetailGrid();
+        }
+        #endregion
+
     }
 
     /// <summary>
     /// 企业级检查明细视图类
     /// </summary>
     public class View_UnitHazardRegisterItem
-        {
-            #region Properties
+    {
+        #region Properties
+
+        public DateTime? CompletedDate { get; set; }
+        public int? CompleteStatus { get; set; }
+        public string ProblemDescription { get; set; }
+        public string ProblemImageUrl { get; set; }
+        public string ProblemType { get; set; }
+        public string RectifyRequirement { get; set; }
+        public string RiskLevel { get; set; }
+        public string UnitHazardRegisterItemId { get; set; }
+
+        #endregion Properties
+    }
 
-            public DateTime? CompletedDate { get; set; }
-            public int? CompleteStatus { get; set; }
-            public string ProblemDescription { get; set; }
-            public string ProblemImageUrl { get; set; }
-            public string ProblemType { get; set; }
-            public string RectifyRequirement { get; set; }
-            public string RiskLevel { get; set; }
-            public string UnitHazardRegisterItemId { get; set; }
 
-            #endregion Properties
-        }
 }

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterEdit.aspx.designer.cs

@@ -77,6 +77,15 @@ namespace FineUIPro.Web.ZHGL.Supervise
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCheckType;
 
+        /// <summary>
+        /// ddlInspectionUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInspectionUnit;
+
         /// <summary>
         /// ddlCheckUnitId 控件。
         /// </summary>
@@ -149,6 +158,15 @@ namespace FineUIPro.Web.ZHGL.Supervise
         /// </remarks>
         protected global::FineUIPro.Button btnAdd;
 
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// txtProblemDescription 控件。
         /// </summary>
@@ -275,6 +293,15 @@ namespace FineUIPro.Web.ZHGL.Supervise
         /// </remarks>
         protected global::FineUIPro.Window Window1;
 
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterRecord.aspx

@@ -83,7 +83,7 @@
                                     <f:ListItem Text="重大" Value="重大" />
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpProblemStates" runat="server" Label="问题整改状态" AutoPostBack="true" EmptyText="-请选择-" AutoSelectFirstItem="false"
-                                    OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="120px" LabelAlign="Right" Width="200px">
+                                    OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="120px" LabelAlign="Right" Width="220px">
                                     <f:ListItem Text="待整改" Value="0" />
                                     <f:ListItem Text="已整改" Value="1" /> 
                                 </f:DropDownList>
@@ -178,7 +178,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="查看明细" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="900px" Height="580px">
+            Width="1200px" Height="720px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="问题图片" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="750px"

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterRecordEdit.aspx

@@ -18,24 +18,30 @@
                     <Items>
                         <f:TextBox ID="txtCheckType" runat="server" Label="检查类别" Readonly="true">
                         </f:TextBox>
-                        <f:TextBox ID="txtProblemType" runat="server" Label="问题类型" Readonly="true">
-                        </f:TextBox>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtRiskLevel" runat="server" Label="风险级别" Readonly="true">
-                        </f:TextBox>
                         <f:TextBox ID="txtCheckDate" runat="server" Label="检查日期" Readonly="true">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
+                        <f:TextBox ID="txtInspectionUnit" runat="server" Label="检查单位" Readonly="true">
+                        </f:TextBox>
                         <f:TextBox ID="txtCheckTeam" runat="server" Label="检查组/人" Readonly="true">
                         </f:TextBox>
-                        <f:TextBox ID="txtCheckUnitName" runat="server" Label="检查单位" Readonly="true">
+                        <%--<f:TextBox ID="txtCheckUnitName" runat="server" Label="受检单位" Readonly="true">
+                        </f:TextBox>--%>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtProblemType" runat="server" Label="问题类型" Readonly="true">
                         </f:TextBox>
+                        <f:TextBox ID="txtRiskLevel" runat="server" Label="风险级别" Readonly="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterRecordEdit.aspx.cs

@@ -92,8 +92,9 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", register.CheckDate);
             }
 
+            this.txtInspectionUnit.Text = BLL.UnitService.GetUnitNameByUnitId(register.InspectionUnit);
             this.txtCheckTeam.Text = register.CheckTeam;
-            this.txtCheckUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(register.CheckUnitId);
+            //this.txtCheckUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(register.CheckUnitId);
             this.txtProblemDescription.Text = item.ProblemDescription;
             this.txtRectifyRequirement.Text = item.RectifyRequirement;
             this.txtInsResponsibleUserName.Text = UserService.GetUserNameByUserId(register.InsResponsibleUserId);

SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterRecordEdit.aspx.designer.cs

@@ -50,6 +50,33 @@ namespace FineUIPro.Web.ZHGL.Supervise
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckType;
 
+        /// <summary>
+        /// txtCheckDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCheckDate;
+
+        /// <summary>
+        /// txtInspectionUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtInspectionUnit;
+
+        /// <summary>
+        /// txtCheckTeam 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCheckTeam;
+
         /// <summary>
         /// txtProblemType 控件。
         /// </summary>
@@ -68,33 +95,6 @@ namespace FineUIPro.Web.ZHGL.Supervise
         /// </remarks>
         protected global::FineUIPro.TextBox txtRiskLevel;
 
-        /// <summary>
-        /// txtCheckDate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCheckDate;
-
-        /// <summary>
-        /// txtCheckTeam 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCheckTeam;
-
-        /// <summary>
-        /// txtCheckUnitName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCheckUnitName;
-
         /// <summary>
         /// txtProblemDescription 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/Menu_CQMS.xml

@@ -55,7 +55,8 @@
 <TreeNode id="1443C901-A9C3-4CCC-B858-55512DE8C5CA" Text="质量管理工作总结报告" NavigateUrl="CQMS/ManageReport/QualityWorkSummaryReport.aspx"></TreeNode>
 <TreeNode id="267064F1-88F7-4468-998A-49A1A2F25BB8" Text="季度工程项目质量信息表" NavigateUrl="CQMS/ManageReport/QuarterlyProjectQuality.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="A54EC449-5F77-4068-83B9-AA305B721A0B" Text="质量检查" NavigateUrl=""><TreeNode id="B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306" Text="质量巡检" NavigateUrl="CQMS/Check/CheckList.aspx"></TreeNode>
+<TreeNode id="A54EC449-5F77-4068-83B9-AA305B721A0B" Text="质量检查" NavigateUrl=""><TreeNode id="15511354-9822-4A21-AB24-2483D889FDB9" Text="企业质量检查记录" NavigateUrl="ZHGL/Supervise/UnitHazardRegisterRecord.aspx?type=1"></TreeNode>
+<TreeNode id="B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306" Text="质量巡检" NavigateUrl="CQMS/Check/CheckList.aspx"></TreeNode>
 <TreeNode id="E6703F32-4E42-4D03-84B3-5EC0E8E48E0F" Text="质量专项检查" NavigateUrl="CQMS/Check/JointCheck.aspx"></TreeNode>
 <TreeNode id="D3B1433E-00DE-432B-A30A-0EFB513480A8" Text="检查问题统计" NavigateUrl="CQMS/Check/JointCheckStatistics.aspx"></TreeNode>
 </TreeNode>

SGGL/FineUIPro.Web/common/Menu_HSSE.xml

@@ -22,6 +22,7 @@
 </TreeNode>
 <TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
 <TreeNode id="5B3D3F7B-9B50-4927-B131-11D13D4D1C19" Text="危大工程施工方案清单" NavigateUrl="HSSE/Solution/LargerHazardList.aspx"></TreeNode>
+<TreeNode id="09B2A0A6-A693-4F1D-A4F5-D5DEA803D771" Text="临时用电方案" NavigateUrl="HSSE/Solution/TemporaryElectricity.aspx"></TreeNode>
 <TreeNode id="49485F7E-8E71-4EED-87B4-BF6CC180C69C" Text="HSE技术交底" NavigateUrl="HSSE/License/HSETechnical.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员信息" NavigateUrl=""><TreeNode id="AD6FC259-CF40-41C7-BA3F-15AC50C1DD20" Text="人员信息档案" NavigateUrl="HSSE/SitePerson/PersonList.aspx"></TreeNode>
@@ -51,7 +52,8 @@
 <TreeNode id="909BBC10-68D4-4C97-9FC3-9C1168D5FBC5" Text="培训试卷" NavigateUrl="BoSheng/BoExam.aspx"></TreeNode>
 <TreeNode id="C5DF2DE4-EB56-45F9-9881-6CD0B7A8E72F" Text="人员培训记录" NavigateUrl="BoSheng/BoPersonTrainRecord.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="HSE巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=0"></TreeNode>
+<TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="73283863-CF67-44CA-9DF8-67071734A529" Text="企业安全检查记录" NavigateUrl="ZHGL/Supervise/UnitHazardRegisterRecord.aspx?type=0"></TreeNode>
+<TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="HSE巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=0"></TreeNode>
 <TreeNode id="379555F6-BECF-4E87-8F1C-73F529D260FF" Text="常规巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx?Type=1"></TreeNode>
 <TreeNode id="1B08048F-93ED-4E84-AE65-DB7917EA2DFB" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecial.aspx"></TreeNode>
 <TreeNode id="F99F9805-E492-43BB-A2C4-5211AEA8F247" Text="专项检查（通用）" NavigateUrl=""><TreeNode id="B1FF9501-E66B-4251-8A1D-159B8B10DD64" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecialPro.aspx"></TreeNode>
@@ -166,8 +168,8 @@
 <TreeNode id="D3576E49-DBC9-43EA-9822-EA5F4D96CA24" Text="绩效评价管理" NavigateUrl=""><TreeNode id="EED8DBEE-83F6-4B5B-8382-AF40EB66B0A9" Text="分包方绩效评价" NavigateUrl="HSSE/Perfomance/PerfomanceRecord.aspx"></TreeNode>
 <TreeNode id="1320A6D8-713B-43D4-BB00-CDA3DE6D24CB" Text="个人绩效评价" NavigateUrl="HSSE/Perfomance/PersonPerfomance.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="66DFD649-FBC2-463F-BD1A-04095D713C8E" Text="信息管理" NavigateUrl=""><TreeNode id="B06EC998-60D2-4CBF-8080-9F000A1595AA" Text="管理通知" NavigateUrl="HSSE/InformationProject/Notice.aspx"></TreeNode>
-<TreeNode id="16092FE7-938B-4713-8084-4FBFA030F386" Text="HSE宣传活动" NavigateUrl="HSSE/InformationProject/PromotionalActivities.aspx"></TreeNode>
+<TreeNode id="66DFD649-FBC2-463F-BD1A-04095D713C8E" Text="安全活动" NavigateUrl=""><TreeNode id="16092FE7-938B-4713-8084-4FBFA030F386" Text="HSE宣传活动" NavigateUrl="HSSE/InformationProject/PromotionalActivities.aspx"></TreeNode>
+<TreeNode id="B06EC998-60D2-4CBF-8080-9F000A1595AA" Text="管理通知" NavigateUrl="HSSE/InformationProject/Notice.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="14DD34F2-0682-48D6-A199-108297A9825E" Text="安全分析" NavigateUrl=""><TreeNode id="14C42C8E-8D3D-4D30-AA56-4F96828610AD" Text="危险因素分析" NavigateUrl="HSSE/InformationAnalysis/CheckAnalysis.aspx"></TreeNode>
 </TreeNode>

SGGL/FineUIPro.Web/common/Menu_SysSet.xml

@@ -50,6 +50,7 @@
 <TreeNode id="3EC2676A-70EB-400E-BE17-EEBBA0B7E9D7" Text="安全巡检类型定义" NavigateUrl="BaseInfo/HazardRegisterTypes.aspx"></TreeNode>
 <TreeNode id="CCF9E615-78C9-4085-BCFE-0F9907D3FA0A" Text="物资类别" NavigateUrl="BaseInfo/GoodsCategory.aspx"></TreeNode>
 <TreeNode id="E4B526CC-805E-4131-8E18-2FFA6871507E" Text="风险等级" NavigateUrl="BaseInfo/RiskLevel.aspx"></TreeNode>
+<TreeNode id="79116536-BE80-4323-A46F-10222601D5B5" Text="活动类型" NavigateUrl="BaseInfo/ActivityType.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="85DFE1D3-9E68-46B5-87E5-A525698F2F5F" Text="焊接设置" NavigateUrl=""><TreeNode id="8IDKGJE2-09B1-4607-BC6D-865CE48F0013" Text="管道材质定义" NavigateUrl="HJGL/BaseInfo/Material.aspx"></TreeNode>
 <TreeNode id="8IDKGJE2-09B1-4607-BC6D-865CE48F0011" Text="管道规格定义" NavigateUrl="HJGL/BaseInfo/Control.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_ZHGL.xml

@@ -38,8 +38,10 @@
 </TreeNode>
 <TreeNode id="70E51ABF-81C8-49CB-89AC-CF0542A201D6" Text="HSSE管理工作报告" NavigateUrl=""><TreeNode id="D67D1C85-3798-47A9-A0DB-B4DB47FF2E7D" Text="报表上报情况" NavigateUrl="ZHGL/ManagementReport/ReportRemind.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="CD9FC4C8-4B02-4619-8B02-50DA6AE6146E" Text="企业大检查" NavigateUrl=""><TreeNode id="40387C48-95A0-435C-82FB-57AF0A81B9D4" Text="监督检查报告" NavigateUrl="ZHGL/Supervise/SuperviseCheckReport.aspx"></TreeNode>
-<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
+<TreeNode id="8CA4A1EC-3218-4E6B-9CA2-125C814A8141" Text="企业大检查" NavigateUrl=""><TreeNode id="C46C007E-A100-4A52-9317-3B885442E130" Text="企业安全检查" NavigateUrl="ZHGL/Supervise/UnitHazardRegister.aspx?type=0"></TreeNode>
+<TreeNode id="73283863-CF67-44CA-9DF8-67071734A528" Text="企业安全检查记录" NavigateUrl="ZHGL/Supervise/UnitHazardRegisterRecord.aspx?type=0"></TreeNode>
+<TreeNode id="FDA7722C-383E-4BB1-B29D-BB0BF87AA942" Text="企业质量检查" NavigateUrl="ZHGL/Supervise/UnitHazardRegister.aspx?type=1"></TreeNode>
+<TreeNode id="15511354-9822-4A21-AB24-2483D889FDB8" Text="企业质量检查记录" NavigateUrl="ZHGL/Supervise/UnitHazardRegisterRecord.aspx?type=1"></TreeNode>
 </TreeNode>
 <TreeNode id="DEAA1931-C0D7-4277-9B34-23963D1C538A" Text="集团安全监督" NavigateUrl=""><TreeNode id="1969C3C3-9257-49CD-977D-546CA18DC91C" Text="安全监督检查通知单" NavigateUrl="ZHGL/ServerCheck/CheckNotice.aspx"></TreeNode>
 <TreeNode id="B9950CB5-C47A-4C0A-A6CC-C7DDBBDE7D1E" Text="企业上报监督检查报告" NavigateUrl="ZHGL/ServerCheck/UpCheckReport.aspx"></TreeNode>

SGGL/Model/Model.cs

@@ -77,6 +77,9 @@ namespace Model
     partial void InsertBase_AccidentType(Base_AccidentType instance);
     partial void UpdateBase_AccidentType(Base_AccidentType instance);
     partial void DeleteBase_AccidentType(Base_AccidentType instance);
+    partial void InsertBase_ActivityType(Base_ActivityType instance);
+    partial void UpdateBase_ActivityType(Base_ActivityType instance);
+    partial void DeleteBase_ActivityType(Base_ActivityType instance);
     partial void InsertBase_Certificate(Base_Certificate instance);
     partial void UpdateBase_Certificate(Base_Certificate instance);
     partial void DeleteBase_Certificate(Base_Certificate instance);
@@ -3021,6 +3024,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Base_ActivityType> Base_ActivityType
+		{
+			get
+			{
+				return this.GetTable<Base_ActivityType>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Base_Certificate> Base_Certificate
 		{
 			get
@@ -18178,6 +18189,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _InsuranceDate;
 		
+		private string _InOutState;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -18210,6 +18223,8 @@ namespace Model
     partial void OnStatesChanged();
     partial void OnInsuranceDateChanging(System.Nullable<System.DateTime> value);
     partial void OnInsuranceDateChanged();
+    partial void OnInOutStateChanging(string value);
+    partial void OnInOutStateChanged();
     #endregion
 		
 		public Administrative_CarManager()
@@ -18467,6 +18482,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOutState", DbType="Char(1)")]
+		public string InOutState
+		{
+			get
+			{
+				return this._InOutState;
+			}
+			set
+			{
+				if ((this._InOutState != value))
+				{
+					this.OnInOutStateChanging(value);
+					this.SendPropertyChanging();
+					this._InOutState = value;
+					this.SendPropertyChanged("InOutState");
+					this.OnInOutStateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Administrative_CarManager_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -19332,6 +19367,140 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_ActivityType")]
+	public partial class Base_ActivityType : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ActivityTypeId;
+		
+		private string _ActivityTypeCode;
+		
+		private string _ActivityTypeName;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnActivityTypeIdChanging(string value);
+    partial void OnActivityTypeIdChanged();
+    partial void OnActivityTypeCodeChanging(string value);
+    partial void OnActivityTypeCodeChanged();
+    partial void OnActivityTypeNameChanging(string value);
+    partial void OnActivityTypeNameChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Base_ActivityType()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActivityTypeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ActivityTypeId
+		{
+			get
+			{
+				return this._ActivityTypeId;
+			}
+			set
+			{
+				if ((this._ActivityTypeId != value))
+				{
+					this.OnActivityTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActivityTypeId = value;
+					this.SendPropertyChanged("ActivityTypeId");
+					this.OnActivityTypeIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActivityTypeCode", DbType="NVarChar(50)")]
+		public string ActivityTypeCode
+		{
+			get
+			{
+				return this._ActivityTypeCode;
+			}
+			set
+			{
+				if ((this._ActivityTypeCode != value))
+				{
+					this.OnActivityTypeCodeChanging(value);
+					this.SendPropertyChanging();
+					this._ActivityTypeCode = value;
+					this.SendPropertyChanged("ActivityTypeCode");
+					this.OnActivityTypeCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActivityTypeName", DbType="NVarChar(50)")]
+		public string ActivityTypeName
+		{
+			get
+			{
+				return this._ActivityTypeName;
+			}
+			set
+			{
+				if ((this._ActivityTypeName != value))
+				{
+					this.OnActivityTypeNameChanging(value);
+					this.SendPropertyChanging();
+					this._ActivityTypeName = value;
+					this.SendPropertyChanged("ActivityTypeName");
+					this.OnActivityTypeNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Certificate")]
 	public partial class Base_Certificate : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -27652,8 +27821,6 @@ namespace Model
 		
 		private EntitySet<Training_TestRecord> _Training_TestRecord;
 		
-		private EntitySet<Supervise_UnitHazardRegister> _Supervise_UnitHazardRegister;
-		
 		private EntitySet<Unqualified_WorkContact> _Unqualified_WorkContact;
 		
 		private EntitySet<WBS_BreakdownProject> _WBS_BreakdownProject;
@@ -28093,7 +28260,6 @@ namespace Model
 			this._Training_Task = new EntitySet<Training_Task>(new Action<Training_Task>(this.attach_Training_Task), new Action<Training_Task>(this.detach_Training_Task));
 			this._Training_TestPlan = new EntitySet<Training_TestPlan>(new Action<Training_TestPlan>(this.attach_Training_TestPlan), new Action<Training_TestPlan>(this.detach_Training_TestPlan));
 			this._Training_TestRecord = new EntitySet<Training_TestRecord>(new Action<Training_TestRecord>(this.attach_Training_TestRecord), new Action<Training_TestRecord>(this.detach_Training_TestRecord));
-			this._Supervise_UnitHazardRegister = new EntitySet<Supervise_UnitHazardRegister>(new Action<Supervise_UnitHazardRegister>(this.attach_Supervise_UnitHazardRegister), new Action<Supervise_UnitHazardRegister>(this.detach_Supervise_UnitHazardRegister));
 			this._Unqualified_WorkContact = new EntitySet<Unqualified_WorkContact>(new Action<Unqualified_WorkContact>(this.attach_Unqualified_WorkContact), new Action<Unqualified_WorkContact>(this.detach_Unqualified_WorkContact));
 			this._WBS_BreakdownProject = new EntitySet<WBS_BreakdownProject>(new Action<WBS_BreakdownProject>(this.attach_WBS_BreakdownProject), new Action<WBS_BreakdownProject>(this.detach_WBS_BreakdownProject));
 			this._WBS_CostControl = new EntitySet<WBS_CostControl>(new Action<WBS_CostControl>(this.attach_WBS_CostControl), new Action<WBS_CostControl>(this.detach_WBS_CostControl));
@@ -33038,19 +33204,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_UnitHazardRegister_Project", Storage="_Supervise_UnitHazardRegister", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
-		public EntitySet<Supervise_UnitHazardRegister> Supervise_UnitHazardRegister
-		{
-			get
-			{
-				return this._Supervise_UnitHazardRegister;
-			}
-			set
-			{
-				this._Supervise_UnitHazardRegister.Assign(value);
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Unqualified_WorkContact_Base_Project", Storage="_Unqualified_WorkContact", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Unqualified_WorkContact> Unqualified_WorkContact
 		{
@@ -36795,18 +36948,6 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
-		private void attach_Supervise_UnitHazardRegister(Supervise_UnitHazardRegister entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_Project = this;
-		}
-		
-		private void detach_Supervise_UnitHazardRegister(Supervise_UnitHazardRegister entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_Project = null;
-		}
-		
 		private void attach_Unqualified_WorkContact(Unqualified_WorkContact entity)
 		{
 			this.SendPropertyChanging();
@@ -189620,6 +189761,18 @@ namespace Model
 		
 		private System.Nullable<int> _LargerNotClosedNum;
 		
+		private System.Nullable<int> _AwaitApprovalNum;
+		
+		private System.Nullable<int> _PendingApprovalNum;
+		
+		private System.Nullable<int> _CompletedApprovalNum;
+		
+		private System.Nullable<int> _SuperAwaitApprovalNum;
+		
+		private System.Nullable<int> _SuperPendingApprovalNum;
+		
+		private System.Nullable<int> _SuperCompletedApprovalNum;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -189820,6 +189973,18 @@ namespace Model
     partial void OnLargerClosedNumChanged();
     partial void OnLargerNotClosedNumChanging(System.Nullable<int> value);
     partial void OnLargerNotClosedNumChanged();
+    partial void OnAwaitApprovalNumChanging(System.Nullable<int> value);
+    partial void OnAwaitApprovalNumChanged();
+    partial void OnPendingApprovalNumChanging(System.Nullable<int> value);
+    partial void OnPendingApprovalNumChanged();
+    partial void OnCompletedApprovalNumChanging(System.Nullable<int> value);
+    partial void OnCompletedApprovalNumChanged();
+    partial void OnSuperAwaitApprovalNumChanging(System.Nullable<int> value);
+    partial void OnSuperAwaitApprovalNumChanged();
+    partial void OnSuperPendingApprovalNumChanging(System.Nullable<int> value);
+    partial void OnSuperPendingApprovalNumChanged();
+    partial void OnSuperCompletedApprovalNumChanging(System.Nullable<int> value);
+    partial void OnSuperCompletedApprovalNumChanged();
     #endregion
 		
 		public HSSEData_HSSE()
@@ -191787,6 +191952,126 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwaitApprovalNum", DbType="Int")]
+		public System.Nullable<int> AwaitApprovalNum
+		{
+			get
+			{
+				return this._AwaitApprovalNum;
+			}
+			set
+			{
+				if ((this._AwaitApprovalNum != value))
+				{
+					this.OnAwaitApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._AwaitApprovalNum = value;
+					this.SendPropertyChanged("AwaitApprovalNum");
+					this.OnAwaitApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PendingApprovalNum", DbType="Int")]
+		public System.Nullable<int> PendingApprovalNum
+		{
+			get
+			{
+				return this._PendingApprovalNum;
+			}
+			set
+			{
+				if ((this._PendingApprovalNum != value))
+				{
+					this.OnPendingApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._PendingApprovalNum = value;
+					this.SendPropertyChanged("PendingApprovalNum");
+					this.OnPendingApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletedApprovalNum", DbType="Int")]
+		public System.Nullable<int> CompletedApprovalNum
+		{
+			get
+			{
+				return this._CompletedApprovalNum;
+			}
+			set
+			{
+				if ((this._CompletedApprovalNum != value))
+				{
+					this.OnCompletedApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._CompletedApprovalNum = value;
+					this.SendPropertyChanged("CompletedApprovalNum");
+					this.OnCompletedApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperAwaitApprovalNum", DbType="Int")]
+		public System.Nullable<int> SuperAwaitApprovalNum
+		{
+			get
+			{
+				return this._SuperAwaitApprovalNum;
+			}
+			set
+			{
+				if ((this._SuperAwaitApprovalNum != value))
+				{
+					this.OnSuperAwaitApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._SuperAwaitApprovalNum = value;
+					this.SendPropertyChanged("SuperAwaitApprovalNum");
+					this.OnSuperAwaitApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperPendingApprovalNum", DbType="Int")]
+		public System.Nullable<int> SuperPendingApprovalNum
+		{
+			get
+			{
+				return this._SuperPendingApprovalNum;
+			}
+			set
+			{
+				if ((this._SuperPendingApprovalNum != value))
+				{
+					this.OnSuperPendingApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._SuperPendingApprovalNum = value;
+					this.SendPropertyChanged("SuperPendingApprovalNum");
+					this.OnSuperPendingApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperCompletedApprovalNum", DbType="Int")]
+		public System.Nullable<int> SuperCompletedApprovalNum
+		{
+			get
+			{
+				return this._SuperCompletedApprovalNum;
+			}
+			set
+			{
+				if ((this._SuperCompletedApprovalNum != value))
+				{
+					this.OnSuperCompletedApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._SuperCompletedApprovalNum = value;
+					this.SendPropertyChanged("SuperCompletedApprovalNum");
+					this.OnSuperCompletedApprovalNumChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -221286,6 +221571,8 @@ namespace Model
 		
 		private string _States;
 		
+		private string _ActivityTypeId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -221322,6 +221609,8 @@ namespace Model
     partial void OnCompileDateChanged();
     partial void OnStatesChanging(string value);
     partial void OnStatesChanged();
+    partial void OnActivityTypeIdChanging(string value);
+    partial void OnActivityTypeIdChanged();
     #endregion
 		
 		public InformationProject_PromotionalActivities()
@@ -221619,6 +221908,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActivityTypeId", DbType="NVarChar(50)")]
+		public string ActivityTypeId
+		{
+			get
+			{
+				return this._ActivityTypeId;
+			}
+			set
+			{
+				if ((this._ActivityTypeId != value))
+				{
+					this.OnActivityTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActivityTypeId = value;
+					this.SendPropertyChanged("ActivityTypeId");
+					this.OnActivityTypeIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_InformationProject_PromotionalActivities_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -315606,6 +315915,18 @@ namespace Model
 		
 		private System.Nullable<int> _LargerNotClosedNum;
 		
+		private System.Nullable<int> _AwaitApprovalNum;
+		
+		private System.Nullable<int> _PendingApprovalNum;
+		
+		private System.Nullable<int> _CompletedApprovalNum;
+		
+		private System.Nullable<int> _SuperAwaitApprovalNum;
+		
+		private System.Nullable<int> _SuperPendingApprovalNum;
+		
+		private System.Nullable<int> _SuperCompletedApprovalNum;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -315802,6 +316123,18 @@ namespace Model
     partial void OnLargerClosedNumChanged();
     partial void OnLargerNotClosedNumChanging(System.Nullable<int> value);
     partial void OnLargerNotClosedNumChanged();
+    partial void OnAwaitApprovalNumChanging(System.Nullable<int> value);
+    partial void OnAwaitApprovalNumChanged();
+    partial void OnPendingApprovalNumChanging(System.Nullable<int> value);
+    partial void OnPendingApprovalNumChanged();
+    partial void OnCompletedApprovalNumChanging(System.Nullable<int> value);
+    partial void OnCompletedApprovalNumChanged();
+    partial void OnSuperAwaitApprovalNumChanging(System.Nullable<int> value);
+    partial void OnSuperAwaitApprovalNumChanged();
+    partial void OnSuperPendingApprovalNumChanging(System.Nullable<int> value);
+    partial void OnSuperPendingApprovalNumChanged();
+    partial void OnSuperCompletedApprovalNumChanging(System.Nullable<int> value);
+    partial void OnSuperCompletedApprovalNumChanged();
     #endregion
 		
 		public Project_HSSEData_HSSE()
@@ -317729,6 +318062,126 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwaitApprovalNum", DbType="Int")]
+		public System.Nullable<int> AwaitApprovalNum
+		{
+			get
+			{
+				return this._AwaitApprovalNum;
+			}
+			set
+			{
+				if ((this._AwaitApprovalNum != value))
+				{
+					this.OnAwaitApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._AwaitApprovalNum = value;
+					this.SendPropertyChanged("AwaitApprovalNum");
+					this.OnAwaitApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PendingApprovalNum", DbType="Int")]
+		public System.Nullable<int> PendingApprovalNum
+		{
+			get
+			{
+				return this._PendingApprovalNum;
+			}
+			set
+			{
+				if ((this._PendingApprovalNum != value))
+				{
+					this.OnPendingApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._PendingApprovalNum = value;
+					this.SendPropertyChanged("PendingApprovalNum");
+					this.OnPendingApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletedApprovalNum", DbType="Int")]
+		public System.Nullable<int> CompletedApprovalNum
+		{
+			get
+			{
+				return this._CompletedApprovalNum;
+			}
+			set
+			{
+				if ((this._CompletedApprovalNum != value))
+				{
+					this.OnCompletedApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._CompletedApprovalNum = value;
+					this.SendPropertyChanged("CompletedApprovalNum");
+					this.OnCompletedApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperAwaitApprovalNum", DbType="Int")]
+		public System.Nullable<int> SuperAwaitApprovalNum
+		{
+			get
+			{
+				return this._SuperAwaitApprovalNum;
+			}
+			set
+			{
+				if ((this._SuperAwaitApprovalNum != value))
+				{
+					this.OnSuperAwaitApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._SuperAwaitApprovalNum = value;
+					this.SendPropertyChanged("SuperAwaitApprovalNum");
+					this.OnSuperAwaitApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperPendingApprovalNum", DbType="Int")]
+		public System.Nullable<int> SuperPendingApprovalNum
+		{
+			get
+			{
+				return this._SuperPendingApprovalNum;
+			}
+			set
+			{
+				if ((this._SuperPendingApprovalNum != value))
+				{
+					this.OnSuperPendingApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._SuperPendingApprovalNum = value;
+					this.SendPropertyChanged("SuperPendingApprovalNum");
+					this.OnSuperPendingApprovalNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperCompletedApprovalNum", DbType="Int")]
+		public System.Nullable<int> SuperCompletedApprovalNum
+		{
+			get
+			{
+				return this._SuperCompletedApprovalNum;
+			}
+			set
+			{
+				if ((this._SuperCompletedApprovalNum != value))
+				{
+					this.OnSuperCompletedApprovalNumChanging(value);
+					this.SendPropertyChanging();
+					this._SuperCompletedApprovalNum = value;
+					this.SendPropertyChanged("SuperCompletedApprovalNum");
+					this.OnSuperCompletedApprovalNumChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -364689,6 +365142,8 @@ namespace Model
 		
 		private string _HazardName;
 		
+		private string _ApprovalState;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -364731,6 +365186,8 @@ namespace Model
     partial void OnIsUpdateChanged();
     partial void OnHazardNameChanging(string value);
     partial void OnHazardNameChanged();
+    partial void OnApprovalStateChanging(string value);
+    partial void OnApprovalStateChanged();
     #endregion
 		
 		public Solution_LargerHazard()
@@ -365088,6 +365545,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApprovalState", DbType="Char(1)")]
+		public string ApprovalState
+		{
+			get
+			{
+				return this._ApprovalState;
+			}
+			set
+			{
+				if ((this._ApprovalState != value))
+				{
+					this.OnApprovalStateChanging(value);
+					this.SendPropertyChanging();
+					this._ApprovalState = value;
+					this.SendPropertyChanged("ApprovalState");
+					this.OnApprovalStateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerSolution_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -370291,9 +370768,9 @@ namespace Model
 		
 		private string _InsResponsibleUserId;
 		
-		private EntityRef<Base_Unit> _Base_Unit;
+		private string _InspectionUnit;
 		
-		private EntityRef<Base_Project> _Base_Project;
+		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntitySet<Supervise_UnitHazardRegisterItem> _Supervise_UnitHazardRegisterItem;
 		
@@ -370337,12 +370814,13 @@ namespace Model
     partial void OnIsUpdateChanged();
     partial void OnInsResponsibleUserIdChanging(string value);
     partial void OnInsResponsibleUserIdChanged();
+    partial void OnInspectionUnitChanging(string value);
+    partial void OnInspectionUnitChanged();
     #endregion
 		
 		public Supervise_UnitHazardRegister()
 		{
 			this._Base_Unit = default(EntityRef<Base_Unit>);
-			this._Base_Project = default(EntityRef<Base_Project>);
 			this._Supervise_UnitHazardRegisterItem = new EntitySet<Supervise_UnitHazardRegisterItem>(new Action<Supervise_UnitHazardRegisterItem>(this.attach_Supervise_UnitHazardRegisterItem), new Action<Supervise_UnitHazardRegisterItem>(this.detach_Supervise_UnitHazardRegisterItem));
 			OnCreated();
 		}
@@ -370458,10 +370936,6 @@ namespace Model
 			{
 				if ((this._ProjectId != value))
 				{
-					if (this._Base_Project.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnProjectIdChanging(value);
 					this.SendPropertyChanging();
 					this._ProjectId = value;
@@ -370715,6 +371189,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionUnit", DbType="NVarChar(50)")]
+		public string InspectionUnit
+		{
+			get
+			{
+				return this._InspectionUnit;
+			}
+			set
+			{
+				if ((this._InspectionUnit != value))
+				{
+					this.OnInspectionUnitChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionUnit = value;
+					this.SendPropertyChanged("InspectionUnit");
+					this.OnInspectionUnitChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_UnitHazardRegister_CheckUnit", Storage="_Base_Unit", ThisKey="CheckUnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -370749,40 +371243,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_UnitHazardRegister_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
-		public Base_Project Base_Project
-		{
-			get
-			{
-				return this._Base_Project.Entity;
-			}
-			set
-			{
-				Base_Project previousValue = this._Base_Project.Entity;
-				if (((previousValue != value) 
-							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Base_Project.Entity = null;
-						previousValue.Supervise_UnitHazardRegister.Remove(this);
-					}
-					this._Base_Project.Entity = value;
-					if ((value != null))
-					{
-						value.Supervise_UnitHazardRegister.Add(this);
-						this._ProjectId = value.ProjectId;
-					}
-					else
-					{
-						this._ProjectId = default(string);
-					}
-					this.SendPropertyChanged("Base_Project");
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_UnitHazardRegisterItem_Register", Storage="_Supervise_UnitHazardRegisterItem", ThisKey="UnitHazardRegisterId", OtherKey="UnitHazardRegisterId", DeleteRule="CASCADE")]
 		public EntitySet<Supervise_UnitHazardRegisterItem> Supervise_UnitHazardRegisterItem
 		{

SGGL/Model/ZHGL/DataSync/HSSEDataItem.cs

@@ -112,13 +112,19 @@ namespace Model
         public int? SuperConstructionNum { get; set; }
         public int? SuperFinishedNum { get; set; }
         public int? SuperTrainPersonNum { get; set; }
+        public int? OperativesNum { get; set; }
+        public int? SuperOperativesNum { get; set; }
+        public int? AwaitApprovalNum { get; set; }
+        public int? PendingApprovalNum { get; set; }
+        public int? CompletedApprovalNum { get; set; }
+        public int? SuperAwaitApprovalNum { get; set; }
+        public int? SuperPendingApprovalNum { get; set; }
+        public int? SuperCompletedApprovalNum { get; set; }
         public decimal? TotalEnergyConsumption { get; set; }
         public int? TotalWorkingHour { get; set; }
         public int? TrainPersonNum { get; set; }
         public string UnitId { get; set; }
         public int? UseEquipmentNum { get; set; }
-        public int? OperativesNum { get; set; }
-        public int? SuperOperativesNum { get; set; }
         public List<HSSEDataHiddenDangerDetailItem> HiddenDangerDetailItems { get; set; }
 
     }

SGGL/Model/ZHGL/DataSync/LargeEngineeringOutput.cs

@@ -50,5 +50,29 @@
         /// 超危大工程作业人员数
         /// </summary>
         public int SuperOperativesNum { get; set; }
+        /// <summary>
+        /// 危大工程待审核个数
+        /// </summary>
+        public int AwaitApprovalNum { get; set; }
+        /// <summary>
+        /// 危大工程审核中个数
+        /// </summary>
+        public int PendingApprovalNum { get; set; }
+        /// <summary>
+        /// 危大工程已完成个数
+        /// </summary>
+        public int CompletedApprovalNum { get; set; }
+        /// <summary>
+        /// 超危大工程待审核个数
+        /// </summary>
+        public int SuperAwaitApprovalNum { get; set; }
+        /// <summary>
+        /// 超危大工程审核中个数
+        /// </summary>
+        public int SuperPendingApprovalNum { get; set; }
+        /// <summary>
+        /// 超危大工程已完成个数
+        /// </summary>
+        public int SuperCompletedApprovalNum { get; set; }
     }
 }

SGGL/Model/ZHGL/UnitHazardRegisterInput.cs

@@ -26,5 +26,10 @@ namespace Model
         /// 项目ID（权限过滤）
         /// </summary>
         public string ProjectId { get; set; }
+        /// <summary>
+        /// 受检单位Id
+        /// </summary>
+        public string CheckUnitId { get; set; }
+        
     }
 }

SGGL/Model/ZHGL/UnitHazardRegisterOutput.cs

@@ -48,10 +48,19 @@ namespace Model
         public string CheckObjectText { get; set; }
 
         /// <summary>
-        /// 检查单位名称
+        /// 受检单位名称
         /// </summary>
         public string CheckUnitName { get; set; }
-
+        /// <summary>
+        /// 受检单位Id
+        /// </summary>
+        public string CheckUnitId { get; set; }
+        
+        /// <summary>
+        /// 检查单位名称
+        /// </summary>
+        public string InspectionUnitName { get; set; }
+        
         /// <summary>
         /// 检查组/人
         /// </summary>

SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>03/11/2026 19:40:09</publishTime>
+      <publishTime>03/16/2026 14:33:07</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>03/11/2026 19:40:09</publishTime>
+      <publishTime>03/16/2026 14:33:07</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>03/11/2026 19:39:57</publishTime>
+      <publishTime>03/16/2026 14:32:47</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>03/11/2026 19:39:57</publishTime>
+      <publishTime>03/16/2026 14:32:47</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>03/11/2026 17:57:14</publishTime>
+      <publishTime>03/16/2026 14:32:40</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>03/11/2026 17:57:14</publishTime>
+      <publishTime>03/16/2026 14:32:40</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>03/11/2026 09:12:36</publishTime>
@@ -311,13 +311,13 @@
       <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll">
-      <publishTime>12/18/2025 09:28:44</publishTime>
+      <publishTime>03/16/2026 10:00:43</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll.config">
       <publishTime>03/13/2025 10:52:20</publishTime>
     </File>
     <File Include="bin/SgManager.AI.pdb">
-      <publishTime>12/18/2025 09:28:44</publishTime>
+      <publishTime>03/16/2026 10:00:43</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>07/08/2017 09:30:56</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>03/11/2026 19:39:58</publishTime>
+      <publishTime>03/16/2026 14:32:48</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>03/11/2026 19:39:58</publishTime>
+      <publishTime>03/16/2026 14:32:48</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>03/11/2026 19:39:58</publishTime>
+      <publishTime>03/16/2026 14:32:47</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>03/11/2026 19:39:59</publishTime>
+      <publishTime>03/16/2026 14:32:49</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>