diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx
index d1fa56c..1228a97 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataDistribution.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.DataDistribution" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,101 +11,115 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="资料发放登记" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DataDistributionId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="DataDistributionId" AllowSorting="true" SortField="FileCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:TextBox runat="server" ID="stxtFileCode" Label="文件编号" LabelAlign="Right"></f:TextBox>
-                                <f:TextBox ID="stxtFileName" runat="server" CssClass="textboxStyle" Label="文件名称" LabelAlign="Right">
-                                </f:TextBox>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" ToolTip="新增" Hidden="true" runat="server" OnClick="btnNew_Click" Text="新增">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Text="导入">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileCode" DataField="FileCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileName" DataField="FileName" FieldType="String" HeaderText="文件名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="发出专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SendMan" DataField="SendMan" FieldType="String" HeaderText="发出人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="收件单位" HeaderTextAlign="Center" TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceivingUnit")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="ReceivingMan" DataField="ReceivingMan" FieldType="String" HeaderText="收件人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileType" DataField="FileType" FieldType="String" HeaderText="文件形式" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="CopiesCount" DataField="CopiesCount" FieldType="String" HeaderText="份数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="IsReply" DataField="IsReply" FieldType="String" HeaderText="是否需回复" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReplyCode" DataField="ReplyCode" FieldType="String" HeaderText="回复单号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="Date" Renderer="Date" HeaderText="回复日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
-                                    Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DataDistributionId")) %>' ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <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" DataKeyNames="DataDistributionId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="DataDistributionId" AllowSorting="true" SortField="FileCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" ID="stxtFileCode" Label="文件编号" LabelAlign="Right"></f:TextBox>
+                                        <f:TextBox ID="stxtFileName" runat="server" CssClass="textboxStyle" Label="文件名称" LabelAlign="Right">
+                                        </f:TextBox>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" ToolTip="新增" Hidden="true" runat="server" OnClick="btnNew_Click" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Text="导入">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileCode" DataField="FileCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileName" DataField="FileName" FieldType="String" HeaderText="文件名称" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="发出专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SendMan" DataField="SendMan" FieldType="String" HeaderText="发出人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="收件单位" HeaderTextAlign="Center" TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceivingUnit")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="ReceivingMan" DataField="ReceivingMan" FieldType="String" HeaderText="收件人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileType" DataField="FileType" FieldType="String" HeaderText="文件形式" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CopiesCount" DataField="CopiesCount" FieldType="String" HeaderText="份数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="IsReply" DataField="IsReply" FieldType="String" HeaderText="是否需回复" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReplyCode" DataField="ReplyCode" FieldType="String" HeaderText="回复单号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="Date" Renderer="Date" HeaderText="回复日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DataDistributionId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <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/CQMS/Comprehensive/DataDistribution.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs
index ac261d0..e304c37 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs
@@ -9,6 +9,23 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class DataDistribution : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,12 +36,47 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                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();
+                }
+
                 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();
+        }
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"select DataDistributionId, ProjectId, SendDate, FileCode, FileName, Status,
                               SendMan, ReceivingUnit, ReceivingMan, (case when FileType='1' then '纸质' ELSE '电子' end)AS FileType, CopiesCount, (case when IsReply='True' then '是' else '否' end) as IsReply, ReplyCode,
                               ReplyDate, Remark, AttachUrl, CompileMan, CompileDate,CN.ProfessionalName   
@@ -32,7 +84,7 @@ namespace FineUIPro.Web.Comprehensive
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
                               where C.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);
             Grid1.RecordCount = tb.Rows.Count;
