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

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

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;
             ////单据状态