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

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

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;