@@ -222,7 +274,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DataDistributionMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.DataDistributionMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.designer.cs
index 8fd7e3e..3b33ec5 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class DataDistribution {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class DataDistribution
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// stxtFileCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtFileCode;
-        
+
         /// <summary>
         /// stxtFileName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtFileName;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx
index 80e3640..ab48f76 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataReceiving.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.DataReceiving" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,102 +11,116 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="资料接收登记" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DataReceivingId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="DataReceivingId" AllowSorting="true" SortField="FileCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:TextBox runat="server" ID="stxtFileCode" Label="文件编号" LabelAlign="Right"></f:TextBox>
-                                <f:TextBox ID="stxtFileName" runat="server" CssClass="textboxStyle"
-                                    MaxLength="150" Label="文件名称" LabelAlign="Right">
-                                </f:TextBox>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" ToolTip="新增" Text="新增" Hidden="true" runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Text="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="DataReceivingDate" DataField="DataReceivingDate" FieldType="Date" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileCode" DataField="FileCode" FieldType="String" HeaderText="文件号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileName" DataField="FileName" FieldType="String" HeaderText="文件名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitNames" Width="280px" HeaderText="发件单位" HeaderTextAlign="Center" TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("SendUnit")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="SendMan" DataField="SendMan" FieldType="String" HeaderText="发件人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileType" DataField="FileType" FieldType="String" HeaderText="文件形式" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="CopiesCount" DataField="CopiesCount" FieldType="String" HeaderText="份数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReceivingMan" DataField="ReceivingMan" FieldType="String" HeaderText="收件人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="FileHandler" DataField="FileHandler" FieldType="String" HeaderText="文件处理人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="IsReply" DataField="IsReply" FieldType="String" HeaderText="是否需回复" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReplyCode" DataField="ReplyCode" FieldType="String" HeaderText="回复单号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="String" HeaderText="回复日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DataReceivingId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <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" DataKeyNames="DataReceivingId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="DataReceivingId" AllowSorting="true" SortField="FileCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" ID="stxtFileCode" Label="文件编号" LabelAlign="Right"></f:TextBox>
+                                        <f:TextBox ID="stxtFileName" runat="server" CssClass="textboxStyle"
+                                            MaxLength="150" Label="文件名称" LabelAlign="Right">
+                                        </f:TextBox>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" ToolTip="新增" Text="新增" Hidden="true" runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Text="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="DataReceivingDate" DataField="DataReceivingDate" FieldType="Date" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileCode" DataField="FileCode" FieldType="String" HeaderText="文件号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileName" DataField="FileName" FieldType="String" HeaderText="文件名称" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitNames" Width="280px" HeaderText="发件单位" HeaderTextAlign="Center" TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("SendUnit")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="SendMan" DataField="SendMan" FieldType="String" HeaderText="发件人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileType" DataField="FileType" FieldType="String" HeaderText="文件形式" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CopiesCount" DataField="CopiesCount" FieldType="String" HeaderText="份数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReceivingMan" DataField="ReceivingMan" FieldType="String" HeaderText="收件人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="FileHandler" DataField="FileHandler" FieldType="String" HeaderText="文件处理人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="IsReply" DataField="IsReply" FieldType="String" HeaderText="是否需回复" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReplyCode" DataField="ReplyCode" FieldType="String" HeaderText="回复单号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="String" HeaderText="回复日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DataReceivingId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <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"
@@ -115,7 +131,7 @@
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="700px" Height="560px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <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>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.cs
index b2a1d20..817f508 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.cs
@@ -10,6 +10,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class DataReceiving : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -20,23 +36,56 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                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();
+                }
                 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>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"select DataReceivingId,  DataReceivingDate, FileCode, FileName, SendUnit, SendMan, Status,
                               (CASE WHEN FileType='1' THEN '纸质' ELSE '电子' END)as FileType, CopiesCount, ReceivingMan, FileHandler, (CASE WHEN IsReply='true' THEN '是' ELSE '否' END)as IsReply, ReplyCode, ReplyDate, 
                               Remark, AttachUrl, CompileMan, CompileDate  
                               from Comprehensive_DataReceiving C 
                               where C.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);
             Grid1.RecordCount = tb.Rows.Count;
