diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx
index 256c5da..966e30f 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CostUseCondition.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.CostUseCondition" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,55 +12,69 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全生产费用使用情况汇总表" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="ReportId" AllowSorting="true"
-                    SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items> 
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill> 
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged"></f:DatePicker>                                                              
-                                <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                            HeaderText="编制单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="日期" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="Amount" DataField="Amount" 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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全生产费用使用情况汇总表" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ReportId" AllowSorting="true"
+                            SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged"></f:DatePicker>
+                                        <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="编制单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="日期" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="Amount" DataField="Amount" 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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="安全生产费用使用情况汇总表" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.cs
index 4a3ec28..1c91da7 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
 {
     public partial class CostUseCondition : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -18,6 +34,21 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
                 // 绑定表格
@@ -25,12 +56,33 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            //this.GetButtonPower();
+            this.BindGrid();
+        }
+
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT report.ReportId,
                                     report.Months,
                                     report.UnitId,
@@ -43,7 +95,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
                          + @" LEFT JOIN dbo.Base_Unit as unit on unit.UnitId = report.UnitId"
                          + @" WHERE report.ProjectId= @ProjectId and year(report.Months)=@y and MONTH(report.Months)=@m";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             listStr.Add(new SqlParameter("@y", Funs.GetNewDateTime(this.txtMonth.Text.Trim()).Value.Year));
             listStr.Add(new SqlParameter("@m", Funs.GetNewDateTime(this.txtMonth.Text.Trim()).Value.Month));
             SqlParameter[] parameter = listStr.ToArray();
@@ -108,7 +160,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (GetButtonPower(Const.BtnAdd))
             {
-                var report = BLL.CostUseConditionService.GetReportByMonths(this.CurrUser.LoginProjectId,Funs.GetNewDateTime(this.txtMonth.Text.Trim()).Value.Year, Funs.GetNewDateTime(this.txtMonth.Text.Trim()).Value.Month);
+                var report = BLL.CostUseConditionService.GetReportByMonths(this.ProjectId,Funs.GetNewDateTime(this.txtMonth.Text.Trim()).Value.Year, Funs.GetNewDateTime(this.txtMonth.Text.Trim()).Value.Month);
                 if (report != null)
                 {
                     Alert.ShowInTop("本月月报已存在！", MessageBoxIcon.Warning);
@@ -245,7 +297,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CostUseConditionMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.CostUseConditionMenuId, button);
         }
         #endregion
 
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.designer.cs
index 24348e8..1d9efaf 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/CostUseCondition.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
-    
-    
-    public partial class CostUseCondition {
-        
+namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
+{
+
+
+    public partial class CostUseCondition
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// txtMonth 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtMonth;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx
index f55e294..b6d0554 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx
@@ -1,114 +1,130 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EmergencyMonthList.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.EmergencyMonthList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <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>
 </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">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
+                            ClicksToEdit="2" DataIDField="Id" AllowSorting="true" EnableColumnLines="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month"
+                                            ShowTodayButton="false" AutoPostBack="true" OnTextChanged="btnSearch_Click">
+                                        </f:DatePicker>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false"  EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  EnableColumnLines="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10"
-                    EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" 
-                                    ShowTodayButton="false" AutoPostBack="true"  OnTextChanged="btnSearch_Click"></f:DatePicker>
-                               
-                               
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true" Text="新增" OnClick="btnNew_Click"
-                                    runat="server">
-                                </f:Button>
 
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true" Text="新增" OnClick="btnNew_Click"
+                                            runat="server">
+                                        </f:Button>
 
-                         <f:RenderField MinWidth="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField MinWidth="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
                                     HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left" SortField="Months">
-                          </f:RenderField>
+                                </f:RenderField>
 
-                         <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                            HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
-                            HeaderText="分支机构" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                    HeaderText="分支机构" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="200px" ColumnID="EmName" DataField="EmName"
-                             FieldType="String" HeaderText="演练名称" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="200px" ColumnID="EmName" DataField="EmName"
+                                    FieldType="String" HeaderText="演练名称" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                          <f:RenderField MinWidth="120px" ColumnID="EmDate" DataField="EmDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"  HeaderText="演练日期" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="EmDate" DataField="EmDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="演练日期" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="100px" ColumnID="EmPerson" DataField="EmPerson"
-                             FieldType="String" HeaderText="参演人数" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                     
-                         <f:RenderField MinWidth="140px" ColumnID="EmMoney" DataField="EmMoney"
-                             FieldType="String" HeaderText="直接投入（元）" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="100px" ColumnID="EmPerson" DataField="EmPerson"
+                                    FieldType="String" HeaderText="参演人数" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="140px" ColumnID="EmType" DataField="EmType"
-                             FieldType="String" HeaderText="演练方式" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="EmMoney" DataField="EmMoney"
+                                    FieldType="String" HeaderText="直接投入（元）" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="100px" ColumnID="StatesN" DataField="StatesN" FieldType="String"
-                            HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="140px" ColumnID="EmType" DataField="EmType"
+                                    FieldType="String" HeaderText="演练方式" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                       
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                         <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                    </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>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
+                                <f:RenderField MinWidth="100px" ColumnID="StatesN" DataField="StatesN" FieldType="String"
+                                    HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
 
-                    </PageItems>
-                </f:Grid>
+
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </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>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.cs
index 36c4db9..f19da9b 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.cs
@@ -31,9 +31,22 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
-                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                GetButtonPower();
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
                 // 绑定表格
@@ -42,18 +55,35 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         public void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                DataTable tb = ChecklistData(this.CurrUser.LoginProjectId);
-                Grid1.RecordCount = tb.Rows.Count;
-                tb = GetFilteredTable(Grid1.FilteredData, tb);
-                var table = this.GetPagedDataTable(Grid1, tb);
-
-                Grid1.DataSource = table;
-                Grid1.DataBind();
+                return;
             }
+            DataTable tb = ChecklistData(this.ProjectId);
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
         }
 
         protected DataTable ChecklistData(string projectId)
@@ -223,7 +253,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            var report = BLL.EmergencyMonthService.GetReportByMonth(this.CurrUser.LoginProjectId, this.txtMonth.Text.Trim());
+            var report = BLL.EmergencyMonthService.GetReportByMonth(this.ProjectId, this.txtMonth.Text.Trim());
             if (report != null)
             {
                 Alert.ShowInTop("本月月报已存在！", MessageBoxIcon.Warning);
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.designer.cs
index 52fbc38..187a13a 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/EmergencyMonthList.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx
index a2d13d9..471abc0 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardousEngineering.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.HazardousEngineering" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -11,79 +13,93 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危大工程实施清单月报" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="ReportId" AllowSorting="true"
-                    SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged"></f:DatePicker>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                            HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
-                            HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="SubProjectName" DataField="SubProjectName" FieldType="String"
-                            HeaderText="危险性较大的分部分项工程名称" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="WorksCategory" DataField="WorksCategory" FieldType="String"
-                            HeaderText="本月在施下月即施危大工程类别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="IsSuperDangerous" DataField="IsSuperDangerous" FieldType="String"
-                            HeaderText="是否为超危大工程" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="Address" DataField="Address" FieldType="String"
-                            HeaderText="施工地点" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="170px" ColumnID="ConDate" DataField="ConDate" FieldType="String"
-                            HeaderText="施工计划（开始时间-完成时间）" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="PlanSubmissionDate" DataField="PlanSubmissionDate" FieldType="Date" Renderer="Date"
-                            HeaderText="方案上报时间" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="PlanApprovalDate" DataField="PlanApprovalDate" FieldType="Date" Renderer="Date"
-                            HeaderText="方案审批时间" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="CompletionDate" DataField="CompletionDate" FieldType="Date" Renderer="Date"
-                            HeaderText="专家论证完成日期" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="SpecializedClass" DataField="SpecializedClass" 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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危大工程实施清单月报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ReportId" AllowSorting="true"
+                            SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged"></f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                    HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="SubProjectName" DataField="SubProjectName" FieldType="String"
+                                    HeaderText="危险性较大的分部分项工程名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="WorksCategory" DataField="WorksCategory" FieldType="String"
+                                    HeaderText="本月在施下月即施危大工程类别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="IsSuperDangerous" DataField="IsSuperDangerous" FieldType="String"
+                                    HeaderText="是否为超危大工程" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Address" DataField="Address" FieldType="String"
+                                    HeaderText="施工地点" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="170px" ColumnID="ConDate" DataField="ConDate" FieldType="String"
+                                    HeaderText="施工计划（开始时间-完成时间）" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PlanSubmissionDate" DataField="PlanSubmissionDate" FieldType="Date" Renderer="Date"
+                                    HeaderText="方案上报时间" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PlanApprovalDate" DataField="PlanApprovalDate" FieldType="Date" Renderer="Date"
+                                    HeaderText="方案审批时间" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompletionDate" DataField="CompletionDate" FieldType="Date" Renderer="Date"
+                                    HeaderText="专家论证完成日期" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="SpecializedClass" DataField="SpecializedClass" 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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="危大工程实施清单月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.cs
index 64bd81b..538d292 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.cs
@@ -8,6 +8,23 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
 {
     public partial class HazardousEngineering : PageBase
     {
+
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -18,6 +35,21 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
@@ -25,12 +57,34 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            //this.GetButtonPower();
+            this.BindGrid();
+        }
+
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT report.ReportId,
                                     report.Months,
                                     report.UnitId,
@@ -54,7 +108,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
                          + @" LEFT JOIN dbo.Base_Unit as unit on unit.UnitId = report.UnitId"
                          + @" WHERE report.ProjectId= @ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
             {
                 strSql += " AND report.Months = @months ";
@@ -249,7 +303,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HazardousEngineeringMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HazardousEngineeringMenuId, button);
         }
         #endregion
 
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.designer.cs
index d876245..80782ab 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/HazardousEngineering.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
-    
-    
-    public partial class HazardousEngineering {
-        
+namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
+{
+
+
+    public partial class HazardousEngineering
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtMonth 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtMonth;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx
index 8b54b5e..56a3f52 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx
@@ -1,124 +1,140 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LeaderCheckList.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.LeaderCheckList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <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>
 </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">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
+                            ClicksToEdit="2" DataIDField="Id" AllowSorting="true" EnableColumnLines="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM"
+                                            DisplayType="Month"
+                                            ShowTodayButton="false" AutoPostBack="true" OnTextChanged="btnSearch_Click">
+                                        </f:DatePicker>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false"  EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  EnableColumnLines="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10"
-                    EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" 
-                                    DisplayType="Month" 
-                                    ShowTodayButton="false" AutoPostBack="true"  OnTextChanged="btnSearch_Click"></f:DatePicker>
-                               
-                               
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true" Text="新增" OnClick="btnNew_Click"
-                                    runat="server">
-                                </f:Button>
 
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true" Text="新增" OnClick="btnNew_Click"
+                                            runat="server">
+                                        </f:Button>
 
-                         <f:RenderField MinWidth="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField MinWidth="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
                                     HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left" SortField="Months">
-                          </f:RenderField>
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="100px" ColumnID="UnitName" DataField="UnitName"
-                             FieldType="String" HeaderText="所属单位" TextAlign="center" HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="100px" ColumnID="UnitName" DataField="UnitName"
+                                    FieldType="String" HeaderText="所属单位" TextAlign="center" HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        
 
-                         <f:RenderField MinWidth="200px" ColumnID="CLeaders" DataField="CLeaders"
-                             FieldType="String" HeaderText="公司领导" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
 
-                         <f:RenderField MinWidth="200px" ColumnID="BLeaders" DataField="BLeaders"
-                             FieldType="String" HeaderText="分公司领导" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="200px" ColumnID="CLeaders" DataField="CLeaders"
+                                    FieldType="String" HeaderText="公司领导" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="150px" ColumnID="ProjectName" DataField="ProjectName"
-                             FieldType="String" HeaderText="检查项目" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="200px" ColumnID="BLeaders" DataField="BLeaders"
+                                    FieldType="String" HeaderText="分公司领导" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                          <f:RenderField MinWidth="120px" ColumnID="CheckDate" DataField="CheckDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"  HeaderText="检查日期" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="150px" ColumnID="ProjectName" DataField="ProjectName"
+                                    FieldType="String" HeaderText="检查项目" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                         <f:RenderField MinWidth="120px" ColumnID="Hiddendangers" DataField="Hiddendangers"
-                             FieldType="String" HeaderText="排查安全隐患（项）" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                     
-                          <f:RenderField MinWidth="160px" ColumnID="CloseDate" DataField="CloseDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"  HeaderText="隐患整改关闭时间" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="CheckDate" DataField="CheckDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="120px" ColumnID="CloseTypeN" DataField="CloseTypeN"
-                             FieldType="String" HeaderText="隐患是否关闭" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="120px" ColumnID="Hiddendangers" DataField="Hiddendangers"
+                                    FieldType="String" HeaderText="排查安全隐患（项）" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField MinWidth="100px" ColumnID="StatesN" DataField="StatesN" FieldType="String"
-                            HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                                <f:RenderField MinWidth="160px" ColumnID="CloseDate" DataField="CloseDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="隐患整改关闭时间" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                       
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                         <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                    </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>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
+                                <f:RenderField MinWidth="120px" ColumnID="CloseTypeN" DataField="CloseTypeN"
+                                    FieldType="String" HeaderText="隐患是否关闭" TextAlign="center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                    </PageItems>
-                </f:Grid>
+                                <f:RenderField MinWidth="100px" ColumnID="StatesN" DataField="StatesN" FieldType="String"
+                                    HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+
+
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </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>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -148,7 +164,7 @@
         }
 
         function onGridDataLoad(event) {
-            this.mergeColumns(['UnitName','ProjectName']);
+            this.mergeColumns(['UnitName', 'ProjectName']);
         }
     </script>
 </body>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.cs
index 9d39d28..0314fd4 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.cs
@@ -31,9 +31,23 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
-                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                GetButtonPower();
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
                 // 绑定表格
@@ -42,18 +56,35 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         public void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                DataTable tb = ChecklistData(this.CurrUser.LoginProjectId);
-                Grid1.RecordCount = tb.Rows.Count;
-                tb = GetFilteredTable(Grid1.FilteredData, tb);
-                var table = this.GetPagedDataTable(Grid1, tb);
-
-                Grid1.DataSource = table;
-                Grid1.DataBind();
+                return;
             }
+            DataTable tb = ChecklistData(this.ProjectId);
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
         }
 
         protected DataTable ChecklistData(string projectId)
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.designer.cs
index 1265c04..f9801dc 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/LeaderCheckList.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx
index a82b2d7..3e483e1 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonnelAllocationInfo.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.PersonnelAllocationInfo" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -11,88 +13,102 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="专职安全管理人员配备信息" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="ReportId" AllowSorting="true"
-                    SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false"></f:DatePicker>
-                                 <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                            HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
-                            HeaderText="分支机构" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="Duties" DataField="Duties" FieldType="String"
-                            HeaderText="职务" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" FieldType="String"
-                            HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone" FieldType="String"
-                            HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="EmergentTel" DataField="EmergentTel" FieldType="String"
-                            HeaderText="紧急情况下联系电话" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="170px" ColumnID="IdentityCard" DataField="IdentityCard" FieldType="String"
-                            HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="Sex" DataField="Sex" FieldType="String"
-                            HeaderText="性别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="Education" DataField="Education" FieldType="String"
-                            HeaderText="学历" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="Major" DataField="Major" FieldType="String"
-                            HeaderText="所学专业" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="YearsOfService" DataField="YearsOfService" FieldType="String"
-                            HeaderText="安全管理工作年限" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="Qualification" DataField="Qualification" FieldType="String"
-                            HeaderText="上岗资格证书" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="PersonStates" DataField="PersonStates" FieldType="String"
-                            HeaderText="在册/外聘/分包" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="Remark" DataField="Remark" 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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="专职安全管理人员配备信息" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ReportId" AllowSorting="true"
+                            SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false"></f:DatePicker>
+                                        <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                    HeaderText="分支机构" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Duties" DataField="Duties" FieldType="String"
+                                    HeaderText="职务" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" FieldType="String"
+                                    HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone" FieldType="String"
+                                    HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="EmergentTel" DataField="EmergentTel" FieldType="String"
+                                    HeaderText="紧急情况下联系电话" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="170px" ColumnID="IdentityCard" DataField="IdentityCard" FieldType="String"
+                                    HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="Sex" DataField="Sex" FieldType="String"
+                                    HeaderText="性别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Education" DataField="Education" FieldType="String"
+                                    HeaderText="学历" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Major" DataField="Major" FieldType="String"
+                                    HeaderText="所学专业" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="YearsOfService" DataField="YearsOfService" FieldType="String"
+                                    HeaderText="安全管理工作年限" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="Qualification" DataField="Qualification" FieldType="String"
+                                    HeaderText="上岗资格证书" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PersonStates" DataField="PersonStates" FieldType="String"
+                                    HeaderText="在册/外聘/分包" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="Remark" DataField="Remark" 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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="专职安全管理人员配备信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.cs
index 603f713..445c6c3 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
 {
     public partial class PersonnelAllocationInfo : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -18,6 +34,21 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
@@ -25,12 +56,33 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            //this.GetButtonPower();
+            this.BindGrid();
+        }
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT report.ReportId,
                                     report.Months,
                                     report.UnitId,
