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

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

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()))
             {