@@ -226,7 +275,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DataReceivingMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.DataReceivingMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.designer.cs
index 1b5d533..fcf17fb 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class DataReceiving {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class DataReceiving
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// stxtFileCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtFileCode;
-        
+
         /// <summary>
         /// stxtFileName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtFileName;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
index 7255796..f8f3808 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DesignDrawings.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.DesignDrawings" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,100 +11,114 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸收发记录" EnableCollapse="true" ForceFit="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DesignDrawingsId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="DesignDrawingsId" AllowSorting="true"
-                    SortField="DesignDrawingsCode" 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="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="70px"></f:DropDownList>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="接收日期" ID="stxtReceiveDate"
-                                    LabelAlign="right" LabelWidth="90px" Width="220px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="发送日期" ID="stxtSendDate"
-                                    LabelAlign="right" LabelWidth="90px" Width="220px">
-                                </f:DatePicker>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Text="新增">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Text="导入">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="DesignDrawingsCode" DataField="DesignDrawingsCode" FieldType="String" HeaderText="设计图纸编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="DesignDrawingsContent" DataField="DesignDrawingsContent" FieldType="String" HeaderText="图纸内容" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="320px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Edition" DataField="Edition" FieldType="String" HeaderText="版次" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="PageNumber" DataField="PageNumber" FieldType="String" HeaderText="页数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="ReceiveUnits" Width="310px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnits")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="ReceiveMan" DataField="ReceiveMan" FieldType="String" HeaderText="接收人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DesignDrawingsId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <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" ForceFit="true"
+                            runat="server" BoxFlex="1" DataKeyNames="DesignDrawingsId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="DesignDrawingsId" AllowSorting="true"
+                            SortField="DesignDrawingsCode" 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="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="70px"></f:DropDownList>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="接收日期" ID="stxtReceiveDate"
+                                            LabelAlign="right" LabelWidth="90px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="发送日期" ID="stxtSendDate"
+                                            LabelAlign="right" LabelWidth="90px" Width="220px">
+                                        </f:DatePicker>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" ToolTip="新增" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Text="导入">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="DesignDrawingsCode" DataField="DesignDrawingsCode" FieldType="String" HeaderText="设计图纸编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="DesignDrawingsContent" DataField="DesignDrawingsContent" FieldType="String" HeaderText="图纸内容" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="320px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Edition" DataField="Edition" FieldType="String" HeaderText="版次" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="PageNumber" DataField="PageNumber" FieldType="String" HeaderText="页数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="ReceiveUnits" Width="310px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnits")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="ReceiveMan" DataField="ReceiveMan" FieldType="String" HeaderText="接收人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DesignDrawingsId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <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"
@@ -113,7 +129,7 @@
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="700px" Height="560px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <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>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs
index 8651e96..a14b260 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs
@@ -9,7 +9,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class DesignDrawings :PageBase
     {
-
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -20,17 +35,50 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                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();
+                }
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true);
                 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>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT C.DesignDrawingsId, 
                                      C.ProjectId,
                                      C.CNProfessionalId,
@@ -51,7 +99,7 @@ namespace FineUIPro.Web.Comprehensive
                             +@" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
                             +@" WHERE C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND C.CNProfessionalId=@CNProfessionalId";
