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

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

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
+
+
     }
 }