@@ -55,7 +107,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
                          + @" LEFT JOIN dbo.Base_Unit as unit on unit.UnitId = report.UnitId"
                          + @" WHERE report.ProjectId= @ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -118,7 +170,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (GetButtonPower(Const.BtnAdd))
             {
-                var report = BLL.PersonnelAllocationInfoService.GetReportByMonth(this.CurrUser.LoginProjectId, this.txtMonth.Text.Trim());
+                var report = BLL.PersonnelAllocationInfoService.GetReportByMonth(this.ProjectId, this.txtMonth.Text.Trim());
                 if (report != null)
                 {
                     Alert.ShowInTop("本月月报已存在！", MessageBoxIcon.Warning);
@@ -254,7 +306,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PersonnelAllocationInfoMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.PersonnelAllocationInfoMenuId, button);
         }
         #endregion
     }
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.designer.cs
index 1a641b4..153bb1b 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/PersonnelAllocationInfo.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
-    
-    
-    public partial class PersonnelAllocationInfo {
-        
+namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
+{
+
+
+    public partial class PersonnelAllocationInfo
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// txtMonth 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtMonth;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx
index 3d30c62..a683eee 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectInfoMonthReport.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCEC4.HSSE.Report.ProjectInfoMonthReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -11,181 +13,195 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="在建项目信息月报" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MonthReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="MonthReportId" AllowSorting="true"
-                    SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false"></f:DatePicker>
-                                <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:GroupField ID="GroupField1" runat="server" HeaderText="基本情况" HeaderTextAlign="Center">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="在建项目信息月报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MonthReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="MonthReportId" AllowSorting="true"
+                            SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker ID="txtMonth" runat="server" Label="月份" Width="200px" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" ShowTodayButton="false"></f:DatePicker>
+                                        <f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
                             <Columns>
-                                <f:RenderField Width="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
-                                    HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left" SortField="Months">
-                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                                    HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
-                                    HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="90px" ColumnID="ProjectNature" DataField="ProjectNature" FieldType="String"
-                                    HeaderText="项目性质" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="Address" DataField="Address" FieldType="String"
-                                    HeaderText="建设地点" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="90px" ColumnID="ProjectStatus" DataField="ProjectStatus" FieldType="String"
-                                    HeaderText="项目状态" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ContractStartDate" DataField="ContractStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                                    HeaderText="合同起始日期" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ContractEndDate" DataField="ContractEndDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                                    HeaderText="合同终止日期" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ProjectManager" DataField="ProjectManager" FieldType="String"
-                                    HeaderText="项目经理及其联系电话" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="SecurityManager" DataField="SecurityManager" FieldType="String"
-                                    HeaderText="安全负责人及联系电话" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ContractAmount" DataField="ContractAmount" FieldType="String"
-                                    HeaderText="合同额(万元)" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="SitePeopleCount" DataField="SitePeopleCount" FieldType="String"
-                                    HeaderText="现场人数" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="SefeWorkHours" DataField="SefeWorkHours" FieldType="String"
-                                    HeaderText="本月安全工时" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="SafeWrokHoursTotalYear" DataField="SafeWrokHoursTotalYear" FieldType="String"
-                                    HeaderText="年度累计安全工时" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="SafeWorkHoursStartCon" DataField="SafeWorkHoursStartCon" FieldType="String"
-                                    HeaderText="自开工之日累计安全工时" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="SafetyTraining" DataField="SafetyTraining" FieldType="String"
-                                    HeaderText="本月安全培训（人/次）" HeaderTextAlign="Center" TextAlign="Left">
+                                <f:GroupField ID="GroupField1" runat="server" HeaderText="基本情况" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="80px" ColumnID="Months" DataField="Months" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM"
+                                            HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left" SortField="Months">
+                                        </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                            HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                            HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="90px" ColumnID="ProjectNature" DataField="ProjectNature" FieldType="String"
+                                            HeaderText="项目性质" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Address" DataField="Address" FieldType="String"
+                                            HeaderText="建设地点" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="90px" ColumnID="ProjectStatus" DataField="ProjectStatus" FieldType="String"
+                                            HeaderText="项目状态" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ContractStartDate" DataField="ContractStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                            HeaderText="合同起始日期" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ContractEndDate" DataField="ContractEndDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                            HeaderText="合同终止日期" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ProjectManager" DataField="ProjectManager" FieldType="String"
+                                            HeaderText="项目经理及其联系电话" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="SecurityManager" DataField="SecurityManager" FieldType="String"
+                                            HeaderText="安全负责人及联系电话" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ContractAmount" DataField="ContractAmount" FieldType="String"
+                                            HeaderText="合同额(万元)" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="SitePeopleCount" DataField="SitePeopleCount" FieldType="String"
+                                            HeaderText="现场人数" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="SefeWorkHours" DataField="SefeWorkHours" FieldType="String"
+                                            HeaderText="本月安全工时" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="SafeWrokHoursTotalYear" DataField="SafeWrokHoursTotalYear" FieldType="String"
+                                            HeaderText="年度累计安全工时" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="SafeWorkHoursStartCon" DataField="SafeWorkHoursStartCon" FieldType="String"
+                                            HeaderText="自开工之日累计安全工时" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="SafetyTraining" DataField="SafetyTraining" FieldType="String"
+                                            HeaderText="本月安全培训（人/次）" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ID="GroupField2" HeaderText="隐患排查治理数量（个）" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="HiddenDangerSameAs" DataField="HiddenDangerSameAs" FieldType="String"
+                                            HeaderText="一般" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="HiddenDangerMajor" DataField="HiddenDangerMajor" FieldType="String"
+                                            HeaderText="重大" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ID="GroupField3" HeaderText="高风险作业许可（个）" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="HotWork" DataField="HotWork" FieldType="String"
+                                            HeaderText="动火" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ConfinedSpace" DataField="ConfinedSpace" FieldType="String"
+                                            HeaderText="受限空间" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="HeightsWork" DataField="HeightsWork" FieldType="String"
+                                            HeaderText="高处作业" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Hoisting" DataField="Hoisting" FieldType="String"
+                                            HeaderText="吊装" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Groundbreaking" DataField="Groundbreaking" FieldType="String"
+                                            HeaderText="动土" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="TemporaryElectricity" DataField="TemporaryElectricity" FieldType="String"
+                                            HeaderText="临电" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="RadiationHomework" DataField="RadiationHomework" FieldType="String"
+                                            HeaderText="射线作业" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="NightConstruction" DataField="NightConstruction" FieldType="String"
+                                            HeaderText="夜间施工" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ID="GroupField4" HeaderText="获（地方政府监理业主集团等）表彰奖励情况" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="UnitAward" DataField="UnitAward" FieldType="String"
+                                            HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="PersonalAward" DataField="PersonalAward" FieldType="String"
+                                            HeaderText="个人" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ID="GroupField5" HeaderText="地方政府监理业主集团等处罚情况" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="UnitPunish" DataField="UnitPunish" FieldType="String"
+                                            HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="PersonalPunish" DataField="PersonalPunish" FieldType="String"
+                                            HeaderText="个人" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ID="GroupField6" HeaderText="事故控制" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="AccidentCount" DataField="AccidentCount" FieldType="String"
+                                            HeaderText="事故起数" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Injured" DataField="Injured" FieldType="String"
+                                            HeaderText="受伤人数" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Severity" DataField="Severity" FieldType="String"
+                                            HeaderText="严重程度" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="AccidentType" DataField="AccidentType" FieldType="String"
+                                            HeaderText="事故类型" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="EconomicLosses" DataField="EconomicLosses" FieldType="String"
+                                            HeaderText="直接经济损失（万元）" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="LostWorkingHours" DataField="LostWorkingHours" FieldType="String"
+                                            HeaderText="损失工时（人工时）" HeaderTextAlign="Center" TextAlign="Left">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:RenderField Width="100px" ColumnID="States" DataField="States" FieldType="String"
+                                    HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
                             </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="GroupField2" HeaderText="隐患排查治理数量（个）" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="HiddenDangerSameAs" DataField="HiddenDangerSameAs" FieldType="String"
-                                    HeaderText="一般" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="HiddenDangerMajor" DataField="HiddenDangerMajor" FieldType="String"
-                                    HeaderText="重大" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="GroupField3" HeaderText="高风险作业许可（个）" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="HotWork" DataField="HotWork" FieldType="String"
-                                    HeaderText="动火" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ConfinedSpace" DataField="ConfinedSpace" FieldType="String"
-                                    HeaderText="受限空间" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="HeightsWork" DataField="HeightsWork" FieldType="String"
-                                    HeaderText="高处作业" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="Hoisting" DataField="Hoisting" FieldType="String"
-                                    HeaderText="吊装" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="Groundbreaking" DataField="Groundbreaking" FieldType="String"
-                                    HeaderText="动土" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="TemporaryElectricity" DataField="TemporaryElectricity" FieldType="String"
-                                    HeaderText="临电" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="RadiationHomework" DataField="RadiationHomework" FieldType="String"
-                                    HeaderText="射线作业" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="NightConstruction" DataField="NightConstruction" FieldType="String"
-                                    HeaderText="夜间施工" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="GroupField4" HeaderText="获（地方政府监理业主集团等）表彰奖励情况" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="UnitAward" DataField="UnitAward" FieldType="String"
-                                    HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="PersonalAward" DataField="PersonalAward" FieldType="String"
-                                    HeaderText="个人" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="GroupField5" HeaderText="地方政府监理业主集团等处罚情况" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="UnitPunish" DataField="UnitPunish" FieldType="String"
-                                    HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="PersonalPunish" DataField="PersonalPunish" FieldType="String"
-                                    HeaderText="个人" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="GroupField6" HeaderText="事故控制" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="AccidentCount" DataField="AccidentCount" FieldType="String"
-                                    HeaderText="事故起数" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="Injured" DataField="Injured" FieldType="String"
-                                    HeaderText="受伤人数" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="Severity" DataField="Severity" FieldType="String"
-                                    HeaderText="严重程度" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="AccidentType" DataField="AccidentType" FieldType="String"
-                                    HeaderText="事故类型" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="EconomicLosses" DataField="EconomicLosses" FieldType="String"
-                                    HeaderText="直接经济损失（万元）" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="LostWorkingHours" DataField="LostWorkingHours" FieldType="String"
-                                    HeaderText="损失工时（人工时）" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:RenderField Width="100px" ColumnID="States" DataField="States" 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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            <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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="在建项目信息月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.cs
index adcfc37..c1ac68e 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
 {
     public partial class ProjectInfoMonthReport : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -18,6 +34,21 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
@@ -25,12 +56,33 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            //this.GetButtonPower();
+            this.BindGrid();
+        }
+
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT report.MonthReportId,
                                     report.Months,
                                     report.UnitId,
@@ -76,7 +128,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
                          + @" LEFT JOIN dbo.Base_Unit as unit on unit.UnitId = report.UnitId"
                          + @" WHERE report.ProjectId= @ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -139,7 +191,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         {
             if (GetButtonPower(Const.BtnAdd))
             {
-                var report = BLL.ProjectInfoMonthReportService.GetProjectInfoMonthReportByMonth(this.CurrUser.LoginProjectId, this.txtMonth.Text.Trim());
+                var report = BLL.ProjectInfoMonthReportService.GetProjectInfoMonthReportByMonth(this.ProjectId, this.txtMonth.Text.Trim());
                 if (report != null)
                 {
                     Alert.ShowInTop("本月月报已存在！", MessageBoxIcon.Warning);
@@ -292,7 +344,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectInfoMonthReportMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectInfoMonthReportMenuId, button);
         }
         #endregion
     }
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.designer.cs
index cd532a4..2119b2a 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCEC4/HSSE/Report/ProjectInfoMonthReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
-    
-    
-    public partial class ProjectInfoMonthReport {
-        
+namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report
+{
+
+
+    public partial class ProjectInfoMonthReport
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// txtMonth 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtMonth;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// GroupField1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField GroupField1;
-        
+
         /// <summary>
         /// GroupField2 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField GroupField2;
-        
+
         /// <summary>
         /// GroupField3 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField GroupField3;
-        
+
         /// <summary>
         /// GroupField4 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField GroupField4;
-        
+
         /// <summary>
         /// GroupField5 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField GroupField5;
-        
+
         /// <summary>
         /// GroupField6 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField GroupField6;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.Customization.CNCEC4.HSSE.Report {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx
index 7454e88..094b77d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentHandle.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Accident.AccidentHandle" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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">
@@ -9,110 +11,124 @@
 </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="HSE事故(含未遂)处理" EnableCollapse="true"
-                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="AccidentHandleId"
-                 DataIDField="AccidentHandleId" AllowSorting="true" ForceFit="true"
-                SortField="AccidentHandleCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
-                EnableTextSelection="True" OnRowCommand="Grid1_RowCommand">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" Label="名称" ID="txtAccidentHandleName" EmptyText="输入查询条件"
-                                 Width="250px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:DatePicker ID="txtStartDate" runat="server" Label="发生时间" 
-                                Width="250px" EmptyText="开始时间" LabelAlign="Right">
-                            </f:DatePicker>
-                            <f:Label ID="lblTo" runat="server" Text="至">
-                            </f:Label>
-                            <f:DatePicker ID="txtEndDate" runat="server"
-                                Width="150px" EmptyText="结束时间">
-                            </f:DatePicker>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Text="查询"
-                                 EnablePostBack="true" OnClick="btnQuery_Click" runat="server" >
-                            </f:Button>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="100px" ColumnID="AccidentHandleCode" DataField="AccidentHandleCode"
-                        SortField="AccidentHandleCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="160px" ColumnID="AccidentHandleName" DataField="AccidentHandleName"
-                        SortField="AccidentHandleName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>      
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
-                        SortField="UnitName" FieldType="String" HeaderText="事故单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="AccidentDate" DataField="AccidentDate" SortField="AccidentDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发生时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                  <%--  <f:RenderField Width="350px" ColumnID="AccidentDef" DataField="AccidentDef" SortField="AccidentDef"
-                        FieldType="String" HeaderText="事故摘要" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>--%>
-                    <%--<f:RenderField Width="120px" ColumnID="Death" DataField="Death" SortField="Death"
-                        FieldType="String" HeaderText="伤亡情况" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>--%>
-                    <f:RenderField Width="90px" ColumnID="MoneyLoss" DataField="MoneyLoss" SortField="MoneyLoss"
-                        FieldType="String" HeaderText="经济损失" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-               <%--     <f:RenderField Width="400px" ColumnID="AccidentHandle" DataField="AccidentHandle"
-                        SortField="AccidentHandle" FieldType="String" HeaderText="善后处理" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="Remark" DataField="Remark" SortField="Remark"
-                        FieldType="String" HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>--%>
-                    <f:LinkButtonField Width="90px" HeaderText="四不放过" Text="四不放过" HeaderTextAlign="Center"
-                        TextAlign="Left"  DataCommandArgumentField="AccidentHandleId" CommandName="NoFourLetoff">
-                    </f:LinkButtonField>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="HSE事故(含未遂)处理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1024px"
-        Height="550px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSE事故(含未遂)处理" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="AccidentHandleId"
+                            DataIDField="AccidentHandleId" AllowSorting="true" ForceFit="true"
+                            SortField="AccidentHandleCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                            EnableTextSelection="True" OnRowCommand="Grid1_RowCommand">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="名称" ID="txtAccidentHandleName" EmptyText="输入查询条件"
+                                            Width="250px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DatePicker ID="txtStartDate" runat="server" Label="发生时间"
+                                            Width="250px" EmptyText="开始时间" LabelAlign="Right">
+                                        </f:DatePicker>
+                                        <f:Label ID="lblTo" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker ID="txtEndDate" runat="server"
+                                            Width="150px" EmptyText="结束时间">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Text="查询"
+                                            EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="100px" ColumnID="AccidentHandleCode" DataField="AccidentHandleCode"
+                                    SortField="AccidentHandleCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="160px" ColumnID="AccidentHandleName" DataField="AccidentHandleName"
+                                    SortField="AccidentHandleName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="事故单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="AccidentDate" DataField="AccidentDate" SortField="AccidentDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发生时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--  <f:RenderField Width="350px" ColumnID="AccidentDef" DataField="AccidentDef" SortField="AccidentDef"
+             FieldType="String" HeaderText="事故摘要" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>--%>
+                                <%--<f:RenderField Width="120px" ColumnID="Death" DataField="Death" SortField="Death"
+             FieldType="String" HeaderText="伤亡情况" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>--%>
+                                <f:RenderField Width="90px" ColumnID="MoneyLoss" DataField="MoneyLoss" SortField="MoneyLoss"
+                                    FieldType="String" HeaderText="经济损失" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <%--     <f:RenderField Width="400px" ColumnID="AccidentHandle" DataField="AccidentHandle"
+             SortField="AccidentHandle" FieldType="String" HeaderText="善后处理" HeaderTextAlign="Center"
+             TextAlign="Left">
+         </f:RenderField>
+         <f:RenderField Width="120px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>--%>
+                                <f:LinkButtonField Width="90px" HeaderText="四不放过" Text="四不放过" HeaderTextAlign="Center"
+                                    TextAlign="Left" DataCommandArgumentField="AccidentHandleId" CommandName="NoFourLetoff">
+                                </f:LinkButtonField>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="HSE事故(含未遂)处理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1024px"
+            Height="550px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.cs
index 89964ed..8ab0a27 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.cs
@@ -9,6 +9,22 @@ namespace FineUIPro.Web.HSSE.Accident
 {
     public partial class AccidentHandle : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -20,8 +36,20 @@ namespace FineUIPro.Web.HSSE.Accident
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("AccidentHandleEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -34,10 +62,30 @@ namespace FineUIPro.Web.HSSE.Accident
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT AccidentHandle.AccidentHandleId,"
                           + @"AccidentHandle.ProjectId,"
                           + @"CodeRecords.Code AS AccidentHandleCode,"
@@ -68,7 +116,7 @@ namespace FineUIPro.Web.HSSE.Accident
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
 
             if (!string.IsNullOrEmpty(this.txtAccidentHandleName.Text.Trim()))
@@ -248,7 +296,7 @@ namespace FineUIPro.Web.HSSE.Accident
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentHandleMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentHandleMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.designer.cs
index 7c36a71..9d5365a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandle.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Accident {
-    
-    
-    public partial class AccidentHandle {
-        
+namespace FineUIPro.Web.HSSE.Accident
+{
+
+
+    public partial class AccidentHandle
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtAccidentHandleName 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAccidentHandleName;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// lblTo 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblTo;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx
index 1f80d3b..711aa4e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx
@@ -1,6 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentPersonRecord.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Accident.AccidentPersonRecord" %>
-
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> 
+ 
 <!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">
@@ -9,10 +10,22 @@
 </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:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+ <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+     <Items>
+         <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+             EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+             ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+             <Items>
+                 <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                     BodyPadding="0px">
+                     <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                 </f:ContentPanel>
+             </Items>
+         </f:Panel>
+         <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+             Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle"  AutoScroll="true">
+             <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSE事故(对人员)记录" EnableCollapse="true"
                 runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="AccidentPersonRecordId" ForceFit="true"
                 DataIDField="AccidentPersonRecordId" AllowSorting="true" SortField="AccidentDate" SortDirection="DESC" 
@@ -105,8 +118,10 @@
                     </f:DropDownList>
                 </PageItems>
             </f:Grid>
-        </Items>
-    </f:Panel>
+			 </Items>
+        </f:Panel>
+    </Items>
+</f:Panel>
     <f:Window ID="Window1" Title="HSE事故(对人员)记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
         Height="600px">
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.cs
index 67a37fc..31e1d93 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.cs
@@ -9,6 +9,23 @@ namespace FineUIPro.Web.HSSE.Accident
 {
     public partial class AccidentPersonRecord : PageBase
     {
+
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -20,8 +37,20 @@ namespace FineUIPro.Web.HSSE.Accident
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("AccidentPersonRecordEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -33,10 +62,30 @@ namespace FineUIPro.Web.HSSE.Accident
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT AccidentPersonRecord.AccidentPersonRecordId,"
                           + @"AccidentPersonRecord.ProjectId,"
                           + @"AccidentPersonRecord.AccidentTypeId,"
@@ -78,7 +127,7 @@ namespace FineUIPro.Web.HSSE.Accident
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
 
             if (!string.IsNullOrEmpty(this.txtAccidentTypeName.Text.Trim()))
@@ -225,7 +274,7 @@ namespace FineUIPro.Web.HSSE.Accident
                         BLL.AccidentPersonRecordService.DeleteAccidentPersonRecordById(rowID);
                     }
                 }
-                // Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
+                // Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
                 this.BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
@@ -271,7 +320,7 @@ namespace FineUIPro.Web.HSSE.Accident
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentPersonRecordMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentPersonRecordMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.designer.cs
index f8f5ff7..2f10eaf 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Accident {
-    
-    
-    public partial class AccidentPersonRecord {
-        
+namespace FineUIPro.Web.HSSE.Accident
+{
+
+
+    public partial class AccidentPersonRecord
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtAccidentTypeName 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAccidentTypeName;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// lblTo 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblTo;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// lblInjury 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblInjury;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx
index 292c461..acdc9e0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentReport.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Accident.AccidentReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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">
@@ -9,95 +11,109 @@
 </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="AccidentReportId" ForceFit="true"
-                 DataIDField="AccidentReportId" AllowSorting="true" SortField="AccidentReportCode" 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 runat="server" Label="编号" ID="txtAccidentReportCode" EmptyText="输入查询条件"
-                                Width="300px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                             <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" 	OnClick="TextBox_TextChanged" runat="server" Text="查询" >
-                            </f:Button>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="80px" ColumnID="AccidentReportCode" DataField="AccidentReportCode"
-                        SortField="AccidentReportCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
-                        SortField="AccidentTypeName" FieldType="String" HeaderText="事故类型" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="Abstract" DataField="Abstract" SortField="Abstract"
-                        FieldType="String" HeaderText="提要" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="AccidentDate" DataField="AccidentDate" SortField="AccidentDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发生时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="WorkArea" DataField="WorkArea" SortField="WorkArea"
-                        FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="80px" ColumnID="PeopleNum" DataField="PeopleNum" SortField="PeopleNum"
-                        FieldType="Int" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                  <%--  <f:RenderField Width="100px" ColumnID="WorkingHoursLoss" DataField="WorkingHoursLoss"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="事故调查报告" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="AccidentReportId" ForceFit="true"
+                            DataIDField="AccidentReportId" AllowSorting="true" SortField="AccidentReportCode" 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 runat="server" Label="编号" ID="txtAccidentReportCode" EmptyText="输入查询条件"
+                                            Width="300px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="80px" ColumnID="AccidentReportCode" DataField="AccidentReportCode"
+                                    SortField="AccidentReportCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
+                                    SortField="AccidentTypeName" FieldType="String" HeaderText="事故类型" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Abstract" DataField="Abstract" SortField="Abstract"
+                                    FieldType="String" HeaderText="提要" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="AccidentDate" DataField="AccidentDate" SortField="AccidentDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发生时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="WorkArea" DataField="WorkArea" SortField="WorkArea"
+                                    FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="PeopleNum" DataField="PeopleNum" SortField="PeopleNum"
+                                    FieldType="Int" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <%--  <f:RenderField Width="100px" ColumnID="WorkingHoursLoss" DataField="WorkingHoursLoss"
                         SortField="WorkingHoursLoss" FieldType="Float" HeaderText="工时损失" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>
                     <f:RenderField Width="100px" ColumnID="EconomicLoss" DataField="EconomicLoss" SortField="EconomicLoss"
                         FieldType="Float" 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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="事故调查报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="630px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="事故调查报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            Height="630px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.cs
index 6f282f4..89fb220 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.cs
@@ -37,13 +37,20 @@ namespace FineUIPro.Web.HSSE.Accident
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("AccidentReportEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -54,11 +61,32 @@ namespace FineUIPro.Web.HSSE.Accident
                 this.BindGrid();
             }
         }
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT AccidentReport.AccidentReportId,"
                           + @"AccidentReport.ProjectId,"
                           + @"CodeRecords.Code AS AccidentReportCode,"
@@ -101,7 +129,7 @@ namespace FineUIPro.Web.HSSE.Accident
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -236,8 +264,8 @@ namespace FineUIPro.Web.HSSE.Accident
                   
                     }
                 }
-                //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkingHours);
-                //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
+                //Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkingHours);
+                //Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.AccidentEvent);
                 this.BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
@@ -256,7 +284,7 @@ namespace FineUIPro.Web.HSSE.Accident
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentReportMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentReportMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.designer.cs
index ab8c414..4a0f09d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Accident {
-    
-    
-    public partial class AccidentReport {
-        
+namespace FineUIPro.Web.HSSE.Accident
+{
+
+
+    public partial class AccidentReport
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtAccidentReportCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAccidentReportCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx
index 1a2dcb0..2342822 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentReportOther.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Accident.AccidentReportOther" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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">
@@ -9,114 +11,128 @@
 </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="AccidentReportOtherId"
-                DataIDField="AccidentReportOtherId" AllowSorting="true" SortField="AccidentReportOtherCode" SortDirection="DESC"
-                OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
-                OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
-                EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" Label="事故编号" ID="txtAccidentReportOtherCode" EmptyText="输入查询条件"
-                                Width="300px" LabelWidth="100px" LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                             <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Text="查询" 
-                                 EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server" >
-                            </f:Button>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="80px" ColumnID="AccidentReportOtherCode" DataField="AccidentReportOtherCode"
-                        SortField="AccidentReportOtherCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
-                        SortField="AccidentTypeName" FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="Abstract" DataField="Abstract" SortField="Abstract"
-                        FieldType="String" HeaderText="提要" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="AccidentDate" DataField="AccidentDate" SortField="AccidentDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发生时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <%--<f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="审核完成日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>--%>
-                    <f:RenderField Width="110px" ColumnID="WorkArea" DataField="WorkArea" SortField="WorkArea"
-                        FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="80px" ColumnID="PeopleNum" DataField="PeopleNum" SortField="PeopleNum"
-                        FieldType="Int" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="事故责任单位" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <%--<f:RenderField Width="90px" ColumnID="EconomicLoss" DataField="EconomicLoss" SortField="EconomicLoss"
-                        FieldType="Float" HeaderText="经济损失" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="ReportMan" DataField="ReportMan" SortField="ReportMan"
-                        FieldType="String" HeaderText="报告人" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="ReporterUnit" DataField="ReporterUnit" SortField="ReporterUnit"
-                        FieldType="String" HeaderText="报告人员单位" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="ReportDate" DataField="ReportDate" SortField="ReportDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="报告时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="报告编制" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="事故调查处理报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="600px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="事故调查处理报告" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="AccidentReportOtherId"
+                            DataIDField="AccidentReportOtherId" AllowSorting="true" SortField="AccidentReportOtherCode" SortDirection="DESC"
+                            OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
+                            OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                            EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="事故编号" ID="txtAccidentReportOtherCode" EmptyText="输入查询条件"
+                                            Width="300px" LabelWidth="100px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Text="查询"
+                                            EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="80px" ColumnID="AccidentReportOtherCode" DataField="AccidentReportOtherCode"
+                                    SortField="AccidentReportOtherCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
+                                    SortField="AccidentTypeName" FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Abstract" DataField="Abstract" SortField="Abstract"
+                                    FieldType="String" HeaderText="提要" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="AccidentDate" DataField="AccidentDate" SortField="AccidentDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发生时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate"
+             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="审核完成日期"
+             HeaderTextAlign="Center" TextAlign="Center">
+         </f:RenderField>--%>
+                                <f:RenderField Width="110px" ColumnID="WorkArea" DataField="WorkArea" SortField="WorkArea"
+                                    FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="PeopleNum" DataField="PeopleNum" SortField="PeopleNum"
+                                    FieldType="Int" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="事故责任单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="90px" ColumnID="EconomicLoss" DataField="EconomicLoss" SortField="EconomicLoss"
+             FieldType="Float" HeaderText="经济损失" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>
+         <f:RenderField Width="90px" ColumnID="ReportMan" DataField="ReportMan" SortField="ReportMan"
+             FieldType="String" HeaderText="报告人" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>
+         <f:RenderField Width="150px" ColumnID="ReporterUnit" DataField="ReporterUnit" SortField="ReporterUnit"
+             FieldType="String" HeaderText="报告人员单位" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>
+         <f:RenderField Width="90px" ColumnID="ReportDate" DataField="ReportDate" SortField="ReportDate"
+             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="报告时间"
+             HeaderTextAlign="Center" TextAlign="Center">
+         </f:RenderField>
+         <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+             SortField="CompileManName" FieldType="String" HeaderText="报告编制" HeaderTextAlign="Center"
+             TextAlign="Left">
+         </f:RenderField>
+         <f:RenderField Width="90px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期"
+             HeaderTextAlign="Center" TextAlign="Center">
+         </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="事故调查处理报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.cs
index a2b8dbc..d63c46a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.cs
@@ -37,13 +37,20 @@ namespace FineUIPro.Web.HSSE.Accident
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("AccidentReportOtherEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -55,11 +62,31 @@ namespace FineUIPro.Web.HSSE.Accident
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT AccidentReportOther.AccidentReportOtherId,"
                           + @"AccidentReportOther.ProjectId,"
                           + @"CodeRecords.Code AS AccidentReportOtherCode,"
@@ -101,7 +128,7 @@ namespace FineUIPro.Web.HSSE.Accident
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -254,7 +281,7 @@ namespace FineUIPro.Web.HSSE.Accident
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentReportOtherMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectAccidentReportOtherMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.designer.cs
index b7056c5..16118c0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentReportOther.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Accident {
-    
-    
-    public partial class AccidentReportOther {
-        
+namespace FineUIPro.Web.HSSE.Accident
+{
+
+
+    public partial class AccidentReportOther
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtAccidentReportOtherCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAccidentReportOtherCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Accident {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx
index d222dec..96d47cf 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx
@@ -1,116 +1,132 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanSummary.aspx.cs" Inherits="FineUIPro.Web.HSSE.ActionPlan.ActionPlanSummary" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <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="ActionPlanSummaryId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="ActionPlanSummaryId" AllowSorting="true"
-                SortField="Code" 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 runat="server" Label="总结编号" ID="txtCode" EmptyText="输入查询条件"
-                                Width="250px" LabelWidth="100px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="总结名称" ID="txtName" EmptyText="输入查询条件"
-                               Width="250px" LabelWidth="100px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" 
-                                 EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server" >
-                            </f:Button>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="150px" ColumnID="Code" DataField="Code"
-                        SortField="Code" FieldType="String" HeaderText="总结编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="Name" DataField="Name" ExpandUnusedSpace="True"
-                        SortField="Name" FieldType="String" HeaderText="总结名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>              
-                    <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName" SortField="CompileManName"
-                        FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>                    
-                    <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="上传查看" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanSummaryId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanSummaryAttachUrl&menuId=9BEB66C0-E6DE-44DD-94F6-5C7433E6DE62"
-                          HeaderTextAlign="Center" />
-                </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="100000" />
-                    </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="1024px" Height="600px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="实施计划总结" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ActionPlanSummaryId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ActionPlanSummaryId" AllowSorting="true"
+                            SortField="Code" 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 runat="server" Label="总结编号" ID="txtCode" EmptyText="输入查询条件"
+                                            Width="250px" LabelWidth="100px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="总结名称" ID="txtName" EmptyText="输入查询条件"
+                                            Width="250px" LabelWidth="100px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
+                                            EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server">
+                                        </f:Button>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="150px" ColumnID="Code" DataField="Code"
+                                    SortField="Code" FieldType="String" HeaderText="总结编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="Name" DataField="Name" ExpandUnusedSpace="True"
+                                    SortField="Name" FieldType="String" HeaderText="总结名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName" SortField="CompileManName"
+                                    FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
+                                    Text="上传查看" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanSummaryId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanSummaryAttachUrl&menuId=9BEB66C0-E6DE-44DD-94F6-5C7433E6DE62"
+                                    HeaderTextAlign="Center" />
+                            </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="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </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="1024px" Height="600px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs
index 747b8de..ef74da9 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs
@@ -38,14 +38,21 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
 
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("ActionPlanSummaryEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -57,11 +64,32 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT ActionPlanSummary.ActionPlanSummaryId,ActionPlanSummary.ProjectId,CodeRecords.Code AS Code,ActionPlanSummary.Name,ActionPlanSummary.Contents,ActionPlanSummary.CompileMan,Users.UserName AS CompileManName, ActionPlanSummary.CompileDate,ActionPlanSummary.States,Unit.UnitName"
                         + @" ,(CASE WHEN ActionPlanSummary.States = " + BLL.Const.State_0 + " OR ActionPlanSummary.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN ActionPlanSummary.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                         + @" FROM ActionPlan_ActionPlanSummary AS ActionPlanSummary "
@@ -82,7 +110,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -282,7 +310,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectActionPlanSummaryMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectActionPlanSummaryMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.designer.cs
index a1c1d62..227f07e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.ActionPlan {
-    
-    
-    public partial class ActionPlanSummary {
-        
+namespace FineUIPro.Web.HSSE.ActionPlan
+{
+
+
+    public partial class ActionPlanSummary
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCode;
-        
+
         /// <summary>
         /// txtName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtName;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/IncentiveNotice.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/IncentiveNotice.aspx.cs
index eafcf5c..ab71a12 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/IncentiveNotice.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/IncentiveNotice.aspx.cs
@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace FineUIPro.Web.HSSE.Check
 {
-    public partial class IncentiveNotice :PageBase
+    public partial class IncentiveNotice : PageBase
     {
         #region 项目主键
         /// <summary>
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
@@ -66,12 +66,6 @@ namespace FineUIPro.Web.HSSE.Check
                     //   this.Grid1.Columns[0].Hidden = true;
                 }
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 ////权限按钮方法
                 this.GetButtonPower();
                 this.btnNew.OnClientClick = Window1.GetShowReference("IncentiveNoticeAdd.aspx") + "return false;";
@@ -84,10 +78,19 @@ namespace FineUIPro.Web.HSSE.Check
                 this.BindGrid();
             }
         }
-
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             //新增UnitId
             //this.UnitId = this.ucTree.UnitId;
             ////判断 当有projectId的时候单位id为空
@@ -103,8 +106,11 @@ namespace FineUIPro.Web.HSSE.Check
         /// </summary>
         private void BindGrid()
         {
-            
-            if (!string.IsNullOrEmpty(this.ProjectId) )
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT IncentiveNotice.IncentiveNoticeId,"
                           + @"IncentiveNotice.ProjectId,"
@@ -173,7 +179,7 @@ namespace FineUIPro.Web.HSSE.Check
                     strSql += " AND IncentiveNoticeCode LIKE @IncentiveNoticeCode";
                     listStr.Add(new SqlParameter("@IncentiveNoticeCode", "%" + this.txtIncentiveNoticeCode.Text.Trim() + "%"));
                 }
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND IncentiveNotice.UnitId = @UnitId2";
                     listStr.Add(new SqlParameter("@UnitId2", this.drpUnitId.SelectedValue.Trim()));
@@ -354,7 +360,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectIncentiveNoticeMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectIncentiveNoticeMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs
index 7cc575b..3346bca 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNotice.aspx.cs
@@ -60,8 +60,7 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
@@ -71,11 +70,6 @@ namespace FineUIPro.Web.HSSE.Check
                     //   this.Grid1.Columns[0].Hidden = true;
                 }
 
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 ////权限按钮方法
                 this.GetButtonPower();
                 this.btnNew.OnClientClick = Window1.GetShowReference("PunishNoticeAdd.aspx") + "return false;";
@@ -88,10 +82,19 @@ namespace FineUIPro.Web.HSSE.Check
                 this.BindGrid();
             }
         }
-
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             //新增UnitId
             //this.UnitId = this.ucTree.UnitId;
             ////判断 当有projectId的时候单位id为空
@@ -107,6 +110,10 @@ namespace FineUIPro.Web.HSSE.Check
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId) )
             {
 
@@ -164,7 +171,7 @@ namespace FineUIPro.Web.HSSE.Check
                     strSql += " AND PunishNoticeCode LIKE @PunishNoticeCode";
                     listStr.Add(new SqlParameter("@PunishNoticeCode", "%" + this.txtPunishNoticeCode.Text.Trim() + "%"));
                 }
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND PunishNotice.UnitId = @UnitId2";
                     listStr.Add(new SqlParameter("@UnitId2", this.drpUnitId.SelectedValue.Trim()));
@@ -351,7 +358,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectPunishNoticeMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectPunishNoticeMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNoticeStatistics.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNoticeStatistics.aspx.cs
index 80a8ab7..9c40ed3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNoticeStatistics.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/PunishNoticeStatistics.aspx.cs
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
@@ -67,12 +67,6 @@ namespace FineUIPro.Web.HSSE.Check
                     //   this.Grid1.Columns[0].Hidden = true;
                 }
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
@@ -82,10 +76,19 @@ namespace FineUIPro.Web.HSSE.Check
                 this.BindGrid();
             }
         }
-
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
         protected void changeTree(object sender, EventArgs e)
         {
             this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
             //新增UnitId
             //this.UnitId = this.ucTree.UnitId;
             //判断 当有projectId的时候单位id为空
@@ -101,6 +104,10 @@ namespace FineUIPro.Web.HSSE.Check
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
 
@@ -121,7 +128,7 @@ namespace FineUIPro.Web.HSSE.Check
                 //    listStr.Add(new SqlParameter("@UnitId1", UnitId));
                 //}
 
-               
+
 
                 /// 施工分包 只看到自己已完成的处罚单
                 if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
@@ -129,7 +136,7 @@ namespace FineUIPro.Web.HSSE.Check
                     strSql += " AND P.UnitId = @UnitId";  ///处罚单位
                     listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
                 }
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND P.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx
index 6afa65d..587cbe2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CostManage.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.CostManage" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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">
@@ -8,88 +10,102 @@
 </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="分包HSE费用管理" EnableCollapse="true"
-                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CostManageId"
-                DataIDField="CostManageId" AllowSorting="true" SortField="CostManageCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="CostManageCode" DataField="CostManageCode"
-                        SortField="CostManageCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="180px" ColumnID="CostManageName" DataField="CostManageName"
-                        SortField="CostManageName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="分包商" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CostManageDate" DataField="CostManageDate"
-                        SortField="CostManageDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="申请时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                   <%-- <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="CostManageId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CostManageAttachUrl&menuId=FF68C697-B058-4687-A98F-71C591650E02"
-                        IFrameUrl="~/alert.aspx"  HeaderTextAlign="Center" />--%>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="分包HSE费用管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="560px">
-    </f:Window>
-    <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:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="分包HSE费用管理" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CostManageId"
+                            DataIDField="CostManageId" AllowSorting="true" SortField="CostManageCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="CostManageCode" DataField="CostManageCode"
+                                    SortField="CostManageCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="CostManageName" DataField="CostManageName"
+                                    SortField="CostManageName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="分包商" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CostManageDate" DataField="CostManageDate"
+                                    SortField="CostManageDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="申请时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%-- <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
+             Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="CostManageId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CostManageAttachUrl&menuId=FF68C697-B058-4687-A98F-71C591650E02"
+             IFrameUrl="~/alert.aspx"  HeaderTextAlign="Center" />--%>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="分包HSE费用管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            Height="560px">
+        </f:Window>
+        <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:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs
index 9459072..927a8dc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs
@@ -39,13 +39,20 @@ namespace FineUIPro.Web.HSSE.CostGoods
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("CostManageEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -56,11 +63,32 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 this.BindGrid();
             }
         }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @" SELECT CostManage.CostManageId, "
                           + @" CostManage.ProjectId,"
                           + @" CodeRecords.Code AS CostManageCode,"
@@ -93,7 +121,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -230,7 +258,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectCostManageMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectCostManageMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs
index e7539b2..ea7ed54 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.CostGoods {
-    
-    
-    public partial class CostManage {
-        
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+    public partial class CostManage
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx
index bd05d15..88569ec 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CostSmallDetail.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.CostGoods.CostSmallDetail" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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">
@@ -9,87 +11,101 @@
 </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="CostSmallDetailId"
-                DataIDField="CostSmallDetailId" AllowSorting="true" SortField="CostSmallDetailCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="250px">
-                            </f:DropDownList>  
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="200px" ColumnID="CostSmallDetailCode" DataField="CostSmallDetailCode"
-                        SortField="CostSmallDetailCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="Months" DataField="Months" SortField="Months"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileMan" DataField="CompileMan"
-                        SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                <%--    <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="附件" ToolTip="附件上传查看" DataIFrameUrlFields="CostSmallDetailId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CostSmallDetailAttachUrl&menuId=0C311396-C859-40B0-9D72-6A8B20733002"
-                        HeaderTextAlign="Center" />--%>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="安全费用支出" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="560px">
-    </f:Window>
-    <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:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全费用支出" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CostSmallDetailId"
+                            DataIDField="CostSmallDetailId" AllowSorting="true" SortField="CostSmallDetailCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="200px" ColumnID="CostSmallDetailCode" DataField="CostSmallDetailCode"
+                                    SortField="CostSmallDetailCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="Months" DataField="Months" SortField="Months"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileMan" DataField="CompileMan"
+                                    SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--    <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件"
+             Text="附件" ToolTip="附件上传查看" DataIFrameUrlFields="CostSmallDetailId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CostSmallDetailAttachUrl&menuId=0C311396-C859-40B0-9D72-6A8B20733002"
+             HeaderTextAlign="Center" />--%>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="安全费用支出" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            Height="560px">
+        </f:Window>
+        <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:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.cs
index 6aa00f9..ea41089 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.cs
@@ -37,18 +37,19 @@ namespace FineUIPro.Web.HSSE.CostGoods
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
                 {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
                 this.btnNew.OnClientClick = Window1.GetShowReference("CostSmallDetailEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
@@ -60,11 +61,44 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 this.BindGrid();
             }
         }
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @" SELECT CostSmallDetail.CostSmallDetailId, "
                           + @" CostSmallDetail.ProjectId,"
                           + @" CodeRecords.Code AS CostSmallDetailCode,"
@@ -90,9 +124,9 @@ namespace FineUIPro.Web.HSSE.CostGoods
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != Const._Null)
             {
                 strSql += " AND CostSmallDetail.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -239,7 +273,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectCostSmallDetailMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectCostSmallDetailMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.designer.cs
index e168794..7808626 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/CostSmallDetail.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.CostGoods {
-    
-    
-    public partial class CostSmallDetail {
-        
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+    public partial class CostSmallDetail
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/MeasuresEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/MeasuresEdit.aspx.cs
index d03be2e..5629172 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/MeasuresEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/MeasuresEdit.aspx.cs
@@ -68,7 +68,6 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 else
                 {
                     this.txtCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.CostGoodsMeasuresMenuId, this.ProjectId, null);
-
                 }
             }
         }
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx
index 804453f..ce167cc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx
@@ -1,104 +1,120 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PayRegistration.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.PayRegistration" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <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>HSE费用投入登记</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="PayRegistrationId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="PayRegistrationId" AllowSorting="true"
-                SortField="PayDate" 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:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="150px" ColumnID="PayDate" DataField="PayDate" SortField="PayDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>                    
-                    <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
-                        FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:WindowField TextAlign="Left" Width="150px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
-                        DataIFrameUrlFields="PayRegistrationId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PayRegistrationAttachUrl&menuId=9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E"
-                        HeaderTextAlign="Center" />
-                    <%--<f:RenderField Width="140px" 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="100000" />
-                    </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" IsModal="true" Width="1300px"
-        Height="700px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
-        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="btnMenuView" OnClick="btnMenuView_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全费用投入登记" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PayRegistrationId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="PayRegistrationId" AllowSorting="true"
+                            SortField="PayDate" 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:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="150px" ColumnID="PayDate" DataField="PayDate" SortField="PayDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
+                                    FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="150px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
+                                    DataIFrameUrlFields="PayRegistrationId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PayRegistrationAttachUrl&menuId=9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E"
+                                    HeaderTextAlign="Center" />
+                                <%--<f:RenderField Width="140px" 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="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="安全费用投入登记" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1300px"
+            Height="700px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
+            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="btnMenuView" OnClick="btnMenuView_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs
index 09e29ab..c9741cb 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs
@@ -38,13 +38,21 @@ namespace FineUIPro.Web.HSSE.CostGoods
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("PayRegistrationEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -56,11 +64,32 @@ namespace FineUIPro.Web.HSSE.CostGoods
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @" SELECT PayRegistration.PayRegistrationId, "
                           + @" PayRegistration.ProjectId,"
                           + @" PayRegistration.UnitId,"
@@ -84,7 +113,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -232,7 +261,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectPayRegistrationMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectPayRegistrationMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.designer.cs
index 14f68f9..fd1d2f6 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.CostGoods {
-    
-    
-    public partial class PayRegistration {
-        
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+    public partial class PayRegistration
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.CostGoods {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx
index 2441a01..b12d28c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx
@@ -1,115 +1,131 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DrillRecordList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Emergency.DrillRecordList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <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="DrillRecordListId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="DrillRecordListId" AllowSorting="true"
-                SortField="DrillRecordCode" 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 runat="server" Label="编号" ID="txtDrillRecordCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="250px">
-                            </f:DropDownList>
-                            <f:TextBox runat="server" Label="演练名称" ID="txtDrillRecordName" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>                    
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="100px" ColumnID="DrillRecordCode" DataField="DrillRecordCode"
-                        SortField="DrillRecordCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>                    
-                    <f:RenderField Width="160px" ColumnID="DrillRecordName" DataField="DrillRecordName" 
-                        SortField="DrillRecordName" FieldType="String" HeaderText="演练名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="DrillRecordTypeName" DataField="DrillRecordTypeName"
-                        SortField="DrillRecordTypeName" FieldType="String" HeaderText="演练类型" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="300px" ColumnID="UnitNames" DataField="UnitNames" ExpandUnusedSpace="true"
-                        SortField="UnitNames" FieldType="String" HeaderText="参与单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="JointPersonNum" DataField="JointPersonNum" SortField="JointPersonNum"
-                        FieldType="String" HeaderText="参演人数" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="DrillCost" DataField="DrillCost"
-                        SortField="DrillCost" FieldType="Float" HeaderText="直接投入" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="DrillRecordDate" DataField="DrillRecordDate"
-                        SortField="DrillRecordDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="演练日期" HeaderTextAlign="Center" TextAlign="Center">
-                    </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="100000" />
-                    </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" IsModal="true" Width="1200px" Height="620px">
-    </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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急演练" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="DrillRecordListId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="DrillRecordListId" AllowSorting="true"
+                            SortField="DrillRecordCode" 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 runat="server" Label="编号" ID="txtDrillRecordCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
+                                        </f:DropDownList>
+                                        <f:TextBox runat="server" Label="演练名称" ID="txtDrillRecordName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="100px" ColumnID="DrillRecordCode" DataField="DrillRecordCode"
+                                    SortField="DrillRecordCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="160px" ColumnID="DrillRecordName" DataField="DrillRecordName"
+                                    SortField="DrillRecordName" FieldType="String" HeaderText="演练名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="DrillRecordTypeName" DataField="DrillRecordTypeName"
+                                    SortField="DrillRecordTypeName" FieldType="String" HeaderText="演练类型" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="UnitNames" DataField="UnitNames" ExpandUnusedSpace="true"
+                                    SortField="UnitNames" FieldType="String" HeaderText="参与单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="JointPersonNum" DataField="JointPersonNum" SortField="JointPersonNum"
+                                    FieldType="String" HeaderText="参演人数" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="DrillCost" DataField="DrillCost"
+                                    SortField="DrillCost" FieldType="Float" HeaderText="直接投入" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="DrillRecordDate" DataField="DrillRecordDate"
+                                    SortField="DrillRecordDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="演练日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </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="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="应急演练" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1200px" Height="620px">
+        </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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs
index a8645aa..969f5c7 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs
@@ -38,18 +38,20 @@ namespace FineUIPro.Web.HSSE.Emergency
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
                 {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
                 this.btnNew.OnClientClick = Window1.GetShowReference("DrillRecordListEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
@@ -61,11 +63,41 @@ namespace FineUIPro.Web.HSSE.Emergency
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT DrillRecordList.DrillRecordListId,DrillRecordList.ProjectId,DrillRecordType.ConstText AS DrillRecordTypeName,DrillRecordList.JointPersonNum,DrillRecordList.DrillCost,CodeRecords.Code AS DrillRecordCode,DrillRecordList.DrillRecordName,DrillRecordList.DrillRecordDate,DrillRecordList.CompileMan,Users.UserName AS CompileManName,DrillRecordList.UnitIds,DrillRecordList.UnitNames,DrillRecordList.UserNames,DrillRecordList.States "
                           + @" ,(CASE WHEN DrillRecordList.States = " + BLL.Const.State_0 + " OR DrillRecordList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN DrillRecordList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" FROM Emergency_DrillRecordList AS DrillRecordList  "
@@ -84,7 +116,7 @@ namespace FineUIPro.Web.HSSE.Emergency
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
 
             if (!string.IsNullOrEmpty(this.txtDrillRecordCode.Text.Trim()))
@@ -92,7 +124,7 @@ namespace FineUIPro.Web.HSSE.Emergency
                 strSql += " AND DrillRecordCode LIKE @DrillRecordCode";
                 listStr.Add(new SqlParameter("@DrillRecordCode", "%" + this.txtDrillRecordCode.Text.Trim() + "%"));
             }
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND DrillRecordList.UnitIds LIKE @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", "%" + this.drpUnitId.SelectedValue.Trim() + "%"));
@@ -226,7 +258,7 @@ namespace FineUIPro.Web.HSSE.Emergency
                         BLL.DrillRecordListService.DeleteDrillRecordListById(rowID);
                     }
                 }
-                // Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.EmergencyManagement);
+                // Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.EmergencyManagement);
                 this.BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
@@ -301,7 +333,7 @@ namespace FineUIPro.Web.HSSE.Emergency
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectDrillRecordListMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectDrillRecordListMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.designer.cs
index fcf3234..454c76a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Emergency {
-    
-    
-    public partial class DrillRecordList {
-        
+namespace FineUIPro.Web.HSSE.Emergency
+{
+
+
+    public partial class DrillRecordList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtDrillRecordCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtDrillRecordCode;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// txtDrillRecordName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtDrillRecordName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx
index 8e1fe29..08b2bf5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EmergencyList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Emergency.EmergencyList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html>
 <head runat="server">
@@ -8,109 +10,123 @@
 </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="EmergencyListId" ForceFit="true"
-                DataIDField="EmergencyListId" AllowSorting="true" SortField="EmergencyCode" SortDirection="DESC"                 
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnSort="Grid1_Sort" 
-                AllowPaging="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtEmergencyCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="250px">
-                            </f:DropDownList>
-                            <f:TextBox runat="server" Label="文件名称" ID="txtEmergencyName" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>                    
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="100px" ColumnID="EmergencyCode" DataField="EmergencyCode"
-                        SortField="EmergencyCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>    
-                    <f:RenderField Width="200px" ColumnID="EmergencyName" DataField="EmergencyName"
-                        SortField="EmergencyName" FieldType="String" HeaderText="文件名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>  
-                    <f:RenderField Width="100px" ColumnID="EmergencyTypeName" DataField="EmergencyTypeName"
-                        SortField="EmergencyTypeName" FieldType="String" HeaderText="预案类型" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="75px" ColumnID="VersionCode" DataField="VersionCode" 
-                        SortField="VersionCode" FieldType="String" HeaderText="版次" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="整理日期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>                    
-             <%--        <f:RenderField Width="90px" ColumnID="AuditMan" DataField="AuditMan"
-                        SortField="AuditMan" FieldType="String" HeaderText="审核人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>                    
-                     <f:RenderField Width="90px" ColumnID="ApproveMan" DataField="ApproveMan"
-                        SortField="ApproveMan" 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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="应急预案管理清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px" Height="600px">
-    </f:Window>    
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急预案管理清单" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="EmergencyListId" ForceFit="true"
+                            DataIDField="EmergencyListId" AllowSorting="true" SortField="EmergencyCode" SortDirection="DESC"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnSort="Grid1_Sort"
+                            AllowPaging="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="编号" ID="txtEmergencyCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
+                                        </f:DropDownList>
+                                        <f:TextBox runat="server" Label="文件名称" ID="txtEmergencyName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="90px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="100px" ColumnID="EmergencyCode" DataField="EmergencyCode"
+                                    SortField="EmergencyCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="EmergencyName" DataField="EmergencyName"
+                                    SortField="EmergencyName" FieldType="String" HeaderText="文件名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EmergencyTypeName" DataField="EmergencyTypeName"
+                                    SortField="EmergencyTypeName" FieldType="String" HeaderText="预案类型" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="75px" ColumnID="VersionCode" DataField="VersionCode"
+                                    SortField="VersionCode" FieldType="String" HeaderText="版次" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="整理日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--        <f:RenderField Width="90px" ColumnID="AuditMan" DataField="AuditMan"
+            SortField="AuditMan" FieldType="String" HeaderText="审核人" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>                    
+         <f:RenderField Width="90px" ColumnID="ApproveMan" DataField="ApproveMan"
+            SortField="ApproveMan" 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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="应急预案管理清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px" Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.cs
index cd28ac0..19497cd 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.cs
@@ -42,12 +42,8 @@ namespace FineUIPro.Web.HSSE.Emergency
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
+                this.InitDropDownList();
+
                 this.btnNew.OnClientClick = Window1.GetShowReference("EmergencyListEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -55,14 +51,44 @@ namespace FineUIPro.Web.HSSE.Emergency
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
-                this.BindGrid();                
+                this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT EmergencyList.EmergencyListId,EmergencyList.ProjectId,CodeRecords.Code AS EmergencyCode,EmergencyList.UnitId,EmergencyList.EmergencyName,EmergencyList.CompileDate,EmergencyList.CompileMan,Users.UserName AS CompileManName,EmergencyType.EmergencyTypeName,EmergencyList.VersionCode,Unit.UnitName,EmergencyList.States,AuditMan.UserName AS AuditMan,ApproveMan.UserName AS ApproveMan "
                           + @" ,(CASE WHEN EmergencyList.States = " + BLL.Const.State_0 + " OR EmergencyList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN EmergencyList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" FROM Emergency_EmergencyList AS EmergencyList "
@@ -80,19 +106,19 @@ namespace FineUIPro.Web.HSSE.Emergency
             {
                 listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
                 strSql += " AND EmergencyList.States = @States";  ///状态为已完成
-                listStr.Add(new SqlParameter("@States", BLL.Const.State_2)); 
+                listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
-           
+
             if (!string.IsNullOrEmpty(this.txtEmergencyCode.Text.Trim()))
             {
                 strSql += " AND EmergencyCode LIKE @EmergencyCode";
                 listStr.Add(new SqlParameter("@EmergencyCode", "%" + this.txtEmergencyCode.Text.Trim() + "%"));
             }
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND EmergencyList.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -104,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Emergency
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            Grid1.RecordCount = tb.Rows.Count;            
+            Grid1.RecordCount = tb.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -193,13 +219,13 @@ namespace FineUIPro.Web.HSSE.Emergency
             {
                 if (this.btnMenuEdit.Hidden)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
                 {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EmergencyListView.aspx?EmergencyListId={0}", id, "查看 - ")));                    
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EmergencyListView.aspx?EmergencyListId={0}", id, "查看 - ")));
                 }
                 else
                 {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EmergencyListEdit.aspx?EmergencyListId={0}", id, "编辑 - ")));
                 }
-            }            
+            }
         }
         #endregion
 
@@ -212,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Emergency
         protected void btnMenuDelete_Click(object sender, EventArgs e)
         {
             if (Grid1.SelectedRowIndexArray.Length > 0)
-            {               
+            {
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
@@ -224,13 +250,13 @@ namespace FineUIPro.Web.HSSE.Emergency
                         BLL.EmergencyListService.DeleteEmergencyListById(rowID);
                     }
                 }
-                //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.EmergencyManagement);
+                //Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.EmergencyManagement);
                 this.BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
-        }       
+        }
         #endregion
-       
+
         #region 获取按钮权限
         /// <summary>
         /// 获取按钮权限
@@ -243,7 +269,7 @@ namespace FineUIPro.Web.HSSE.Emergency
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectEmergencyListMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectEmergencyListMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.designer.cs
index e0b42a3..31810d3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Emergency {
-    
-    
-    public partial class EmergencyList {
-        
+namespace FineUIPro.Web.HSSE.Emergency
+{
+
+
+    public partial class EmergencyList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtEmergencyCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEmergencyCode;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// txtEmergencyName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEmergencyName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Emergency {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx
index a901133..7b4a83f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EmergencySupply.aspx.cs" Inherits="FineUIPro.Web.HSSE.Emergency.EmergencySupply" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html>
 <head id="Head1" runat="server">
@@ -9,92 +11,106 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急资源" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="FileId" DataIDField="FileId" AllowSorting="true"
-                    SortField="FileCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="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 runat="server" Label="编号" ID="txtFileCode" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="名称" ID="txtFileName" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急资源" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="FileId" DataIDField="FileId" AllowSorting="true"
+                            SortField="FileCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="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 runat="server" Label="编号" ID="txtFileCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtFileName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpCategory" runat="server" Label="类别" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                            <f:ListItem Text="- 请选择 -" Value="" />
+                                            <f:ListItem Text="内部资源" Value="内部资源" />
+                                            <f:ListItem Text="外部资源" Value="外部资源" />
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="100px" ColumnID="FileCode" DataField="FileCode"
+                                    SortField="FileCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="FileName" DataField="FileName"
+                                    SortField="FileName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Category" DataField="Category"
+                                    SortField="Category" FieldType="String" HeaderText="类别" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--   <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看" 
+         DataIFrameUrlFields="FileId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/EmergencySupplyAttachUrl&menuId=C5354813-7B1E-4155-8EE8-D349BF2F18F4"
+         HeaderTextAlign="Center" >
+      </f:WindowField>--%>
+                            </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:DropDownList>
-                                <f:DropDownList ID="drpCategory" runat="server" Label="类别" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                    <f:ListItem Text="- 请选择 -" Value="" />
-                                    <f:ListItem Text="内部资源" Value="内部资源" />
-                                    <f:ListItem Text="外部资源" Value="外部资源" />
-                                </f:DropDownList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    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="100px" ColumnID="FileCode" DataField="FileCode"
-                            SortField="FileCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="FileName" DataField="FileName"
-                            SortField="FileName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="Category" DataField="Category"
-                            SortField="Category" FieldType="String" HeaderText="类别" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                            SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
-                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <%--   <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看" 
-                        DataIFrameUrlFields="FileId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/EmergencySupplyAttachUrl&menuId=C5354813-7B1E-4155-8EE8-D349BF2F18F4"
-                        HeaderTextAlign="Center" >
-                     </f:WindowField>--%>
-                    </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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="应急资源" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.cs
index 3def88e..a5eba02 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.cs
@@ -44,12 +44,7 @@ namespace FineUIPro.Web.HSSE.Emergency
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
+                this.InitDropDownList();
                 this.btnNew.OnClientClick = Window1.GetShowReference("EmergencySupplyEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -60,6 +55,32 @@ namespace FineUIPro.Web.HSSE.Emergency
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         #endregion
 
         #region GV绑定数据
@@ -68,6 +89,10 @@ namespace FineUIPro.Web.HSSE.Emergency
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT EmergencySupply.FileId,EmergencySupply.ProjectId,CodeRecords.Code AS FileCode,EmergencySupply.UnitId,EmergencySupply.FileName,EmergencySupply.Category,CompileManUser.UserName AS CompileManName,EmergencySupply.CompileDate,EmergencySupply.States,Unit.UnitName "
                           + @" ,(CASE WHEN EmergencySupply.States = " + BLL.Const.State_0 + " OR EmergencySupply.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN EmergencySupply.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" FROM Emergency_EmergencySupply AS EmergencySupply"
@@ -86,7 +111,7 @@ namespace FineUIPro.Web.HSSE.Emergency
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
 
             if (!string.IsNullOrEmpty(this.txtFileCode.Text.Trim()))
@@ -99,7 +124,7 @@ namespace FineUIPro.Web.HSSE.Emergency
                 strSql += " AND EmergencySupply.FileName LIKE @FileName";
                 listStr.Add(new SqlParameter("@FileName", "%" + this.txtFileName.Text.Trim() + "%"));
             }
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND EmergencySupply.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -249,7 +274,7 @@ namespace FineUIPro.Web.HSSE.Emergency
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectEmergencySupplyMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectEmergencySupplyMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.designer.cs
index ec716bf..8467e9a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencySupply.aspx.designer.cs
@@ -50,6 +50,42 @@ namespace FineUIPro.Web.HSSE.Emergency
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyTeamAndTrain.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyTeamAndTrain.aspx.cs
index 4940a20..fc4a48d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyTeamAndTrain.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Emergency/EmergencyTeamAndTrain.aspx.cs
@@ -141,7 +141,7 @@ namespace FineUIPro.Web.HSSE.Emergency
         {
             if (!string.IsNullOrEmpty(trSafetyOrganization.SelectedNodeID))
             {
-                var model = EmergencyOrganizationService.GetmodelByPojectIdandUnitId(this.CurrUser.LoginProjectId, trSafetyOrganization.SelectedNodeID);
+                var model = EmergencyOrganizationService.GetmodelByPojectIdandUnitId(this.ProjectId, trSafetyOrganization.SelectedNodeID);
                 if (model != null)
                 {
                     EmergencyOrganizationService.DeleteEmergency_EmergencyOrganizationById(model.EmergencyOrganizationId);
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx b/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx
index 80e2337..5111ecf 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx
@@ -1,7 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnforcementRecordFile.aspx.cs" Inherits="FineUIPro.Web.HSSE.FinalFileManage.EnforcementRecordFile" %>
 
 <%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
-
+ 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -17,138 +17,135 @@
 </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">
+ <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+ <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+     <Items>
+         <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+             EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+             ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+             <Items>
+                 <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                     BodyPadding="0px">
+                     <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                 </f:ContentPanel>
+             </Items>
+         </f:Panel>
+         <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+             Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle"  AutoScroll="true">
+             <Items><f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="已定稿文件" EnableCollapse="true"
+    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="Id"
+    AllowCellEditing="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
+    SortField="FileCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnPreDataBound="Grid1_PreDataBound">
+    <Toolbars>
+        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="已定稿文件" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="Id"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
-                    SortField="FileCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnPreDataBound="Grid1_PreDataBound">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpProjectId" runat="server" Label="项目" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px" EnableEdit="true">
-                                </f:DropDownList>
-                                <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px" EnableEdit="true" >
-                                </f:DropDownList>
+               <%-- <f:DropDownList ID="drpProjectId" runat="server" Label="项目" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px" EnableEdit="true">
+                </f:DropDownList>--%>
+                <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px" EnableEdit="true" >
+                </f:DropDownList>
 
 
-                                <f:TextBox runat="server" Label="文档编号" ID="txtFileCode" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="记录仪使用人" ID="txtReponseManName" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="100px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:DatePicker ID="txtStartTime" runat="server" Label="记录开始时间" LabelAlign="Right"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="120px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
-                                    Width="130px">
-                                </f:DatePicker>
-                                <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" Text="导出"
-                     EnableAjax="false" DisableControlBeforePostBack="false">
-                 </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                            TextAlign="Center" />
-                        <f:RenderField Width="100px" ColumnID="ProjectName" DataField="ProjectName"
-                            SortField="ProjectName" FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="FileCode" DataField="FileCode"
-                            SortField="FileCode" FieldType="String" HeaderText="文档编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                            SortField="CompileManName" FieldType="String" HeaderText="上传人员" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
-                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="上传时间" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="ReponseManName" DataField="ReponseManName"
-                            SortField="ReponseManName" FieldType="String" HeaderText="记录仪使用人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="RecordDate" DataField="RecordDate"
-                            SortField="RecordDate" FieldType="String" HeaderText="记录时间段" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="RecordStartDate" DataField="RecordStartDate"
-                                    SortField="RecordStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                                    HeaderText="记录开始时间" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="RecordEndDate" DataField="RecordEndDate"
-                                    SortField="RecordEndDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                                    HeaderText="记录结束时间" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>--%>
-                        <f:TemplateField ColumnID="tfFileContent" Width="90px" HeaderText="主要开展的工作" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="lbFileContent" runat="server" Text='<%# HttpUtility.HtmlDecode(Eval("FileContent").ToString()) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" Text="附件" ToolTip="附件上传查看"  HeaderText="上传视频"
-                            DataIFrameUrlFields="Id" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/EnforcementRecordFile&menuId=684CD399-753E-48A1-981A-E465E0ACE9B0"
-                            HeaderTextAlign="Center">
-                        </f:WindowField>
-                    </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="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:TextBox runat="server" Label="文档编号" ID="txtFileCode" EmptyText="输入查询条件"
+                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                    LabelAlign="right">
+                </f:TextBox>
+                <f:TextBox runat="server" Label="记录仪使用人" ID="txtReponseManName" EmptyText="输入查询条件"
+                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="110px"
+                    LabelAlign="right">
+                </f:TextBox>
+                <f:DatePicker ID="txtStartTime" runat="server" Label="记录开始时间" LabelAlign="Right"
+                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="120px">
+                </f:DatePicker>
+                <f:Label ID="Label1" runat="server" Text="至">
+                </f:Label>
+                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                    Width="130px">
+                </f:DatePicker>
+                <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" Text="导出"
+     EnableAjax="false" DisableControlBeforePostBack="false">
+ </f:Button>
             </Items>
+        </f:Toolbar>
+    </Toolbars>
+    <Columns>
+        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+            TextAlign="Center" />
+        <f:RenderField Width="100px" ColumnID="ProjectName" DataField="ProjectName"
+            SortField="ProjectName" FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>
+        <f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
+            SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>
+        <f:RenderField Width="100px" ColumnID="FileCode" DataField="FileCode"
+            SortField="FileCode" FieldType="String" HeaderText="文档编号" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>
+        <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+            SortField="CompileManName" FieldType="String" HeaderText="上传人员" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>
+        <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
+            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+            HeaderText="上传时间" HeaderTextAlign="Center" TextAlign="Center">
+        </f:RenderField>
+        <f:RenderField Width="90px" ColumnID="ReponseManName" DataField="ReponseManName"
+            SortField="ReponseManName" FieldType="String" HeaderText="记录仪使用人" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>
+        <f:RenderField Width="90px" ColumnID="RecordDate" DataField="RecordDate"
+            SortField="RecordDate" FieldType="String" HeaderText="记录时间段" HeaderTextAlign="Center"
+            TextAlign="Left">
+        </f:RenderField>
+        <%--<f:RenderField Width="100px" ColumnID="RecordStartDate" DataField="RecordStartDate"
+                    SortField="RecordStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                    HeaderText="记录开始时间" HeaderTextAlign="Center" TextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="100px" ColumnID="RecordEndDate" DataField="RecordEndDate"
+                    SortField="RecordEndDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                    HeaderText="记录结束时间" HeaderTextAlign="Center" TextAlign="Center">
+                </f:RenderField>--%>
+        <f:TemplateField ColumnID="tfFileContent" Width="90px" HeaderText="主要开展的工作" HeaderTextAlign="Center"
+            TextAlign="Left">
+            <ItemTemplate>
+                <asp:Label ID="lbFileContent" runat="server" Text='<%# HttpUtility.HtmlDecode(Eval("FileContent").ToString()) %>'></asp:Label>
+            </ItemTemplate>
+        </f:TemplateField>
+        <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" Text="附件" ToolTip="附件上传查看"  HeaderText="上传视频"
+            DataIFrameUrlFields="Id" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/EnforcementRecordFile&menuId=684CD399-753E-48A1-981A-E465E0ACE9B0"
+            HeaderTextAlign="Center">
+        </f:WindowField>
+    </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="100000" />
+        </f:DropDownList>
+    </PageItems>
+</f:Grid>
+			 </Items>
         </f:Panel>
-
-        <%--        <f:Panel ID="Panel2" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
-            <Items>
-                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
-                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
-                    <Items>
-                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
-                            BodyPadding="0px">
-                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
-                        </f:ContentPanel>
-                    </Items>
-                </f:Panel>
-
-            </Items>
-        </f:Panel>--%>
+    </Items>
+</f:Panel>
         <f:Window ID="Window1" Title="已定稿文件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" Height="620px">
         </f:Window>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.cs
index 607fd24..ab4c4c8 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.cs
@@ -54,24 +54,24 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
-                //this.ucTree.UnitId = this.CurrUser.UnitId;
-                //this.ucTree.ProjectId = this.ProjectId;
-                ////权限按钮方法
-                this.GetButtonPower();
-                this.btnNew.OnClientClick = Window1.GetShowReference("EnforcementRecordFileEdit.aspx") + "return false;";
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
-                BLL.ProjectService.InitProjectDropDownList(this.drpProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId))
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
                 {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
+
+                this.btnNew.OnClientClick = Window1.GetShowReference("EnforcementRecordFileEdit.aspx") + "return false;";
+                
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
@@ -79,7 +79,35 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
-                         }
+            }
+        }
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            //BLL.ProjectService.InitProjectDropDownList(this.drpProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+            btnNew.Hidden = true;
+            //}
+            this.GetButtonPower();
+            this.BindGrid();
         }
         #endregion
 
@@ -90,7 +118,7 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
             {
                 Grid1.FindColumn("ProjectName").Hidden = true;
                 Grid1.FindColumn("UnitName").Hidden = true;
-                drpProjectId.Hidden = true;
+                //drpProjectId.Hidden = true;
             }
 
         }
@@ -157,20 +185,25 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
         //        Grid1.DataSource = table;
         //        Grid1.DataBind();
         //    }
-                
+
         //}
 
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             // 获取数据库上下文
             var db = Funs.DB;
 
             // 构建基础查询
             var query = from file in db.FinalFileManage_EnforcementRecordFile
-                        //join operate in db.Sys_FlowOperate.Where(o => o.IsClosed != true) on file.Id equals operate.DataId into operates
-                        //from operate in operates.DefaultIfEmpty()
-                        //join operateUser in db.Sys_User on operate.OperaterId equals operateUser.UserId into operateUsers
-                        //from operateUser in operateUsers.DefaultIfEmpty()
+                            //join operate in db.Sys_FlowOperate.Where(o => o.IsClosed != true) on file.Id equals operate.DataId into operates
+                            //from operate in operates.DefaultIfEmpty()
+                            //join operateUser in db.Sys_User on operate.OperaterId equals operateUser.UserId into operateUsers
+                            //from operateUser in operateUsers.DefaultIfEmpty()
                         join unit in db.Base_Unit on file.UnitId equals unit.UnitId into units
                         from unit in units.DefaultIfEmpty()
                         join compileMan in db.Sys_User on file.CompileMan equals compileMan.UserId into compileMans
@@ -196,27 +229,27 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
                             file.RecordEndDate,
                             file.FileContent,
                             UnitName = unit.UnitName,
-                            ProjectUnitId = project.UnitId, 
+                            ProjectUnitId = project.UnitId,
                         };
 
-   
-            if (!string.IsNullOrEmpty(ProjectId) && ProjectId != Const._Null)
-            {
-                query = query.Where(e => e.ProjectId == ProjectId);
-            }
-            if (!string.IsNullOrEmpty(drpProjectId.SelectedValue) && drpProjectId.SelectedValue != BLL.Const._Null)
-            {
-                query = query.Where(f => f.ProjectId == drpProjectId.SelectedValue.Trim());
-            }
-            if (!string.IsNullOrEmpty(drpUnitId.SelectedValue) && drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                query = query.Where(f => f.UnitId == drpUnitId.SelectedValue.Trim());
-            }
 
             if (!string.IsNullOrEmpty(Request.Params["projectId"]))
             {
                 query = query.Where(f => f.States == BLL.Const.State_2);
             }
+            if (!string.IsNullOrEmpty(this.ProjectId) && ProjectId != Const._Null)
+            {
+                query = query.Where(e => e.ProjectId == ProjectId);
+            }
+            //if (!string.IsNullOrEmpty(drpProjectId.SelectedValue) && drpProjectId.SelectedValue != BLL.Const._Null)
+            //{
+            //    query = query.Where(f => f.ProjectId == drpProjectId.SelectedValue.Trim());
+            //}
+            if (!string.IsNullOrEmpty(drpUnitId.SelectedValue) && drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                query = query.Where(f => f.UnitId == drpUnitId.SelectedValue.Trim());
+            }
+
 
             if (!string.IsNullOrEmpty(txtFileCode.Text.Trim()))
             {
@@ -258,10 +291,10 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
                     x.RecordEndDate,
                     x.FileContent,
                     x.UnitName,
-                    x.ProjectName, 
+                    x.ProjectName,
                     RecordDate = x.RecordStartDate.Value.ToString("yyyy-MM-dd") + "至" + x.RecordEndDate.Value.ToString("yyyy-MM-dd")
                 }
-                ).OrderByDescending(x=>x.RecordDate);
+                ).OrderByDescending(x => x.RecordDate);
 
             var outressult = result.Select(x => new
             {
@@ -354,7 +387,7 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
         /// </summary>
         private void EditData()
         {
-            if (Grid1.SelectedRowIndexArray.Length == 0) 
+            if (Grid1.SelectedRowIndexArray.Length == 0)
             {
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
@@ -415,11 +448,11 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
                 return;
             }
             string menuId = BLL.Const.ServerEnforcementRecordFileMenuId;
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 menuId = BLL.Const.EnforcementRecordFileMenuId;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, menuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.designer.cs
index 4d1ce18..bd2bb29 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/FinalFileManage/EnforcementRecordFile.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -59,15 +95,6 @@ namespace FineUIPro.Web.HSSE.FinalFileManage
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
 
-        /// <summary>
-        /// drpProjectId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpProjectId;
-
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx
index 8447ac8..f064a1a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccidentCauseReport.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.InformationProject.AccidentCauseReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,97 +12,111 @@
 </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="AccidentCauseReportId" ForceFit="true"
-                DataIDField="AccidentCauseReportId" AllowSorting="true" SortField="AccidentCauseReportCode" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                            <f:DropDownList ID="drpMonth" runat="server" Label="月度" LabelAlign="Right" Width="250px"
-                                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" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="150px" ColumnID="AccidentCauseReportCode" DataField="AccidentCauseReportCode"
-                        SortField="AccidentCauseReportCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="YearAndMonth" DataField="YearAndMonth" 
-                        SortField="YearAndMonth" FieldType="String" HeaderText="月报时间" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:TemplateField HeaderText="打印" Width="80px">
-                        <ItemTemplate>
-                            <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="职工伤亡事故原因分析报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
-        Height="600px">
-    </f:Window>
-    <f:Window ID="Window2" Title="打印职工伤亡事故原因分析" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
-        Height="600px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="职工伤亡事故原因分析报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="AccidentCauseReportId" ForceFit="true"
+                            DataIDField="AccidentCauseReportId" AllowSorting="true" SortField="AccidentCauseReportCode" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpMonth" runat="server" Label="月度" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="150px" ColumnID="AccidentCauseReportCode" DataField="AccidentCauseReportCode"
+                                    SortField="AccidentCauseReportCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="YearAndMonth" DataField="YearAndMonth"
+                                    SortField="YearAndMonth" FieldType="String" HeaderText="月报时间" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField HeaderText="打印" Width="80px">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="职工伤亡事故原因分析报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
+            Height="600px">
+        </f:Window>
+        <f:Window ID="Window2" Title="打印职工伤亡事故原因分析" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
+            Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.cs
index eff8872..65503e4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.cs
@@ -42,9 +42,16 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();                
-               
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, BLL.ConstValue.Group_0009, true);
                 this.btnNew.OnClientClick = Window1.GetShowReference("AccidentCauseReportEdit.aspx") + "return false;";
@@ -58,10 +65,30 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT AccidentCauseReport.AccidentCauseReportId, "
                           + @"AccidentCauseReport.ProjectId,"
                           + @"CodeRecords.Code AS AccidentCauseReportCode,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.designer.cs
index 0ea37bd..ed0a382 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class AccidentCauseReport {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class AccidentCauseReport
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpMonth 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpMonth;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx
index c88ab14..bec0402 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DrillConductedQuarterlyReport.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.DrillConductedQuarterlyReport" ValidateRequest="false" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,91 +12,105 @@
 </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="DrillConductedQuarterlyReportId"
-                DataIDField="DrillConductedQuarterlyReportId" AllowSorting="true" ForceFit="true"
-                SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                            <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
-                                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" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="YearAndQuarters" DataField="YearAndQuarters" 
-                        SortField="YearAndQuarters" FieldType="String" HeaderText="季报时间" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="110px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>                    
-                    <f:TemplateField HeaderText="打印" Width="80px">
-                        <ItemTemplate>
-                            <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="应急演练开展情况季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px" Height="560px">
-    </f:Window>
-    <f:Window ID="Window2" Title="打印应急演练开展情况季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px" Height="560px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急演练开展情况季报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="DrillConductedQuarterlyReportId"
+                            DataIDField="DrillConductedQuarterlyReportId" AllowSorting="true" ForceFit="true"
+                            SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="YearAndQuarters" DataField="YearAndQuarters"
+                                    SortField="YearAndQuarters" FieldType="String" HeaderText="季报时间" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField HeaderText="打印" Width="80px">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="应急演练开展情况季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px" Height="560px">
+        </f:Window>
+        <f:Window ID="Window2" Title="打印应急演练开展情况季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px" Height="560px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.cs
index 4e86f4d..e9b0851 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.cs
@@ -42,9 +42,16 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
-                
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, BLL.ConstValue.Group_0011, true);
                 this.btnNew.OnClientClick = Window1.GetShowReference("DrillConductedQuarterlyReportEdit.aspx") + "return false;";
@@ -58,10 +65,30 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT DrillConductedQuarterlyReport.DrillConductedQuarterlyReportId, "
                           + @"DrillConductedQuarterlyReport.ProjectId,"
                           + @"DrillConductedQuarterlyReport.UnitId,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.designer.cs
index 002fbc3..1834e02 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class DrillConductedQuarterlyReport {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class DrillConductedQuarterlyReport
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpQuarters 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQuarters;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx
index e37256f..cc90041 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DrillPlanHalfYearReport.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.InformationProject.DrillPlanHalfYearReport" ValidateRequest="false" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,97 +12,111 @@
 </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="DrillPlanHalfYearReportId" ForceFit="true"                 
-                DataIDField="DrillPlanHalfYearReportId" AllowSorting="true" SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                            <f:DropDownList ID="drpQuarters" runat="server" Label="半年" LabelAlign="Right" Width="250px"
-                                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" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="YearAndHalfYear" DataField="YearAndHalfYear"
-                        ExpandUnusedSpace="true" SortField="YearAndHalfYear" FieldType="String" HeaderText="半年报时间"
-                        HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone" 
-                        SortField="Telephone" FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="CompileMan" DataField="CompileMan"
-                        SortField="CompileMan" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:TemplateField HeaderText="打印" Width="80px">
-                        <ItemTemplate>
-                            <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="应急演练工作计划半年报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="560px">
-    </f:Window>
-    <f:Window ID="Window2" Title="打印应急演练工作计划半年报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="560px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急演练工作计划半年报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="DrillPlanHalfYearReportId" ForceFit="true"
+                            DataIDField="DrillPlanHalfYearReportId" AllowSorting="true" SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarters" runat="server" Label="半年" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="YearAndHalfYear" DataField="YearAndHalfYear"
+                                    ExpandUnusedSpace="true" SortField="YearAndHalfYear" FieldType="String" HeaderText="半年报时间"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone"
+                                    SortField="Telephone" FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileMan" DataField="CompileMan"
+                                    SortField="CompileMan" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField HeaderText="打印" Width="80px">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="应急演练工作计划半年报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            Height="560px">
+        </f:Window>
+        <f:Window ID="Window2" Title="打印应急演练工作计划半年报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            Height="560px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.cs
index c8be3af..481e03e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.cs
@@ -42,8 +42,15 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, BLL.ConstValue.Group_0010, true);
 
@@ -58,10 +65,30 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT DrillPlanHalfYearReport.DrillPlanHalfYearReportId, "
                           + @"DrillPlanHalfYearReport.ProjectId,"
                           + @"DrillPlanHalfYearReport.UnitId,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.designer.cs
index a33b7c6..d7aefab 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class DrillPlanHalfYearReport {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class DrillPlanHalfYearReport
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpQuarters 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQuarters;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx
index 5e7590f..41f0a33 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EPSummaryReport.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.EPSummaryReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -11,81 +13,95 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="生态环保工作总结报告" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="EPSummaryReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="EPSummaryReportId"
-                    AllowSorting="true" SortField="ReportDate" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="生态环保工作总结报告" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="EPSummaryReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="EPSummaryReportId"
+                            AllowSorting="true" SortField="ReportDate" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="YearStr" DataField="YearStr"
+                                    SortField="YearStr" FieldType="String" HeaderText="年份" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="QuarterStr" DataField="QuarterStr"
+                                    SortField="QuarterStr" FieldType="String" HeaderText="季度" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="ResponsiblePerson" DataField="ResponsiblePerson"
+                                    SortField="ResponsiblePerson" FieldType="String" HeaderText="负责人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ResponsiblePersonTel" DataField="ResponsiblePersonTel"
+                                    SortField="ResponsiblePersonTel" FieldType="String" HeaderText="负责人电话" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ContactPerson" DataField="ContactPerson"
+                                    SortField="ContactPerson" FieldType="String" HeaderText="联系人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ContactPersonTel" DataField="ContactPersonTel"
+                                    SortField="ContactPersonTel" FieldType="String" HeaderText="联系人电话" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ReportDate" DataField="ReportDate"
+                                    SortField="ReportDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="报告时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </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:DropDownList>
-                                <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
-                                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" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                            TextAlign="Center" />
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                            TextAlign="Left" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="YearStr" DataField="YearStr"
-                            SortField="YearStr" FieldType="String" HeaderText="年份" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="QuarterStr" DataField="QuarterStr"
-                            SortField="QuarterStr" FieldType="String" HeaderText="季度" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="ResponsiblePerson" DataField="ResponsiblePerson"
-                            SortField="ResponsiblePerson" FieldType="String" HeaderText="负责人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ResponsiblePersonTel" DataField="ResponsiblePersonTel"
-                            SortField="ResponsiblePersonTel" FieldType="String" HeaderText="负责人电话" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ContactPerson" DataField="ContactPerson"
-                            SortField="ContactPerson" FieldType="String" HeaderText="联系人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ContactPersonTel" DataField="ContactPersonTel"
-                            SortField="ContactPersonTel" FieldType="String" HeaderText="联系人电话" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ReportDate" DataField="ReportDate"
-                            SortField="ReportDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="报告时间" HeaderTextAlign="Center" TextAlign="Center">
-                        </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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑生态环保工作总结报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.cs
index a768f8f..6969e23 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.cs
@@ -44,9 +44,14 @@ namespace FineUIPro.Web.HSSE.InformationProject
                     this.ProjectId = Request.Params["projectId"];
                 }
 
-                ////权限按钮方法
-                this.GetButtonPower();
-
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, BLL.ConstValue.Group_0011, true);
                 this.btnNew.OnClientClick = Window1.GetShowReference("EPSummaryReportEdit.aspx") + "return false;";
@@ -59,11 +64,33 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 this.BindGrid();
             }
         }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT report.EPSummaryReportId,"
                           + @"report.ProjectId,"
                           + @"report.UnitId,"
@@ -254,4 +281,4 @@ namespace FineUIPro.Web.HSSE.InformationProject
         }
         #endregion
     }
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.designer.cs
index afd22b0..94c79cd 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class EPSummaryReport {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class EPSummaryReport
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpQuarters 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQuarters;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
index 7eefa8b..e495c86 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MillionsMonthlyReport.aspx.cs"
     Inherits="FineUIPro.Web.InformationProject.MillionsMonthlyReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -10,213 +12,227 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业安全数据统计月报" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MillionsMonthlyReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="MillionsMonthlyReportId"
-                    AllowSorting="true" SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:DropDownList>
-                                <f:DropDownList ID="drpMonth" runat="server" Label="月度" LabelAlign="Right" Width="250px"
-                                    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" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="40px" HeaderTextAlign="Center"
-                            TextAlign="Center" />
-                        <f:RenderField Width="100px" ColumnID="YearAndMonth" DataField="YearAndMonth" SortField="YearAndMonth"
-                            FieldType="String" HeaderText="月报日期" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <%-- <f:RenderField Width="150px" ColumnID="Affiliation" DataField="Affiliation" SortField="Affiliation"
-                        FieldType="String" HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="Name" DataField="Name" SortField="Name" FieldType="String"
-                        HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>--%>
-                        <f:GroupField EnableLock="true" HeaderText="员工总数" TextAlign="Center">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业安全数据统计月报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MillionsMonthlyReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="MillionsMonthlyReportId"
+                            AllowSorting="true" SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpMonth" runat="server" Label="月度" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
                             <Columns>
-                                <f:RenderField Width="80px" ColumnID="PostPersonNum" DataField="PostPersonNum" FieldType="String"
-                                    HeaderText="在岗员工" HeaderTextAlign="Center" TextAlign="Center">
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="40px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="100px" ColumnID="YearAndMonth" DataField="YearAndMonth" SortField="YearAndMonth"
+                                    FieldType="String" HeaderText="月报日期" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="80px" ColumnID="SnapPersonNum" DataField="SnapPersonNum" FieldType="String"
-                                    HeaderText="临时员工" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="70px" ColumnID="ContractorNum" DataField="ContractorNum" FieldType="String"
-                                    HeaderText="承包商" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="70px" ColumnID="SumPersonNum" DataField="SumPersonNum" FieldType="String"
-                                    HeaderText="合计" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
-                            HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
-                            <Columns>
-                                <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
+                                <%-- <f:RenderField Width="150px" ColumnID="Affiliation" DataField="Affiliation" SortField="Affiliation"
+        FieldType="String" HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
+    </f:RenderField>
+    <f:RenderField Width="150px" ColumnID="Name" DataField="Name" SortField="Name" FieldType="String"
+        HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+    </f:RenderField>--%>
+                                <f:GroupField EnableLock="true" HeaderText="员工总数" TextAlign="Center">
                                     <Columns>
-                                        <f:RenderField Width="70px" ColumnID="DeathAccidentNum" DataField="DeathAccidentNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                        <f:RenderField Width="80px" ColumnID="PostPersonNum" DataField="PostPersonNum" FieldType="String"
+                                            HeaderText="在岗员工" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="DeathAccidentPersonNum" DataField="DeathAccidentPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                        <f:RenderField Width="80px" ColumnID="SnapPersonNum" DataField="SnapPersonNum" FieldType="String"
+                                            HeaderText="临时员工" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="DeathAccidentLossHour" DataField="DeathAccidentLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                        <f:RenderField Width="70px" ColumnID="ContractorNum" DataField="ContractorNum" FieldType="String"
+                                            HeaderText="承包商" HeaderTextAlign="Center" TextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="70px" ColumnID="SumPersonNum" DataField="SumPersonNum" FieldType="String"
+                                            HeaderText="合计" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
                                     </Columns>
                                 </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="重伤事故" TextAlign="Center">
+                                <f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
+                                    HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
                                     <Columns>
-                                        <f:RenderField Width="70px" ColumnID="SeriousInjuriesNum" DataField="SeriousInjuriesNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="SeriousInjuriesPersonNum" DataField="SeriousInjuriesPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="SeriousInjuriesLossHour" DataField="SeriousInjuriesLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="轻伤事故" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="MinorAccidentNum" DataField="MinorAccidentNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="MinorAccidentPersonNum" DataField="MinorAccidentPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="MinorAccidentLossHour" DataField="MinorAccidentLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="DeathAccidentNum" DataField="DeathAccidentNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="DeathAccidentPersonNum" DataField="DeathAccidentPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="DeathAccidentLossHour" DataField="DeathAccidentLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="重伤事故" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="SeriousInjuriesNum" DataField="SeriousInjuriesNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="SeriousInjuriesPersonNum" DataField="SeriousInjuriesPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="SeriousInjuriesLossHour" DataField="SeriousInjuriesLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="轻伤事故" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="MinorAccidentNum" DataField="MinorAccidentNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="MinorAccidentPersonNum" DataField="MinorAccidentPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="MinorAccidentLossHour" DataField="MinorAccidentLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
 
-                                <f:GroupField EnableLock="true" HeaderText="工作受限" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="RestrictedWorkPersonNum" DataField="RestrictedWorkPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="RestrictedWorkLossHour" DataField="RestrictedWorkLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
+                                        <f:GroupField EnableLock="true" HeaderText="工作受限" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="RestrictedWorkPersonNum" DataField="RestrictedWorkPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="RestrictedWorkLossHour" DataField="RestrictedWorkLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="医疗处置" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="MedicalTreatmentPersonNum" DataField="MedicalTreatmentPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="MedicalTreatmentLossHour" DataField="MedicalTreatmentLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
                                     </Columns>
                                 </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="医疗处置" TextAlign="Center">
+                                <f:RenderField Width="80px" ColumnID="LossDayNum" DataField="LossDayNum" FieldType="String"
+                                    HeaderText="损失工日" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:GroupField EnableLock="true" HeaderText="无伤害事故" TextAlign="Center">
                                     <Columns>
-                                        <f:RenderField Width="70px" ColumnID="MedicalTreatmentPersonNum" DataField="MedicalTreatmentPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="MedicalTreatmentLossHour" DataField="MedicalTreatmentLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
+                                        <f:GroupField EnableLock="true" HeaderText="火灾" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="FireNum" DataField="FireNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="环保" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="EnvironmenNum" DataField="EnvironmenNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="交通" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="TrafficNum" DataField="TrafficNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="机械设备" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="80px" ColumnID="EquipmentNum" DataField="EquipmentNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="质量" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="QualityNum" DataField="QualityNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="其它" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="70px" ColumnID="OtherNum" DataField="OtherNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="急救包扎" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="80px" ColumnID="FirstAidDressingsNum" DataField="FirstAidDressingsNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="未遂事件" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="80px" ColumnID="AttemptedEventNum" DataField="AttemptedEventNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
                                     </Columns>
                                 </f:GroupField>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField HeaderText="打印" Width="80px">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
                             </Columns>
-                        </f:GroupField>
-                        <f:RenderField Width="80px" ColumnID="LossDayNum" DataField="LossDayNum" FieldType="String"
-                            HeaderText="损失工日" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:GroupField EnableLock="true" HeaderText="无伤害事故" TextAlign="Center">
-                            <Columns>
-                                <f:GroupField EnableLock="true" HeaderText="火灾" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="FireNum" DataField="FireNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="环保" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="EnvironmenNum" DataField="EnvironmenNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="交通" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="TrafficNum" DataField="TrafficNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="机械设备" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="EquipmentNum" DataField="EquipmentNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="质量" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="QualityNum" DataField="QualityNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="其它" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="OtherNum" DataField="OtherNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="急救包扎" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="FirstAidDressingsNum" DataField="FirstAidDressingsNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="未遂事件" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="AttemptedEventNum" DataField="AttemptedEventNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                            SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField HeaderText="打印" Width="80px">
-                            <ItemTemplate>
-                                <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            <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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑企业安全数据统计月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs
index 167b574..e9d19d5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs
@@ -43,8 +43,14 @@ namespace FineUIPro.Web.InformationProject
                     this.ProjectId = Request.Params["projectId"];
                 }
 
-                ////权限按钮方法
-                this.GetButtonPower();    
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, BLL.ConstValue.Group_0009, true);
@@ -59,11 +65,34 @@ namespace FineUIPro.Web.InformationProject
                 this.BindGrid();
             }
         }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT MillionsMonthlyReport.MillionsMonthlyReportId,"
                           + @"MillionsMonthlyReport.ProjectId,"
                           + @"MillionsMonthlyReport.Year,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.designer.cs
index 6bcb4a6..6a2f765 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.InformationProject {
-    
-    
-    public partial class MillionsMonthlyReport {
-        
+namespace FineUIPro.Web.InformationProject
+{
+
+
+    public partial class MillionsMonthlyReport
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpMonth 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpMonth;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx
index d027be3..51c98fb 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Notice.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.Notice" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -17,151 +19,165 @@
 <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="Fit" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:TabStrip ID="TabStrip2" CssClass="f-tabstrip-theme-simple" ShowBorder="true" TabPosition="Top"
-                    MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
-                    <Tabs>
-                        <f:Tab ID="TabCode" Title="发出通知" BodyPadding="5px" Layout="Fit" runat="server">
-                            <Items>
-                                <f:Grid ID="SGrid" ShowBorder="true" ShowHeader="false" Title="发出通知" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="SNoticeId" AllowCellEditing="true"
-                                    ClicksToEdit="2" DataIDField="SNoticeId" AllowSorting="true" SortField="NoticeCode"
-                                    SortDirection="DESC" OnSort="SGrid_Sort" AllowPaging="true" IsDatabasePaging="true"
-                                    PageSize="10" OnPageIndexChange="SGrid_PageIndexChange" EnableRowDoubleClickEvent="true"
-                                    OnRowDoubleClick="SGrid_RowDoubleClick" EnableTextSelection="True">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                                            <Items>
-                                                <f:TextBox runat="server" Label="编号" ID="txtNoticeCode" EmptyText="输入查询条件" Width="250px" LabelWidth="60px" LabelAlign="right">
-                                                </f:TextBox>
-                                                <f:TextBox runat="server" Label="名称" ID="txtNoticeTitle" EmptyText="输入查询条件" Width="250px" LabelWidth="60px" LabelAlign="right">
-                                                </f:TextBox>
-                                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                                </f:ToolbarFill>
-                                                <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
-                                                    EnablePostBack="true" OnClick="STextBox_TextChanged" runat="server" Text="查询">
-                                                </f:Button>
-                                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                                    runat="server">
-                                                </f:Button>
-                                                <f:Button ID="btnOutS" OnClick="btnOutS_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                                </f:Button>
-                                            </Items>
-                                        </f:Toolbar>
-                                    </Toolbars>
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="NoticeCode" DataField="NoticeCode" SortField="NoticeCode"
-                                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="230px" ColumnID="NoticeTitle" DataField="NoticeTitle" SortField="NoticeTitle"
-                                            FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:TemplateField Width="200px" HeaderText="接收对象" ColumnID="AccessProjectText" HeaderTextAlign="Center"
-                                            TextAlign="Left" ExpandUnusedSpace="true">
-                                            <ItemTemplate>
-                                                <asp:Label ID="Label2" runat="server" Text='<%# Bind("SortAccessProjectText") %>' ToolTip='<%# Bind("AccessProjectText") %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="ReleaseDate" DataField="ReleaseDate" SortField="ReleaseDate"
-                                            HeaderText="发布日期" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="IsReleaseName" DataField="IsReleaseName" SortField="IsReleaseName"
-                                            FieldType="String" HeaderText="发布" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="详细" ToolTip="附件上传查看"
-                                            DataIFrameUrlFields="SNoticeId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&type=-1&path=FileUpload/NoticeAttachUrl"
-                                            HeaderTextAlign="Center" />
-                                    </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="SddlPageSize" Width="80px" AutoPostBack="true"
-                                            OnSelectedIndexChanged="SddlPageSize_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>
-                            </Items>
-                        </f:Tab>
-                        <f:Tab ID="Tab4" Title="接收通知" BodyPadding="5px" Layout="Fit" runat="server">
-                            <Items>
-                                <f:Grid ID="AGrid" ShowBorder="true" ShowHeader="false" Title="接收通知" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="NoticeId" AllowCellEditing="true"
-                                    ClicksToEdit="2" DataIDField="NoticeId" AllowSorting="true" SortField="NoticeCode"
-                                    SortDirection="DESC" OnSort="AGrid_Sort" AllowPaging="true" IsDatabasePaging="true"
-                                    PageSize="10" OnPageIndexChange="AGrid_PageIndexChange" EnableRowDoubleClickEvent="true"
-                                    OnRowDoubleClick="AGrid_RowDoubleClick" EnableTextSelection="True">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                                            <Items>
-                                                <f:TextBox runat="server" Label="编号" ID="TextBox1" EmptyText="输入查询条件" AutoPostBack="true"
-                                                    OnTextChanged="ATextBox_TextChanged" Width="250px" LabelWidth="60px" LabelAlign="right">
-                                                </f:TextBox>
-                                                <f:TextBox runat="server" Label="名称" ID="TextBox2" EmptyText="输入查询条件" AutoPostBack="true"
-                                                    OnTextChanged="ATextBox_TextChanged" Width="250px" LabelWidth="60px" LabelAlign="right">
-                                                </f:TextBox>
-                                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
-                                                </f:ToolbarFill>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                                </f:Button>
-                                            </Items>
-                                        </f:Toolbar>
-                                    </Toolbars>
-                                    <Columns>
-                                        <f:RenderField Width="90px" ColumnID="NoticeCode" DataField="NoticeCode" SortField="NoticeCode"
-                                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="230px" ColumnID="NoticeTitle" DataField="NoticeTitle" SortField="NoticeTitle"
-                                            FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
-                                            FieldType="String" HeaderText="发布方" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:TemplateField Width="200px" HeaderText="接收对象" ColumnID="AccessProjectText" HeaderTextAlign="Center"
-                                            TextAlign="Left" ExpandUnusedSpace="true">
-                                            <ItemTemplate>
-                                                <asp:Label ID="Label1" runat="server" Text='<%# Bind("SortAccessProjectText") %>' ToolTip='<%# Bind("AccessProjectText") %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="ReleaseDate" DataField="ReleaseDate" SortField="ReleaseDate"
-                                            HeaderText="发布日期" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
-                                            DataIFrameUrlFields="NoticeId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&type=-1&path=FileUpload/NoticeAttachUrl"
-                                            HeaderTextAlign="Center" />
-                                    </Columns>
-                                    <PageItems>
-                                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
-                                        </f:ToolbarSeparator>
-                                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
-                                        </f:ToolbarText>
-                                        <f:DropDownList runat="server" ID="AddlPageSize" Width="80px" AutoPostBack="true"
-                                            OnSelectedIndexChanged="AddlPageSize_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>
-                            </Items>
-                        </f:Tab>
-                    </Tabs>
-                </f:TabStrip>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:TabStrip ID="TabStrip2" CssClass="f-tabstrip-theme-simple" ShowBorder="true" TabPosition="Top"
+                            MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                            <Tabs>
+                                <f:Tab ID="TabCode" Title="发出通知" BodyPadding="5px" Layout="Fit" runat="server">
+                                    <Items>
+                                        <f:Grid ID="SGrid" ShowBorder="true" ShowHeader="false" Title="发出通知" EnableCollapse="true"
+                                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="SNoticeId" AllowCellEditing="true"
+                                            ClicksToEdit="2" DataIDField="SNoticeId" AllowSorting="true" SortField="NoticeCode"
+                                            SortDirection="DESC" OnSort="SGrid_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            PageSize="10" OnPageIndexChange="SGrid_PageIndexChange" EnableRowDoubleClickEvent="true"
+                                            OnRowDoubleClick="SGrid_RowDoubleClick" EnableTextSelection="True">
+                                            <Toolbars>
+                                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="编号" ID="txtNoticeCode" EmptyText="输入查询条件" Width="250px" LabelWidth="60px" LabelAlign="right">
+                                                        </f:TextBox>
+                                                        <f:TextBox runat="server" Label="名称" ID="txtNoticeTitle" EmptyText="输入查询条件" Width="250px" LabelWidth="60px" LabelAlign="right">
+                                                        </f:TextBox>
+                                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                                        </f:ToolbarFill>
+                                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
+                                                            EnablePostBack="true" OnClick="STextBox_TextChanged" runat="server" Text="查询">
+                                                        </f:Button>
+                                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                                            runat="server">
+                                                        </f:Button>
+                                                        <f:Button ID="btnOutS" OnClick="btnOutS_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                                        </f:Button>
+                                                    </Items>
+                                                </f:Toolbar>
+                                            </Toolbars>
+                                            <Columns>
+                                                <f:RenderField Width="80px" ColumnID="NoticeCode" DataField="NoticeCode" SortField="NoticeCode"
+                                                    FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="230px" ColumnID="NoticeTitle" DataField="NoticeTitle" SortField="NoticeTitle"
+                                                    FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:TemplateField Width="200px" HeaderText="接收对象" ColumnID="AccessProjectText" HeaderTextAlign="Center"
+                                                    TextAlign="Left" ExpandUnusedSpace="true">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label2" runat="server" Text='<%# Bind("SortAccessProjectText") %>' ToolTip='<%# Bind("AccessProjectText") %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:RenderField Width="150px" ColumnID="ReleaseDate" DataField="ReleaseDate" SortField="ReleaseDate"
+                                                    HeaderText="发布日期" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="IsReleaseName" DataField="IsReleaseName" SortField="IsReleaseName"
+                                                    FieldType="String" HeaderText="发布" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="详细" ToolTip="附件上传查看"
+                                                    DataIFrameUrlFields="SNoticeId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&type=-1&path=FileUpload/NoticeAttachUrl"
+                                                    HeaderTextAlign="Center" />
+                                            </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="SddlPageSize" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="SddlPageSize_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>
+                                    </Items>
+                                </f:Tab>
+                                <f:Tab ID="Tab4" Title="接收通知" BodyPadding="5px" Layout="Fit" runat="server">
+                                    <Items>
+                                        <f:Grid ID="AGrid" ShowBorder="true" ShowHeader="false" Title="接收通知" EnableCollapse="true"
+                                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="NoticeId" AllowCellEditing="true"
+                                            ClicksToEdit="2" DataIDField="NoticeId" AllowSorting="true" SortField="NoticeCode"
+                                            SortDirection="DESC" OnSort="AGrid_Sort" AllowPaging="true" IsDatabasePaging="true"
+                                            PageSize="10" OnPageIndexChange="AGrid_PageIndexChange" EnableRowDoubleClickEvent="true"
+                                            OnRowDoubleClick="AGrid_RowDoubleClick" EnableTextSelection="True">
+                                            <Toolbars>
+                                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="编号" ID="TextBox1" EmptyText="输入查询条件" AutoPostBack="true"
+                                                            OnTextChanged="ATextBox_TextChanged" Width="250px" LabelWidth="60px" LabelAlign="right">
+                                                        </f:TextBox>
+                                                        <f:TextBox runat="server" Label="名称" ID="TextBox2" EmptyText="输入查询条件" AutoPostBack="true"
+                                                            OnTextChanged="ATextBox_TextChanged" Width="250px" LabelWidth="60px" LabelAlign="right">
+                                                        </f:TextBox>
+                                                        <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                                        </f:ToolbarFill>
+                                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                                        </f:Button>
+                                                    </Items>
+                                                </f:Toolbar>
+                                            </Toolbars>
+                                            <Columns>
+                                                <f:RenderField Width="90px" ColumnID="NoticeCode" DataField="NoticeCode" SortField="NoticeCode"
+                                                    FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="230px" ColumnID="NoticeTitle" DataField="NoticeTitle" SortField="NoticeTitle"
+                                                    FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                                                    FieldType="String" HeaderText="发布方" HeaderTextAlign="Center" TextAlign="Left">
+                                                </f:RenderField>
+                                                <f:TemplateField Width="200px" HeaderText="接收对象" ColumnID="AccessProjectText" HeaderTextAlign="Center"
+                                                    TextAlign="Left" ExpandUnusedSpace="true">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="Label1" runat="server" Text='<%# Bind("SortAccessProjectText") %>' ToolTip='<%# Bind("AccessProjectText") %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:RenderField Width="150px" ColumnID="ReleaseDate" DataField="ReleaseDate" SortField="ReleaseDate"
+                                                    HeaderText="发布日期" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
+                                                    DataIFrameUrlFields="NoticeId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&type=-1&path=FileUpload/NoticeAttachUrl"
+                                                    HeaderTextAlign="Center" />
+                                            </Columns>
+                                            <PageItems>
+                                                <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                                </f:ToolbarSeparator>
+                                                <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                                </f:ToolbarText>
+                                                <f:DropDownList runat="server" ID="AddlPageSize" Width="80px" AutoPostBack="true"
+                                                    OnSelectedIndexChanged="AddlPageSize_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>
+                                    </Items>
+                                </f:Tab>
+                            </Tabs>
+                        </f:TabStrip>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="管理通知" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs
index b0a439d..df8cbb9 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs
@@ -11,6 +11,22 @@ namespace FineUIPro.Web.HSSE.InformationProject
 {
     public partial class Notice : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -21,8 +37,21 @@ namespace FineUIPro.Web.HSSE.InformationProject
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                //Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window2.GetShowReference("NoticeEdit.aspx") + "return false;";
                 this.SddlPageSize.SelectedValue = SGrid.PageSize.ToString();
                 this.AddlPageSize.SelectedValue = AGrid.PageSize.ToString();
@@ -34,12 +63,33 @@ namespace FineUIPro.Web.HSSE.InformationProject
         }
         #endregion
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.SBindGrid();
+            this.ABindGrid();
+        }
         #region 绑定数据SBindGrid
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void SBindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT Notice.NoticeId AS SNoticeId,(CASE WHEN Notice.NoticeCode IS NULL THEN  CodeRecords.Code ELSE Notice.NoticeCode END) AS NoticeCode,Notice.NoticeTitle,Notice.MainContent,Notice.CompileDate,Notice.CompileMan,Users.UserName AS CompileManName,Notice.CompileDate,Notice.States 
                           ,Notice.IsRelease,(CASE WHEN IsRelease=1 THEN '已发布' ELSE '未发布' END) AS IsReleaseName,Notice.ReleaseDate,AccessProjectText
                          ,Notice.ProjectId,(CASE WHEN Notice.ProjectId IS NULL THEN '公司本部' ELSE Project.ProjectName END ) AS ProjectName
@@ -130,6 +180,10 @@ namespace FineUIPro.Web.HSSE.InformationProject
         /// </summary>
         private void ABindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT Notice.NoticeId,(CASE WHEN Notice.NoticeCode IS NULL THEN  CodeRecords.Code ELSE Notice.NoticeCode END) AS NoticeCode,Notice.NoticeTitle,Notice.ReleaseDate,AccessProjectText,AccessProjectId"
                           + @" ,Notice.ProjectId,(CASE WHEN Notice.ProjectId IS NULL THEN '公司本部' ELSE Project.ProjectName END ) AS ProjectName"
                           + @" ,(CASE WHEN LEN(Notice.AccessProjectText) > 40 THEN SUBSTRING(Notice.AccessProjectText,0,40)+'...' ELSE  AccessProjectText END)  AS SortAccessProjectText"
@@ -139,14 +193,19 @@ namespace FineUIPro.Web.HSSE.InformationProject
                           + @" WHERE IsRelease = 1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " AND Notice.AccessProjectId LIKE @ProjectId";
-            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
-            {
-                listStr.Add(new SqlParameter("@ProjectId", "%" + Request.Params["projectId"] + "%"));
-            }
-            else if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
+            //{
+            //    listStr.Add(new SqlParameter("@ProjectId", "%" + Request.Params["projectId"] + "%"));
+            //}
+            //else if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+
+            //    listStr.Add(new SqlParameter("@ProjectId", "%" + this.CurrUser.LoginProjectId + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
 
-                listStr.Add(new SqlParameter("@ProjectId", "%" + this.CurrUser.LoginProjectId + "%"));
+                listStr.Add(new SqlParameter("@ProjectId", "%" + this.ProjectId + "%"));
             }
             else
             {
@@ -388,11 +447,11 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 return;
             }
             string menuId = BLL.Const.ServerNoticeMenuId;
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 menuId = BLL.Const.ProjectNoticeMenuId;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, menuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.designer.cs
index 58e1447..239317f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class Notice {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class Notice
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// TabStrip2 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TabStrip TabStrip2;
-        
+
         /// <summary>
         /// TabCode 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tab TabCode;
-        
+
         /// <summary>
         /// SGrid 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid SGrid;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtNoticeCode 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtNoticeCode;
-        
+
         /// <summary>
         /// txtNoticeTitle 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtNoticeTitle;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOutS 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOutS;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// SddlPageSize 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList SddlPageSize;
-        
+
         /// <summary>
         /// Tab4 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tab Tab4;
-        
+
         /// <summary>
         /// AGrid 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid AGrid;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// TextBox1 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox TextBox1;
-        
+
         /// <summary>
         /// TextBox2 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox TextBox2;
-        
+
         /// <summary>
         /// ToolbarFill2 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -236,7 +274,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// ToolbarSeparator2 控件。
         /// </summary>
@@ -245,7 +283,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
-        
+
         /// <summary>
         /// ToolbarText2 控件。
         /// </summary>
@@ -254,7 +292,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText2;
-        
+
         /// <summary>
         /// AddlPageSize 控件。
         /// </summary>
@@ -263,7 +301,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList AddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -272,7 +310,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -281,7 +319,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -290,7 +328,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -299,7 +337,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -308,7 +346,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuIssuance 控件。
         /// </summary>
@@ -317,7 +355,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuIssuance;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx
index fcb527d..f50f3f0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PromotionalActivities.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.PromotionalActivities" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -17,87 +19,101 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全宣传活动" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PromotionalActivitiesId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="PromotionalActivitiesId" AllowSorting="true"
-                    SortField="Code" 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 runat="server" Label="活动编号" ID="txtCode" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="活动主题" ID="txtTitle" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    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="100px" ColumnID="Code" DataField="Code"
-                            SortField="Code" FieldType="String" HeaderText="活动编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Title" DataField="Title"
-                            SortField="Title" FieldType="String" HeaderText="活动主题" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="ActivitiesDate" DataField="ActivitiesDate"
-                            SortField="ActivitiesDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="活动日期" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="UnitNames" DataField="UnitNames" ExpandUnusedSpace="true"
-                            SortField="UnitNames" FieldType="String" HeaderText="参与单位" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                            SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
-                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Center">
-                        </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="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全宣传活动" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PromotionalActivitiesId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="PromotionalActivitiesId" AllowSorting="true"
+                            SortField="Code" 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 runat="server" Label="活动编号" ID="txtCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="活动主题" ID="txtTitle" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="100px" ColumnID="Code" DataField="Code"
+                                    SortField="Code" FieldType="String" HeaderText="活动编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Title" DataField="Title"
+                                    SortField="Title" FieldType="String" HeaderText="活动主题" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="ActivitiesDate" DataField="ActivitiesDate"
+                                    SortField="ActivitiesDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="活动日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="UnitNames" DataField="UnitNames" ExpandUnusedSpace="true"
+                                    SortField="UnitNames" FieldType="String" HeaderText="参与单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </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="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="安全宣传活动" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs
index edd154c..5123980 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs
@@ -11,6 +11,22 @@ namespace FineUIPro.Web.HSSE.InformationProject
 {
     public partial class PromotionalActivities :PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -21,8 +37,21 @@ namespace FineUIPro.Web.HSSE.InformationProject
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("PromotionalActivitiesEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -34,10 +63,30 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             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 "
                           + @" ,(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"
@@ -56,7 +105,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
 
             if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
@@ -211,7 +260,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectPromotionalActivitiesMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectPromotionalActivitiesMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.designer.cs
index bceeb88..3e27a5c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.designer.cs
+++ b/SUBQHSE/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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCode;
-        
+
         /// <summary>
         /// txtTitle 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTitle;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx
index cae63de..0dd3eb1 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyQuarterlyReport.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.SafetyQuarterlyReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,91 +12,105 @@
 </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="SafetyQuarterlyReportId"
-                DataIDField="SafetyQuarterlyReportId" AllowSorting="true" ForceFit="true"
-                SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                            <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
-                                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" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="YearAndQuarters" DataField="YearAndQuarters" 
-                        SortField="YearAndQuarters" FieldType="String" HeaderText="季报时间" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="100px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>                  
-                    <f:TemplateField HeaderText="打印" Width="80px">
-                        <ItemTemplate>
-                            <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="编辑安全生产数据季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px" Height="560px">
-    </f:Window>
-    <f:Window ID="Window2" Title="打印安全生产数据季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px" Height="560px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全生产数据季报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="SafetyQuarterlyReportId"
+                            DataIDField="SafetyQuarterlyReportId" AllowSorting="true" ForceFit="true"
+                            SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="YearAndQuarters" DataField="YearAndQuarters"
+                                    SortField="YearAndQuarters" FieldType="String" HeaderText="季报时间" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField HeaderText="打印" Width="80px">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="编辑安全生产数据季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px" Height="560px">
+        </f:Window>
+        <f:Window ID="Window2" Title="打印安全生产数据季报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px" Height="560px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.cs
index 315b571..64f13e2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.cs
@@ -43,8 +43,14 @@ namespace FineUIPro.Web.HSSE.InformationProject
                     this.ProjectId = Request.Params["projectId"];
                 }
 
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, BLL.ConstValue.Group_0011, true);
@@ -59,10 +65,30 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT SafetyQuarterlyReport.SafetyQuarterlyReportId, "
                           + @"SafetyQuarterlyReport.ProjectId,"
                           + @"SafetyQuarterlyReport.UnitId,"
@@ -99,7 +125,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            Grid1.RecordCount = tb.Rows.Count;            
+            Grid1.RecordCount = tb.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -252,7 +278,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectSafetyQuarterlyReportMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectSafetyQuarterlyReportMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.designer.cs
index fd52d65..32452c8 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class SafetyQuarterlyReport {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class SafetyQuarterlyReport
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpQuarters 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQuarters;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx
index 96eac09..6855e06 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WorkSummaryReport.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.WorkSummaryReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -11,87 +13,101 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全管理工作总结报告" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WorkSummaryReportId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="WorkSummaryReportId"
-                    AllowSorting="true" SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全管理工作总结报告" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WorkSummaryReportId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="WorkSummaryReportId"
+                            AllowSorting="true" SortField="CompileDate" 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:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
+                                            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" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ResponsiblePerson" DataField="ResponsiblePerson"
+                                    SortField="ResponsiblePerson" FieldType="String" HeaderText="负责人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ResponsiblePersonTel" DataField="ResponsiblePersonTel"
+                                    SortField="ResponsiblePersonTel" FieldType="String" HeaderText="负责人电话" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ContactPerson" DataField="ContactPerson"
+                                    SortField="ContactPerson" FieldType="String" HeaderText="联系人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ContactPersonTel" DataField="ContactPersonTel"
+                                    SortField="ContactPersonTel" FieldType="String" HeaderText="联系人电话" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ReportDate" DataField="ReportDate"
+                                    SortField="ReportDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="报告时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+        TextAlign="Left">
+    </f:RenderField>--%>
+                                <%--<f:TemplateField HeaderText="打印" Width="80px">
+        <ItemTemplate>
+            <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
+        </ItemTemplate>
+    </f:TemplateField>--%>
+                            </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:DropDownList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                            TextAlign="Center" />
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                            TextAlign="Left" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ResponsiblePerson" DataField="ResponsiblePerson"
-                            SortField="ResponsiblePerson" FieldType="String" HeaderText="负责人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ResponsiblePersonTel" DataField="ResponsiblePersonTel"
-                            SortField="ResponsiblePersonTel" FieldType="String" HeaderText="负责人电话" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ContactPerson" DataField="ContactPerson"
-                            SortField="ContactPerson" FieldType="String" HeaderText="联系人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ContactPersonTel" DataField="ContactPersonTel"
-                            SortField="ContactPersonTel" FieldType="String" HeaderText="联系人电话" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="ReportDate" DataField="ReportDate"
-                            SortField="ReportDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="报告时间" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="110px" ColumnID="CompileManName" DataField="CompileManName"
-                            SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
-                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <%--<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>--%>
-                        <%--<f:TemplateField HeaderText="打印" Width="80px">
-                        <ItemTemplate>
-                            <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                        </ItemTemplate>
-                    </f:TemplateField>--%>
-                    </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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑安全管理工作总结报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.cs
index 453f80a..7a90725 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.cs
@@ -43,8 +43,15 @@ namespace FineUIPro.Web.HSSE.InformationProject
                     this.ProjectId = Request.Params["projectId"];
                 }
 
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
 
@@ -59,10 +66,31 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT workSummaryReport.WorkSummaryReportId,"
                           + @"workSummaryReport.ProjectId,"
                           + @"workSummaryReport.UnitId,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.designer.cs
index 54ad3a3..38fe8f6 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class WorkSummaryReport {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class WorkSummaryReport
+    {
+
         /// <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,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx
index 50e5c56..177ad4e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CompletionReport.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.CompletionReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,97 +11,111 @@
 </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="CompletionReportId" ForceFit="true"
-                DataIDField="CompletionReportId" AllowSorting="true" SortField="CompletionReportCode" 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 runat="server" Label="编号" ID="txtCompletionReportCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="70px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="名称" ID="txtCompletionReportName" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="70px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>                
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="150px" ColumnID="CompletionReportCode" DataField="CompletionReportCode"
-                        SortField="CompletionReportCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="350px" ColumnID="CompletionReportName" DataField="CompletionReportName"
-                        SortField="CompletionReportName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:TemplateField ColumnID="tfCompileMan" Width="120px" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
-                        <ItemTemplate>
-                            <asp:Label ID="lblCompileMan" runat="server" Text='<%# ConvertCompileMan(Eval("CompileMan")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                   <%-- <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="上传查看" ToolTip="附件上传查看" DataIFrameUrlFields="CompletionReportId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CompletionReportAttachUrl&menuId=AE118E9C-C309-43B7-A198-8CA90A8D98EB"
-                         ExpandUnusedSpace="True" HeaderTextAlign="Center" />--%>
-                </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:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="1024px" Height="550px">
-    </f:Window>
-    <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:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="完工报告" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CompletionReportId" ForceFit="true"
+                            DataIDField="CompletionReportId" AllowSorting="true" SortField="CompletionReportCode" 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 runat="server" Label="编号" ID="txtCompletionReportCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="70px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtCompletionReportName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="70px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="150px" ColumnID="CompletionReportCode" DataField="CompletionReportCode"
+                                    SortField="CompletionReportCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="CompletionReportName" DataField="CompletionReportName"
+                                    SortField="CompletionReportName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfCompileMan" Width="120px" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblCompileMan" runat="server" Text='<%# ConvertCompileMan(Eval("CompileMan")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%-- <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件"
+              Text="上传查看" ToolTip="附件上传查看" DataIFrameUrlFields="CompletionReportId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CompletionReportAttachUrl&menuId=AE118E9C-C309-43B7-A198-8CA90A8D98EB"
+               ExpandUnusedSpace="True" HeaderTextAlign="Center" />--%>
+                            </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:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1024px" Height="550px">
+        </f:Window>
+        <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:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" 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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.cs
index ed05397..017e2d7 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.cs
@@ -11,6 +11,22 @@ namespace FineUIPro.Web.HSSE.Manager
 {
     public partial class CompletionReport : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -22,8 +38,20 @@ namespace FineUIPro.Web.HSSE.Manager
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("CompletionReportEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -35,10 +63,30 @@ namespace FineUIPro.Web.HSSE.Manager
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT CompletionReport.CompletionReportId,CompletionReport.ProjectId,CodeRecords.Code AS CompletionReportCode,CompletionReport.CompletionReportName,CompletionReport.FileContent,CompletionReport.CompileMan,CompletionReport.CompileDate,CompletionReport.States, "
                         + @" (CASE WHEN CompletionReport.States = " + BLL.Const.State_0 + " OR CompletionReport.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN CompletionReport.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                         + @" FROM Manager_CompletionReport AS  CompletionReport "
@@ -56,7 +104,7 @@ namespace FineUIPro.Web.HSSE.Manager
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtCompletionReportCode.Text.Trim()))
             {
@@ -267,7 +315,7 @@ namespace FineUIPro.Web.HSSE.Manager
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectCompletionReportMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectCompletionReportMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.designer.cs
index 7445e03..dd7c7d1 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/CompletionReport.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Manager {
-    
-    
-    public partial class CompletionReport {
-        
+namespace FineUIPro.Web.HSSE.Manager
+{
+
+
+    public partial class CompletionReport
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtCompletionReportCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCompletionReportCode;
-        
+
         /// <summary>
         /// txtCompletionReportName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCompletionReportName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// lblCompileMan 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblCompileMan;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx
index 1567371..0b67631 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx
@@ -1,6 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HSEDiary.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Manager.HSEDiary" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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">
@@ -10,69 +12,83 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSE日志" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="HSEDiaryId" DataIDField="HSEDiaryId" AllowSorting="true" ForceFit="true"
-                    SortField="DiaryDate,UserName" SortDirection="DESC" EnableColumnLines="true" 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:DropDownList ID="drpUser" runat="server" Label="工程师" Width="350px" LabelWidth="80px"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSE日志" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="HSEDiaryId" DataIDField="HSEDiaryId" AllowSorting="true" ForceFit="true"
+                            SortField="DiaryDate,UserName" SortDirection="DESC" EnableColumnLines="true" 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:DropDownList ID="drpUser" runat="server" Label="工程师" Width="350px" LabelWidth="80px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DatePicker runat="server" ID="txtDiaryDate" Label="日期" LabelWidth="80px"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="110px" ColumnID="DiaryDate" DataField="DiaryDate" SortField="DiaryDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
+                                    SortField="UserName" FieldType="String" HeaderText="工程师" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="DailySummary" DataField="DailySummary" SortField="DailySummary"
+                                    FieldType="String" HeaderText="当日小结" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="300px" ColumnID="TomorrowPlan" DataField="TomorrowPlan" SortField="TomorrowPlan"
+                                    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:DropDownList>
-                                <f:DatePicker runat="server" ID="txtDiaryDate" Label="日期" LabelWidth="80px"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
-                                </f:DatePicker>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    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="110px" ColumnID="DiaryDate" DataField="DiaryDate" SortField="DiaryDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
-                            SortField="UserName" FieldType="String" HeaderText="工程师" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="DailySummary" DataField="DailySummary" SortField="DailySummary"
-                            FieldType="String" HeaderText="当日小结" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="TomorrowPlan" DataField="TomorrowPlan" SortField="TomorrowPlan"
-                            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:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="HSE日志" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs
index 34fd2f8..f86c15f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs
@@ -40,15 +40,21 @@ namespace FineUIPro.Web.HSSE.Manager
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
 
-                UserService.InitUserDropDownList(this.drpUser, this.ProjectId, true);
                 this.drpUser.SelectedValue = this.CurrUser.UserId;
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -59,11 +65,32 @@ namespace FineUIPro.Web.HSSE.Manager
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UserService.InitUserDropDownList(this.drpUser, this.ProjectId, true);
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "SELECT H.HSEDiaryId,H.ProjectId,H.DiaryDate,H.UserId,U.UserName,Unit.UnitCode,Unit.UnitName,H.DailySummary,H.TomorrowPlan"
                         + @" FROM Project_HSEDiary AS H"
                         + @" LEFT JOIN Sys_User AS U ON H.UserId=U.UserId "
@@ -71,7 +98,7 @@ namespace FineUIPro.Web.HSSE.Manager
                         + @" WHERE H.ProjectId= '" + this.ProjectId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
 
-            if (this.drpUser.SelectedValue != Const._Null)
+            if (this.drpUser.SelectedValue != null && this.drpUser.SelectedValue != Const._Null)
             {
                 strSql += " AND H.UserId = @UserId";
                 listStr.Add(new SqlParameter("@UserId", this.drpUser.SelectedValue));
@@ -212,7 +239,7 @@ namespace FineUIPro.Web.HSSE.Manager
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.ProjectHSEDiaryMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, Const.ProjectHSEDiaryMenuId);
             if (buttonList.Count() > 0)
             {
                 //if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -285,7 +312,7 @@ namespace FineUIPro.Web.HSSE.Manager
             {
                 if (getHSEDiary.DiaryDate.HasValue && !string.IsNullOrEmpty(getHSEDiary.UserId))
                 {
-                    
+
                     Bookmark bookmarkDateTime = doc.Range.Bookmarks["DateTime"];
                     if (bookmarkDateTime != null)
                     {
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.designer.cs
index 7e57d9f..e2ea421 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Manager {
-    
-    
-    public partial class HSEDiary {
-        
+namespace FineUIPro.Web.HSSE.Manager
+{
+
+
+    public partial class HSEDiary
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpUser 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUser;
-        
+
         /// <summary>
         /// txtDiaryDate 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtDiaryDate;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
index e8d8702..702f907 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
@@ -1,131 +1,146 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerMonth_SeDin.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.ManagerMonth_SeDin" %>
 
-<!DOCTYPE html>   
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title>月报</title>
-     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <style type="text/css">       
-        .LabelColor
-        {
+    <style type="text/css">
+        .LabelColor {
             color: Red;
-            font-size:small;
-        } 
-        .f-grid-row.Green
-        {
+            font-size: small;
+        }
+
+        .f-grid-row.Green {
             background-color: LightGreen;
         }
     </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" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="月报" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="MonthReportId" DataIDField="MonthReportId" 
-                AllowSorting="true" SortField="ReporMonth" SortDirection="DESC" OnSort="Grid1_Sort"  ForceFit="true"
-                EnableColumnLines="true" 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 runat="server" Label="月份" ID="txtReporMonth" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
-                                LabelAlign="right">
-                            </f:TextBox> 
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill> 
-                              <f:DatePicker runat="server"  DateFormatString="yyyy-MM" Label="月报月份" EmptyText="请选择年月" 
-                                ID="txtMonth" LabelAlign="right" DisplayType="Month" ShowTodayButton="false">
-                            </f:DatePicker>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" Text="新增"
-                                OnClick="btnNew_Click" Hidden="true">
-                            </f:Button>                
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                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="85px" ColumnID="ReporMonth" DataField="ReporMonth" SortField="ReporMonth"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>      
-                     <f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="开始日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="EndDate" DataField="EndDate" SortField="EndDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="结束日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                      <f:RenderField Width="100px" ColumnID="DueDate" DataField="DueDate" SortField="DueDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="截止日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName" 
-                        SortField="ReportManName" FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="AuditManName" DataField="AuditManName" 
-                        SortField="ReportManName" FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="ApprovalManName" DataField="ApprovalManName" 
-                        SortField="ReportManName" FieldType="String" HeaderText="批准人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                      <f:RenderField Width="90px" ColumnID="StateName" DataField="StateName" 
-                        SortField="StateName" FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                 <%--    <f:RenderField Width="250px" ColumnID="ThisSummary" DataField="ThisSummary" 
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="月报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="MonthReportId" DataIDField="MonthReportId"
+                            AllowSorting="true" SortField="ReporMonth" SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            EnableColumnLines="true" 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 runat="server" Label="月份" ID="txtReporMonth" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM" Label="月报月份" EmptyText="请选择年月"
+                                            ID="txtMonth" LabelAlign="right" DisplayType="Month" ShowTodayButton="false">
+                                        </f:DatePicker>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" Text="新增"
+                                            OnClick="btnNew_Click" Hidden="true">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="85px" ColumnID="ReporMonth" DataField="ReporMonth" SortField="ReporMonth"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="开始日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EndDate" DataField="EndDate" SortField="EndDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="结束日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="DueDate" DataField="DueDate" SortField="DueDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="截止日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="ReportManName" FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="AuditManName" DataField="AuditManName"
+                                    SortField="ReportManName" FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="ApprovalManName" DataField="ApprovalManName"
+                                    SortField="ReportManName" FieldType="String" HeaderText="批准人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="StateName" DataField="StateName"
+                                    SortField="StateName" FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <%--    <f:RenderField Width="250px" ColumnID="ThisSummary" DataField="ThisSummary" 
                          FieldType="String" HeaderText="本月HSE活动综述" TextAlign="Left" HeaderTextAlign="Center">
                     </f:RenderField>--%>
-             <%--         <f:RenderField Width="250px" ColumnID="NextPlan" DataField="NextPlan" ExpandUnusedSpace="true"
+                                <%--         <f:RenderField Width="250px" ColumnID="NextPlan" DataField="NextPlan" ExpandUnusedSpace="true"
                          FieldType="String" HeaderText="下月HSE工作计划" TextAlign="Left" HeaderTextAlign="Center">
                     </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:DropDownList>
-                    <f:ToolbarFill ID="ToolbarFill2" runat="server">
-                    </f:ToolbarFill>
-                    <%-- <f:Label ID="Label2" runat="server" Text="说明：绿色-未冻结；白色-已冻结。"  CssClass="LabelColor"></f:Label>--%>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </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="1300px" Height="600px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <Items>
-            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-                Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click">
-            </f:MenuButton>
-               <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server" 
+                            </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:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                </f:ToolbarFill>
+                                <%-- <f:Label ID="Label2" runat="server" Text="说明：绿色-未冻结；白色-已冻结。"  CssClass="LabelColor"></f:Label>--%>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </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="1300px" Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                    Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
                     Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
                 </f:MenuButton>
-            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-            </f:MenuButton>
-        </Items>
-    </f:Menu>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
+                    Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
index 8c421f4..2d368ec 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
@@ -42,19 +42,47 @@ namespace FineUIPro.Web.HSSE.Manager
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT mr.MonthReportId,mr.ProjectId,mr.DueDate,mr.StartDate,mr.EndDate,mr.ReporMonth,mr.CompileManId,CompileMan.UserName AS CompileManName,mr.AuditManId
                                         ,AuditMan.UserName AS AuditManName,mr.ApprovalManId,mr.AuditManId,ApprovalMan.UserName AS ApprovalManName,mr.ThisSummary,mr.NextPlan,mr.States
                                         ,(CASE WHEN mr.States='0' THEN '待['+ (CASE WHEN nextMan.UserName IS NULL THEN CompileMan.UserName ELSE nextMan.UserName END) +']提交'
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.designer.cs
index 2f68e28..91fe658 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Manager {
-    
-    
-    public partial class ManagerMonth_SeDin {
-        
+namespace FineUIPro.Web.HSSE.Manager
+{
+
+
+    public partial class ManagerMonth_SeDin
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtReporMonth 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtReporMonth;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// txtMonth 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtMonth;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// ToolbarFill2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Manager {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx
index e3dafab..290174d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx
@@ -1,7 +1,8 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonPerfomance.aspx.cs" Inherits="FineUIPro.Web.Perfomance.PersonPerfomance" %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
 
+<!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>
@@ -9,100 +10,114 @@
 </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="PersonPerfomanceId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="PersonPerfomanceId" AllowSorting="true"
-                SortField="PersonPerfomanceCode" 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 runat="server" Label="编号" ID="txtPersonPerfomanceCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="60px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件" AutoPostBack="true"
-                                OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
-                            </f:TextBox>
-                            <f:DatePicker ID="txtStartDate" runat="server" Label="评价时间" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
-                                Width="220px" EmptyText="开始时间" LabelAlign="Right">
-                            </f:DatePicker>
-                            <f:Label ID="lblTo" runat="server" Text="至">
-                            </f:Label>
-                            <f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
-                                Width="120px" EmptyText="结束时间">
-                            </f:DatePicker>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="200px" ColumnID="PersonPerfomanceCode" DataField="PersonPerfomanceCode"
-                        SortField="PersonPerfomanceCode" FieldType="String" HeaderText="评价编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
-                        FieldType="String" HeaderText="人员姓名" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="TeamGroupName" DataField="TeamGroupName" SortField="TeamGroupName"
-                        FieldType="String" HeaderText="班组" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="180px" ColumnID="SubContractNum" DataField="SubContractNum"
-                        SortField="SubContractNum" FieldType="String" HeaderText="分包合同号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="EvaluationDate" DataField="EvaluationDate"
-                        SortField="EvaluationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="评价时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </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="100000" />
-                    </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" IsModal="true" Width="1024px"
-        Height="700px">
-    </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" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="个人绩效评价" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PersonPerfomanceId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="PersonPerfomanceId" AllowSorting="true"
+                            SortField="PersonPerfomanceCode" 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 runat="server" Label="编号" ID="txtPersonPerfomanceCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DatePicker ID="txtStartDate" runat="server" Label="评价时间" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                            Width="220px" EmptyText="开始时间" LabelAlign="Right">
+                                        </f:DatePicker>
+                                        <f:Label ID="lblTo" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                            Width="120px" EmptyText="结束时间">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="200px" ColumnID="PersonPerfomanceCode" DataField="PersonPerfomanceCode"
+                                    SortField="PersonPerfomanceCode" FieldType="String" HeaderText="评价编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
+                                    FieldType="String" HeaderText="人员姓名" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="TeamGroupName" DataField="TeamGroupName" SortField="TeamGroupName"
+                                    FieldType="String" HeaderText="班组" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="SubContractNum" DataField="SubContractNum"
+                                    SortField="SubContractNum" FieldType="String" HeaderText="分包合同号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="EvaluationDate" DataField="EvaluationDate"
+                                    SortField="EvaluationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="评价时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </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="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="编辑个人绩效评价" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px"
+            Height="700px">
+        </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 %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.cs
index ffc3700..e09d1a2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.cs
@@ -39,13 +39,21 @@ namespace FineUIPro.Web.Perfomance
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("PersonPerfomanceEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -57,10 +65,31 @@ namespace FineUIPro.Web.Perfomance
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT PersonPerfomance.PersonPerfomanceId,"
                           + @"PersonPerfomance.ProjectId,"
                           + @"CodeRecords.Code AS PersonPerfomanceCode,"
@@ -267,7 +296,7 @@ namespace FineUIPro.Web.Perfomance
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PersonPerfomanceMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.PersonPerfomanceMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.designer.cs
index 0adef6a..b606d7e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Perfomance/PersonPerfomance.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Perfomance {
-    
-    
-    public partial class PersonPerfomance {
-        
+namespace FineUIPro.Web.Perfomance
+{
+
+
+    public partial class PersonPerfomance
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtPersonPerfomanceCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPersonPerfomanceCode;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// lblTo 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblTo;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Perfomance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