@@ -286,7 +334,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DesignDrawingsMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.DesignDrawingsMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs
index 959e7f2..b62a4b6 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class DesignDrawings {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class DesignDrawings
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// sdrpCNProfessionalId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpCNProfessionalId;
-        
+
         /// <summary>
         /// stxtReceiveDate 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker stxtReceiveDate;
-        
+
         /// <summary>
         /// stxtSendDate 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker stxtSendDate;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx
index b5048bf..1cbed3b 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FinalFile.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.FinalFile" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,88 +11,102 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种设备管理" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="FinalFileId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="FinalFileId" AllowSorting="true"
-                    SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                <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="FinalFileId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="FinalFileId" AllowSorting="true"
+                            SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                                        </f:DropDownList>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="接收日期" ID="dpA"
+                                            LabelAlign="right" LabelWidth="90px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="发送日期" ID="dpB"
+                                            LabelAlign="right" LabelWidth="90px" Width="220px">
+                                        </f:DatePicker>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Hidden="true" Text="新增">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="320px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionName" DataField="InspectionName" FieldType="String" HeaderText="文件名称" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" HeaderText="文件日期" TextAlign="Center" RendererArgument="yyyy-MM-dd"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="250px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("FinalFileId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <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:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="接收日期" ID="dpA"
-                                    LabelAlign="right" LabelWidth="90px" Width="220px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="发送日期" ID="dpB"
-                                    LabelAlign="right" LabelWidth="90px" Width="220px">
-                                </f:DatePicker>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Hidden="true" Text="新增">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="320px">
-                        </f:RenderField>                        
-                        <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionName" DataField="InspectionName" FieldType="String" HeaderText="文件名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" HeaderText="文件日期" TextAlign="Center"   RendererArgument="yyyy-MM-dd"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="250px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("FinalFileId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <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>
+                            </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="800px" Height="320px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <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>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs
index d95e056..cdafb13 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs
@@ -9,6 +9,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class FinalFile : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,28 +35,66 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                GetButtonPower();
-                BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
-                var punit = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId);
-                if (CurrUser.UserId == Const.sysglyId || CommonService.GetProjectUnitType(this.CurrUser.LoginProjectId, this.CurrUser.UnitId) == BLL.Const.ProjectUnitType_1 || (punit != null && punit.UnitType == Const.ProjectUnitType_3))
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
+                    this.ProjectId = Request.Params["projectId"];
                 }
-                else
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
                 {
-                    sdrpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    sdrpUnitId.Enabled = false;
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
 
                 BindGrid();
             }
         }
 
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.ProjectId, true);
+            var punit = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.ProjectId, this.CurrUser.UnitId);
+            if (CurrUser.UserId == Const.sysglyId || CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) == BLL.Const.ProjectUnitType_1 || (punit != null && punit.UnitType == Const.ProjectUnitType_3))
+            {
+                BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.ProjectId, true);
+            }
+            else
+            {
+                sdrpUnitId.SelectedValue = this.CurrUser.UnitId;
+                sdrpUnitId.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>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT FinalFileId
                                   , a.ProjectId
                                   , a.UnitId
@@ -54,8 +108,8 @@ namespace FineUIPro.Web.Comprehensive
                               FROM dbo.Comprehensive_FinalFile a left join Base_Unit b on a.unitId=b.UnitId
                               where  a.ProjectId= @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            if (sdrpUnitId.SelectedValue != BLL.Const._Null)
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            if (this.sdrpUnitId.SelectedValue != null && this.sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND a.UnitId=@UnitId";
                 listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
@@ -215,7 +269,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.FinalFileMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.FinalFileMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.designer.cs
index 18e6d79..0ceb06f 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Comprehensive
         /// </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/CQMS/Comprehensive/NCRManagement.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
index 9f46d39..16816f9 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NCRManagement.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.NCRManagement" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,101 +11,115 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="NCR管理" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="NCRManagementId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="NCRCode"
-                    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="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                <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="NCR管理" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="NCRManagementId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="NCRCode"
+                            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="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
+                                        <f:TextBox runat="server" ID="txtNCRCode" Label="NCR单号" LabelAlign="Right"></f:TextBox>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Text="新增" Hidden="true">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Text="导入" Hidden="true">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="发出单位" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
+                                    HeaderTextAlign="Center" Width="280px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" Renderer="Date" HeaderText="下发日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitNames" Width="260px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnit")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="实施状态" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ClosedDate" DataField="ClosedDate" FieldType="Date" Renderer="Date" HeaderText="要求封闭日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" HeaderText="完成日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ResponsibleMan" DataField="ResponsibleMan" FieldType="String" HeaderText="责任人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("NCRManagementId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <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:DropDownList ID="drpProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
-                                <f:TextBox runat="server" ID="txtNCRCode" Label="NCR单号" LabelAlign="Right"></f:TextBox>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Text="新增" Hidden="true">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Text="导入" Hidden="true">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="发出单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="130px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
-                            HeaderTextAlign="Center" Width="280px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" Renderer="Date" HeaderText="下发日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="130px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitNames" Width="260px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnit")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="实施状态" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="130px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ClosedDate" DataField="ClosedDate" FieldType="Date" Renderer="Date" HeaderText="要求封闭日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" HeaderText="完成日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ResponsibleMan" DataField="ResponsibleMan" FieldType="String" HeaderText="责任人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("NCRManagementId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <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>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="NCR管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -114,7 +130,7 @@
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="700px" Height="560px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <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>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
index 35d3499..0d20b0a 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
@@ -10,6 +10,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class NCRManagement : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -20,14 +36,52 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                GetButtonPower();
-                BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
+                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();
+                }
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpProfessionalId, true);
                 BindGrid();
             }
         }
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDownList(this.sdrpUnitId, 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();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"select NCRManagementId, ProjectId, SendUnit,  NCRCode, Contents, IssuedDate, ReceiveUnit,Status,
                               ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState, 
                               CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName  
@@ -36,7 +90,7 @@ namespace FineUIPro.Web.Comprehensive
 							  left join Base_Unit u on u.UnitId = C.SendUnit
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND C.SendUnit=@UnitId";
@@ -271,7 +325,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.NCRManagementMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.NCRManagementMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs
index 6ddb245..624de8d 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class NCRManagement {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class NCRManagement
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// sdrpUnitId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpUnitId;
-        
+
         /// <summary>
         /// drpProfessionalId 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProfessionalId;
-        
+
         /// <summary>
         /// txtNCRCode 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtNCRCode;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx
index 03beb76..4ca88d8 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PressurePipe.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.PressurePipe" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,88 +11,102 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="压力管道管理" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="PressurePipeId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="PressurePipeId" AllowSorting="true"
-                    SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="所属单位" LabelAlign="Right">
+                <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="PressurePipeId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="PressurePipeId" AllowSorting="true"
+                            SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpUnitId" runat="server" Label="所属单位" LabelAlign="Right">
+                                        </f:DropDownList>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Text="新增" Hidden="true">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="320px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="EstimateNumber" DataField="EstimateNumber" FieldType="String" HeaderText="预计压力管道条数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ActualNumber" DataField="ActualNumber" FieldType="String" HeaderText="实际压力管道条数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="PackageNumber" DataField="PackageNumber" FieldType="String" HeaderText="试压包数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CompletePackageNumber" DataField="CompletePackageNumber" FieldType="String" HeaderText="已完成试压包数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="180px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="PressurePipeNumber" DataField="PressurePipeNumber" FieldType="String" HeaderText="已完成试压压力管道条数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="180px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="IssuedReportNumber" DataField="IssuedReportNumber" FieldType="String" HeaderText="已出具监检报告条数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="180px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("PressurePipeId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <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:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Text="新增" Hidden="true">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="320px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="EstimateNumber" DataField="EstimateNumber" FieldType="String" HeaderText="预计压力管道条数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ActualNumber" DataField="ActualNumber" FieldType="String" HeaderText="实际压力管道条数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="PackageNumber" DataField="PackageNumber" FieldType="String" HeaderText="试压包数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="CompletePackageNumber" DataField="CompletePackageNumber" FieldType="String" HeaderText="已完成试压包数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="180px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="PressurePipeNumber" DataField="PressurePipeNumber" FieldType="String" HeaderText="已完成试压压力管道条数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="180px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="IssuedReportNumber" DataField="IssuedReportNumber" FieldType="String" HeaderText="已出具监检报告条数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="180px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("PressurePipeId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <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>
+                            </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="900px" Height="320px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <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>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs
index 505f3b6..7cc3ac1 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs
@@ -11,6 +11,20 @@ namespace FineUIPro.Web.Comprehensive
     {
         #region 定义变量
         /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        /// <summary>
         /// 主键
         /// </summary>
         public string PressurePipeId
@@ -36,24 +50,61 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                GetButtonPower();
-                BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
+                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();
+                }
                 BindGrid();
             }
         }
 
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDownList(this.sdrpUnitId, 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();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 数据绑定
         /// </summary>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"select PressurePipeId, EstimateNumber, ActualNumber, PackageNumber, Status,
                               CompletePackageNumber, PressurePipeNumber, IssuedReportNumber, CompileMan,U.UnitName 
                               from Comprehensive_PressurePipe C 
                                left join Base_Unit U on C.UnitId=U.UnitId
                               where C.Projctid = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND C.UnitId=@UnitId";
@@ -204,7 +255,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PressurePipeMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.PressurePipeMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.designer.cs
index 0890d19..7611671 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class PressurePipe {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class PressurePipe
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// sdrpUnitId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpUnitId;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs
index fa014f2..c60d586 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs
@@ -56,7 +56,6 @@ namespace FineUIPro.Web.Comprehensive
         }
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
             this.BindGrid();
 
@@ -71,24 +70,25 @@ namespace FineUIPro.Web.Comprehensive
         /// </summary>
         public void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.ProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                string strSql = @"select QualityAccidentId, time, Place, DirectEconomicLoss, RemedialMeasures,Status,
+                return;
+            }
+            string strSql = @"select QualityAccidentId, time, Place, DirectEconomicLoss, RemedialMeasures,Status,
                               ResponsibilityDetermination, CorrectiveActions, AttachUrl, CompileMan, CompileDate, 
                               UnitWorkId,U.UnitName 
                               from Comprehensive_QualityAccident C 
                                left join Base_Unit U on C.UnitId=U.UnitId
                               where C.ProjectId = @ProjectId";
-                List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
-                SqlParameter[] parameter = listStr.ToArray();
-                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                Grid1.RecordCount = tb.Rows.Count;
-                //tb = GetFilteredTable(Grid1.FilteredData, tb);
-                var table = this.GetPagedDataTable(Grid1, tb);
-                Grid1.DataSource = table;
-                Grid1.DataBind();
-            }  
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
         }
         #endregion
 
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualitySampleFirstAccFile.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualitySampleFirstAccFile.aspx.cs
index c050454..911bd8d 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualitySampleFirstAccFile.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/QualitySampleFirstAccFile.aspx.cs
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.Comprehensive
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
@@ -53,11 +53,10 @@ namespace FineUIPro.Web.Comprehensive
                     this.GetButtonPower();
                 }
 
-                GetList();
                 BindGrid();
             }
         }
-        private void GetList()
+        private void InitDownList()
         {
             BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.ProjectId, true);
             var punit = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.ProjectId, this.CurrUser.UnitId);
@@ -73,25 +72,26 @@ namespace FineUIPro.Web.Comprehensive
         }
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
-            GetList();
-            this.BindGrid();
+            this.InitDownList();
 
             this.GetButtonPower();
             if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
             {
                 btnNew.Hidden = true;
             }
+            this.BindGrid();
         }
         /// <summary>
         /// 数据绑定
         /// </summary>
         public void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.ProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                string strSql = @"SELECT QualitySampleFirstAccFileId
+                return;
+            }
+            string strSql = @"SELECT QualitySampleFirstAccFileId
                                   , a.ProjectId
                                   , a.UnitId
 	                              ,b.UnitName
@@ -103,33 +103,33 @@ namespace FineUIPro.Web.Comprehensive
                                   ,Remark
                               FROM dbo.Comprehensive_QualitySampleFirstAccFile a left join Base_Unit b on a.unitId=b.UnitId
                               where  a.ProjectId= @ProjectId";
-                List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
-                if (sdrpUnitId.SelectedValue != BLL.Const._Null)
-                {
-                    strSql += " AND a.UnitId=@UnitId";
-                    listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
-                }
-                if (!string.IsNullOrEmpty(this.dpA.Text.Trim()))
-                {
-                    strSql += " AND a.InspectionDate>=@ReceiveDate";
-                    listStr.Add(new SqlParameter("@ReceiveDate", dpA.Text.Trim()));
-                }
-                if (!string.IsNullOrEmpty(this.dpB.Text.Trim()))
-                {
-                    strSql += " AND a.InspectionDate<=@SendDate";
-                    listStr.Add(new SqlParameter("@SendDate", dpB.Text.Trim()));
-                }
-                SqlParameter[] parameter = listStr.ToArray();
-                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                Grid1.RecordCount = tb.Rows.Count;
-                //tb = GetFilteredTable(Grid1.FilteredData, tb);
-                var table = this.GetPagedDataTable(Grid1, tb);
-                Grid1.DataSource = table;
-                Grid1.DataBind();
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            if (sdrpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND a.UnitId=@UnitId";
+                listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
             }
-            
+            if (!string.IsNullOrEmpty(this.dpA.Text.Trim()))
+            {
+                strSql += " AND a.InspectionDate>=@ReceiveDate";
+                listStr.Add(new SqlParameter("@ReceiveDate", dpA.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.dpB.Text.Trim()))
+            {
+                strSql += " AND a.InspectionDate<=@SendDate";
+                listStr.Add(new SqlParameter("@SendDate", dpB.Text.Trim()));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
         }
+
         #endregion
 
         #region 分页、排序
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
index 466b7b0..05a88e0 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SpecialEquipment.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.SpecialEquipment" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,87 +11,101 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种设备管理" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="SpecialEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="SpecialEquipmentId" AllowSorting="true"
-                    SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="所属单位" LabelAlign="Right">
+                <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="SpecialEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="SpecialEquipmentId" AllowSorting="true"
+                            SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpUnitId" runat="server" Label="所属单位" LabelAlign="Right">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpEquipmentId" runat="server" Label="设备名称" LabelAlign="Right">
+                                        </f:DropDownList>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Text="新增" Hidden="true">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="320px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName" FieldType="String" HeaderText="设备名称" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SunNumber" DataField="SunNumber" FieldType="String" HeaderText="总数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InformNumber" DataField="InformNumber" FieldType="String" HeaderText="告知数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SubmitDataNumber" DataField="SubmitDataNumber" FieldType="String" HeaderText="提交资料数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="MonitoringReportNumber" DataField="MonitoringReportNumber" FieldType="String" HeaderText="监检报告数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("SpecialEquipmentId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <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:DropDownList ID="drpEquipmentId" runat="server" Label="设备名称" LabelAlign="Right">
-                                </f:DropDownList>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Text="新增" Hidden="true">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="320px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName" FieldType="String" HeaderText="设备名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SunNumber" DataField="SunNumber" FieldType="String" HeaderText="总数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InformNumber" DataField="InformNumber" FieldType="String" HeaderText="告知数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SubmitDataNumber" DataField="SubmitDataNumber" FieldType="String" HeaderText="提交资料数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="MonitoringReportNumber" DataField="MonitoringReportNumber" FieldType="String" HeaderText="监检报告数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="160px">
-                        </f:RenderField>  
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("SpecialEquipmentId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <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>
+                            </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="800px" Height="320px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <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>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
index 77d5368..17bdaf7 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
@@ -9,6 +9,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class SpecialEquipment :PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,18 +35,55 @@ namespace FineUIPro.Web.Comprehensive
         {
             if (!IsPostBack)
             {
-                GetButtonPower();
-                BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
+                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();
+                }
                 BLL.SpecialEquipmentService.InitSpecialEquipmentDropDownList(this.drpEquipmentId, true, true);
                 BindGrid();
             }
         }
-                           
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDownList(this.sdrpUnitId, 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();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 数据绑定
         /// </summary>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"select C.SpecialEquipmentId, ProjectId,C.EquipmentId, SunNumber, Status,
                               InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName    
                               from Comprehensive_SpecialEquipment C 
@@ -38,7 +91,7 @@ namespace FineUIPro.Web.Comprehensive
 							  left join Base_SpecialEquipment eq on eq.SpecialEquipmentId = C.EquipmentId
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND C.UnitId=@UnitId";
@@ -194,7 +247,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SpecialEquipmentsMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.SpecialEquipmentsMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs
index 1969bde..531f50d 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class SpecialEquipment {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class SpecialEquipment
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// sdrpUnitId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpUnitId;
-        
+
         /// <summary>
         /// drpEquipmentId 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpEquipmentId;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
index fc76935..e9dc840 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainingRecords.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.TrainingRecords" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,77 +11,91 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="TrainingRecordsId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="TrainingRecordsId" AllowSorting="true"
-                    SortField="RemarkCode" 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="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right"></f:DropDownList>
-                                <f:TextBox ID="txtTrainingContents" runat="server" Label="培训内容" LabelAlign="Right"></f:TextBox>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
-                                </f:Button>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
-                                </f:Button>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="TrainingContents" DataField="TrainingContents" FieldType="String" HeaderText="培训内容" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="300px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="TrainingObject" DataField="TrainingObject" FieldType="String" HeaderText="培训对象" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="TrainingAddress" DataField="TrainingAddress" FieldType="String" HeaderText="培训地点" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Hours" DataField="Hours" FieldType="String" HeaderText="课时（小时）" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="KeynoteSpeaker" DataField="KeynoteSpeaker" FieldType="String" HeaderText="主讲人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <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" DataKeyNames="TrainingRecordsId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="TrainingRecordsId" AllowSorting="true"
+                            SortField="RemarkCode" 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="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right"></f:DropDownList>
+                                        <f:TextBox ID="txtTrainingContents" runat="server" Label="培训内容" LabelAlign="Right"></f:TextBox>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
+                                        </f:Button>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnNew" Icon="Add" ToolTip="新增" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="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 ColumnID="TrainingContents" DataField="TrainingContents" FieldType="String" HeaderText="培训内容" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="300px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TrainingObject" DataField="TrainingObject" FieldType="String" HeaderText="培训对象" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TrainingAddress" DataField="TrainingAddress" FieldType="String" HeaderText="培训地点" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Hours" DataField="Hours" FieldType="String" HeaderText="课时（小时）" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="KeynoteSpeaker" DataField="KeynoteSpeaker" FieldType="String" HeaderText="主讲人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <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/CQMS/Comprehensive/TrainingRecords.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs
index a47b80f..9fa53d0 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs
@@ -1,19 +1,31 @@
 ﻿using BLL;
-using RestSharp.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.CQMS.Comprehensive
 {
     public partial class TrainingRecords : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -24,17 +36,50 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         {
             if (!IsPostBack)
             {
-                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();
+                }
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
                 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>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT C.TrainingRecordsId, 
                                      C.ProjectId,
                                      C.TrainingContents, 
@@ -50,7 +95,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             + @" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
                             + @" WHERE C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (drpCNProfessionalId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND C.CNProfessionalId=@CNProfessionalId";
@@ -213,6 +258,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// <param name="e"></param>
         protected void btnOut_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string rootPath = Server.MapPath("~/");
             string initTemplatePath = Const.CQMS_TrainingRecordsTemplateUrl;
             string uploadfilepath = string.Empty;
@@ -220,7 +270,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             uploadfilepath = rootPath + initTemplatePath;
 
             var lists = (from x in Funs.DB.Comprehensive_TrainingRecords
-                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         where x.ProjectId == this.ProjectId
                          select x);
             if (drpCNProfessionalId.SelectedValue != BLL.Const._Null)
             {
@@ -233,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             lists = lists.OrderBy(x => x.RemarkCode);
             if (lists != null)
             {
-                string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
+                string projectName = BLL.ProjectService.GetShortNameByProjectId(this.ProjectId);
                 newUrl = uploadfilepath.Replace("培训记录导入模板", "培训记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
                 File.Copy(uploadfilepath, newUrl);
                 // 第一步：读取文件流
@@ -342,7 +392,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.TrainingRecordsMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.TrainingRecordsMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs
index e61880b..afc6c33 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Comprehensive {
-    
-    
-    public partial class TrainingRecords {
-        
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class TrainingRecords
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// drpCNProfessionalId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessionalId;
-        
+
         /// <summary>
         /// txtTrainingContents 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTrainingContents;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
index d0729ec..5147edd 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
@@ -53,11 +53,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     this.GetButtonPower();
                 }
               
-                GetList();
+                InitDownList();
                 BindGrid();
             }
         }
-        private void GetList()
+        private void InitDownList()
         {
             BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
             UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.ProjectId, true);
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         {
 
             this.ProjectId = this.ucTree.ProjectId;
-            GetList();
+            InitDownList();
             this.BindGrid();
 
             this.GetButtonPower(); 
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
index 710a0b5..f9301fb 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
@@ -54,11 +54,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     ////权限按钮方法
                     this.GetButtonPower();
                 } 
-                GetList();
                 BindGrid();
             }
         }
-        private void GetList()
+        private void InitDownList()
         {
             BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
             UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.ProjectId, true);
@@ -66,16 +65,14 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         }
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
-            GetList();
-            this.BindGrid();
-
+            this.InitDownList();
             this.GetButtonPower();
             if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
             {
                 btnNew.Hidden = true;
             }
+            this.BindGrid();
         }
         /// <summary>
         /// 数据绑定
@@ -297,7 +294,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         BLL.InspectionManagementService.DeleteInspectionManagement(rowID);
                     }
                 }
-                //Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.QualityAcceptance);
+                //Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.QualityAcceptance);
                 BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
