diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
index e8713c3..db84845 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionEquipment.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.InspectionEquipment" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,105 +11,119 @@
 </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="InspectionEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="InspectionCode"
-                    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="报验单位" LabelWidth="100px" 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" ForceFit="true"
+                            runat="server" BoxFlex="1" DataKeyNames="InspectionEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="InspectionCode"
+                            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="报验单位" LabelWidth="100px" LabelAlign="Right">
+                                        </f:DropDownList>
+                                        <f:TextBox runat="server" ID="stxtInspectionName" Label="名称" LabelWidth="60px" LabelAlign="Right"></f:TextBox>
+                                        <f:DatePicker runat="server" Label="报验日期" ID="txtStarTime" LabelAlign="Right"
+                                            LabelWidth="100px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label1" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="110px">
+                                        </f:DatePicker>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_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="220px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="EquipmentNO" DataField="EquipmentNO" FieldType="String" HeaderText="设备位号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionName" DataField="InspectionName" FieldType="String" HeaderText="名称" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Specifications" DataField="Specifications" FieldType="String" HeaderText="规格（范围）" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Supplier" DataField="Supplier" FieldType="String" HeaderText="供货厂商" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Counts" DataField="Counts" FieldType="String" HeaderText="本次数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SamplingCount" DataField="SamplingCount" FieldType="String" HeaderText="本次抽检数量" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SamplingResult" DataField="SamplingResult" FieldType="String" HeaderText="本次抽检结果" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="UsedPlace" DataField="UsedPlace" 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("InspectionEquipmentId")) %>' 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:TextBox runat="server" ID="stxtInspectionName" Label="名称" LabelWidth="60px" LabelAlign="Right"></f:TextBox>
-                                <f:DatePicker runat="server" Label="报验日期" ID="txtStarTime" LabelAlign="Right"
-                                    LabelWidth="100px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="110px">
-                                </f:DatePicker>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true" Text="新增">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_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="220px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="EquipmentNO" DataField="EquipmentNO" FieldType="String" HeaderText="设备位号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionName" DataField="InspectionName" FieldType="String" HeaderText="名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Specifications" DataField="Specifications" FieldType="String" HeaderText="规格（范围）" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Supplier" DataField="Supplier" FieldType="String" HeaderText="供货厂商" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Counts" DataField="Counts" FieldType="String" HeaderText="本次数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SamplingCount" DataField="SamplingCount" FieldType="String" HeaderText="本次抽检数量" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SamplingResult" DataField="SamplingResult" FieldType="String" HeaderText="本次抽检结果" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="UsedPlace" DataField="UsedPlace" 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("InspectionEquipmentId")) %>' 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"
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs
index bd8654c..38c7226 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs
@@ -9,6 +9,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class InspectionEquipment : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,17 +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();
+                }
                 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 InspectionEquipmentId,ProjectId,C.UnitId,Status, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications,
                               Supplier,Counts,SamplingCount,(CASE WHEN SamplingResult=1 THEN '合格' WHEN SamplingResult=0 THEN '不合格' ELSE '' END) AS SamplingResult,
                               InspectionDate,AttachUrl,Attribute,RemarkCode,UsedPlace,EquipmentNO from Comprehensive_InspectionEquipment C 
@@ -37,8 +91,8 @@ 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));
-            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 C.UnitId=@UnitId";
                 listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
@@ -214,7 +268,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.InspectionEquipmentMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.InspectionEquipmentMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -270,31 +324,31 @@ namespace FineUIPro.Web.Comprehensive
 
 
         public static string ConvertState(object Status)
-        { 
-                if (Status != null)
+        {
+            if (Status != null)
+            {
+                if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile)
                 {
-                    if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile)
-                    {
-                        return "重报";
-                    }
-                    else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect)
-                    {
-                        return "驳回";
-                    }
-                    else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile)
-                    {
-                        return "编制";
-                    }
-                    else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit)
-                    {
-                        return "待审批";
-                    }
-                    else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete)
-                    {
-                        return "审批完成";
-                    }
+                    return "重报";
                 }
-            
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect)
+                {
+                    return "驳回";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile)
+                {
+                    return "编制";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit)
+                {
+                    return "待审批";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete)
+                {
+                    return "审批完成";
+                }
+            }
+
             return "编制";
         }
 
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs
index b330a99..0b8a454 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class InspectionEquipment {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class InspectionEquipment
+    {
+
         /// <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>
         /// stxtInspectionName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtInspectionName;
-        
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <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/InspectionMachine.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
index 872e4eb..ecd08d1 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionMachine.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.InspectionMachine" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,105 +11,119 @@
 </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" EnableAjax="false" ShowHeader="false" Title="机具报验" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange"
-                    runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="InspectionMachineCode"
-                    SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
-                    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" EnableAjax="false" ShowHeader="false" Title="机具报验" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange"
+                            runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="InspectionMachineCode"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            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="sdrpCNProfessional" Label="专业" runat="server" CssClass="textboxStyle" LabelAlign="Right" LabelWidth="60px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="sdrpType" runat="server" CssClass="textboxStyle" Label="类型" LabelAlign="Right" LabelWidth="60px">
+                                            <f:ListItem Text="-请选择-" Selected="true"></f:ListItem>
+                                            <f:ListItem Value="施工" Text="施工"></f:ListItem>
+                                            <f:ListItem Value="计量" Text="计量"></f:ListItem>
+                                        </f:DropDownList>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true" Text="导入">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
+                                    <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="220px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionMachineCode" DataField="InspectionMachineCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionMachineName" DataField="InspectionMachineName" 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="InspectionType" DataField="InspectionType" FieldType="String" HeaderText="类型" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SpecificationModel" DataField="SpecificationModel" FieldType="String" HeaderText="规格型号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="NextTestDate" DataField="NextTestDate" FieldType="Date" Renderer="Date" HeaderText="下次检验日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TestCycle" DataField="TestCycle" FieldType="String" HeaderText="检验周期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="IsVerification" DataField="IsVerification" FieldType="String" HeaderText="在校验期内" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="IsCheckOK" DataField="IsCheckOK" FieldType="String" HeaderText="校验合格" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="UnitsCount" DataField="UnitsCount" FieldType="String" HeaderText="台数" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="LeaveDate" DataField="LeaveDate" 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("InspectionMachineId")) %>' 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:DropDownList ID="sdrpCNProfessional" Label="专业" runat="server" CssClass="textboxStyle" LabelAlign="Right" LabelWidth="60px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="sdrpType" runat="server" CssClass="textboxStyle" Label="类型" LabelAlign="Right" LabelWidth="60px">
-                                    <f:ListItem Text="-请选择-" Selected="true"></f:ListItem>
-                                    <f:ListItem Value="施工" Text="施工"></f:ListItem>
-                                    <f:ListItem Value="计量" Text="计量"></f:ListItem>
-                                </f:DropDownList>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true" Text="新增">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true" Text="导入">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
-                            <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="220px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionMachineCode" DataField="InspectionMachineCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionMachineName" DataField="InspectionMachineName" 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="InspectionType" DataField="InspectionType" FieldType="String" HeaderText="类型" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SpecificationModel" DataField="SpecificationModel" FieldType="String" HeaderText="规格型号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="NextTestDate" DataField="NextTestDate" FieldType="Date" Renderer="Date" HeaderText="下次检验日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="TestCycle" DataField="TestCycle" FieldType="String" HeaderText="检验周期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="IsVerification" DataField="IsVerification" FieldType="String" HeaderText="在校验期内" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="IsCheckOK" DataField="IsCheckOK" FieldType="String" HeaderText="校验合格" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="UnitsCount" DataField="UnitsCount" FieldType="String" HeaderText="台数" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="LeaveDate" DataField="LeaveDate" 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("InspectionMachineId")) %>'   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"
@@ -118,7 +134,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/InspectionMachine.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs
index be75257..d8c58fe 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs
@@ -8,7 +8,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class InspectionMachine : PageBase
     {
-
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,18 +34,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.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessional, 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 InspectionMachineId, InspectionMachineCode, U.UnitName,CN.ProfessionalName ,Status,
                               InspectionMachineName, SpecificationModel, NextTestDate, TestCycle, C.InspectionDate,
                               InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification,(CASE WHEN IsCheckOK=1 THEN '是' WHEN IsCheckOK=0 THEN '否' ELSE '' END) AS IsCheckOK, InspectionType, LeaveDate, UnitsCount  
@@ -39,7 +91,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 (sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND C.UnitId=@UnitId";
@@ -182,7 +234,7 @@ namespace FineUIPro.Web.Comprehensive
                         BLL.InspectionMachineService.DeleteInspectionMachine(rowID);
                     }
                 }
-                //Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.MeasuringInstruments);
+                //Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.MeasuringInstruments);
                 BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
@@ -213,7 +265,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.InspectionMachineMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.InspectionMachineMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.designer.cs
index 5e344c9..0cdceeb 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class InspectionMachine {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class InspectionMachine
+    {
+
         /// <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>
         /// sdrpCNProfessional 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpCNProfessional;
-        
+
         /// <summary>
         /// sdrpType 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpType;
-        
+
         /// <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>
         /// 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/InspectionPerson.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
index 8d43de7..f66d096 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionPerson.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.InspectionPerson" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,106 +11,120 @@
 </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="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="InspectionPersonCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right" LabelWidth="100px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="sdrpPost" runat="server" Label="工种" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
-                                <f:TextBox runat="server" ID="stxtPersonName" Label="姓名" LabelAlign="Right" LabelWidth="60px"></f:TextBox>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询" 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">
-                            <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="220px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="InspectionPersonCode" DataField="InspectionPersonCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitWorkName" Width="110px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="PostName" DataField="PostName" FieldType="String" HeaderText="工种" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="100px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="姓名" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="CertificateNumber" DataField="CertificateNumber" FieldType="String" HeaderText="证书编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="QualifiedProjectCode" DataField="QualifiedProjectCode" FieldType="String" HeaderText="合格项目代号（级别）" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ValidityDate" DataField="ValidityDate" FieldType="Date" Renderer="Date" HeaderText="有效期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalTime" DataField="ApprovalTime" FieldType="Date" Renderer="Date" HeaderText="批准时间" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                               <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员报验" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="InspectionPersonCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right" LabelWidth="100px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="sdrpPost" runat="server" Label="工种" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
+                                        <f:TextBox runat="server" ID="stxtPersonName" Label="姓名" LabelAlign="Right" LabelWidth="60px"></f:TextBox>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询" 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">
+                                    <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="220px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="InspectionPersonCode" DataField="InspectionPersonCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitWorkName" Width="110px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="PostName" DataField="PostName" FieldType="String" HeaderText="工种" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="姓名" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CertificateNumber" DataField="CertificateNumber" FieldType="String" HeaderText="证书编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="QualifiedProjectCode" DataField="QualifiedProjectCode" FieldType="String" HeaderText="合格项目代号（级别）" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ValidityDate" DataField="ValidityDate" FieldType="Date" Renderer="Date" HeaderText="有效期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ApprovalTime" DataField="ApprovalTime" FieldType="Date" Renderer="Date" HeaderText="批准时间" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="110px">
+                                </f:RenderField>
+                                <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>--%>
-                         
-                        <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("InspectionPersonId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:LinkButtonField TextAlign="Center" HeaderText="焊工资质"
-                            ColumnID="lbfAction1" Width="80px" CommandName="Action1" Text="资质条件" />
-                    </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:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                            Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:LinkButtonField TextAlign="Center" HeaderText="焊工资质"
+                                    ColumnID="lbfAction1" Width="80px" CommandName="Action1" Text="资质条件" />
+                            </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"
@@ -120,10 +136,10 @@
             Width="700px" Height="560px">
         </f:Window>
         <f:Window ID="Window3" Title="编辑焊工资质信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" 
+            Target="Parent" EnableResize="false" runat="server" IsModal="true"
             Width="1100px" Height="650px">
         </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/InspectionPerson.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs
index 7242693..7be088e 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class InspectionPerson : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -18,18 +34,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.PostService.InitPostDownList(this.sdrpPost, 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 InspectionPersonId, InspectionPersonCode, PersonName, Status,
                               CertificateNumber, QualifiedProjectCode, ValidityDate, ApprovalTime, 
                               DepartureTime, AttachUrl,CompileMan, CompileDate, 
@@ -40,7 +93,7 @@ namespace FineUIPro.Web.Comprehensive
                               left join Base_WorkPost P on C.PostId=P.WorkPostId
                               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";
@@ -183,8 +236,8 @@ namespace FineUIPro.Web.Comprehensive
                         BLL.InspectionPersonService.DeleteInspectionPerson(rowID);
                     }
                 }
-                //Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.QualityTraining);
-                //Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.ManagerData);
+                //Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.QualityTraining);
+                //Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.ManagerData);
                 BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
@@ -247,7 +300,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.InspectionPersonMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.InspectionPersonMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs
index 9131f5c..212d3b4 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class InspectionPerson {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class InspectionPerson
+    {
+
         /// <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>
         /// sdrpPost 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpPost;
-        
+
         /// <summary>
         /// stxtPersonName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtPersonName;
-        
+
         /// <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>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Window3 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
-        
+
         /// <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/WBS/ProjectControlPoint.aspx b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
index 2c21528..a0ba5c0 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectControlPoint.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.ProjectControlPoint" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>现场控制点裁剪</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
@@ -24,7 +26,17 @@
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
         <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                <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="panelLeftRegion2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
                     RegionPercent="20%" Title="现场控制点裁剪" TitleToolTip="现场控制点裁剪" ShowBorder="true" ShowHeader="true"
                     BodyPadding="10px">
                     <Items>
@@ -146,7 +158,7 @@
             Target="Self" EnableResize="false" runat="server" OnClose="Window3_Close" IsModal="true"
             Width="1000px" Height="600px">
         </f:Window>
-         <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
@@ -157,9 +169,9 @@
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true" Icon="Pencil"
                 runat="server" Text="修改">
             </f:MenuButton>
-                    <f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" Hidden="true" Icon="DatabaseCopy"
-            runat="server" Text="拷贝" >
-        </f:MenuButton>
+            <f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" Hidden="true" Icon="DatabaseCopy"
+                runat="server" Text="拷贝">
+            </f:MenuButton>
             <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true" Icon="Delete"
                 ConfirmText="确认删除选中项？" ConfirmTarget="Top" runat="server" Text="删除">
             </f:MenuButton>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
index 4f7b7cf..1794cc1 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
@@ -15,6 +15,22 @@ namespace FineUIPro.Web.CQMS.WBS
 {
     public partial class ProjectControlPoint : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         /// <summary>
         /// 被选择项列表
         /// </summary>
@@ -55,9 +71,23 @@ namespace FineUIPro.Web.CQMS.WBS
         {
             if (!IsPostBack)
             {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.SelectedList = new List<string>();
                 this.NoSelectedList = new List<string>();
-                GetButtonPower();
+                //GetButtonPower();
                 InitTreeMenu();
                 this.Grid1.Columns[2].Hidden = false;
                 this.Grid1.Columns[3].Hidden = true;
@@ -75,17 +105,37 @@ namespace FineUIPro.Web.CQMS.WBS
 
         #region  加载树
         /// <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.InitTreeMenu();
+        }
+        /// <summary>
         /// 加载树
         /// </summary>
         private void InitTreeMenu()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             this.trWBS.Nodes.Clear();
             this.trWBS.ShowBorder = false;
             this.trWBS.ShowHeader = false;
             this.trWBS.EnableIcons = true;
             this.trWBS.AutoScroll = true;
             this.trWBS.EnableSingleClickExpand = true;
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.ProjectId orderby x.UnitWorkCode select x;
             foreach (var q in unitWorks)
             {
                 TreeNode newNode = new TreeNode();
@@ -202,7 +252,7 @@ namespace FineUIPro.Web.CQMS.WBS
                     cNProfessionalId = e.NodeID.Split('|')[1];
                 }
                 var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                 where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                 where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                  orderby x.SortIndex
                                  select x).ToList();
                 foreach (var q in divisions)
@@ -221,7 +271,7 @@ namespace FineUIPro.Web.CQMS.WBS
                         newNode.Checked = true;
                     }
                     var list = (from x in Funs.DB.WBS_DivisionProject
-                                where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+                                where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.ProjectId
                                 orderby x.SortIndex
                                 select x).ToList();
                     if (list.Count > 0)
@@ -237,7 +287,7 @@ namespace FineUIPro.Web.CQMS.WBS
             else if (e.Node.CommandName == "DivisionProject")   //展开分部节点
             {
                 var childDivisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                      where x.SuperDivisionId == e.Node.NodeID && x.ProjectId == this.CurrUser.LoginProjectId
+                                      where x.SuperDivisionId == e.Node.NodeID && x.ProjectId == this.ProjectId
                                       orderby x.SortIndex
                                       select x).ToList();
                 foreach (var q in childDivisions)
@@ -256,7 +306,7 @@ namespace FineUIPro.Web.CQMS.WBS
                         newNode.Checked = true;
                     }
                     var list = (from x in Funs.DB.WBS_DivisionProject
-                                where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+                                where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.ProjectId
                                 orderby x.SortIndex
                                 select x).ToList();
                     if (list.Count > 0)
@@ -279,7 +329,11 @@ namespace FineUIPro.Web.CQMS.WBS
         /// <param name="e"></param>
         protected void trWBS_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e)
         {
-            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnSave))
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+            if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnSave))
             {
                 Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(e.NodeID);
                 divisionProject.IsSelected = e.Checked;
@@ -425,7 +479,7 @@ namespace FineUIPro.Web.CQMS.WBS
         {
             if (this.trWBS.SelectedNode != null)
             {
-                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnModify))
+                if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnModify))
                 {
                     if (this.trWBS.SelectedNode.CommandName != "ProjectType" && this.trWBS.SelectedNode.CommandName != "UnitWork" && this.trWBS.SelectedNode.CommandName != "CNProfessional")   //非工程类型和单位工程、专业节点可以修改
                     {
@@ -483,7 +537,7 @@ namespace FineUIPro.Web.CQMS.WBS
         {
             if (this.trWBS.SelectedNode != null)
             {
-                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnAdd))
+                if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnAdd))
                 {
                     if (this.trWBS.SelectedNode.CommandName != "ProjectType" && this.trWBS.SelectedNode.CommandName != "UnitWork")   //非工程类型和单位工程节点可以增加
                     {
@@ -517,12 +571,12 @@ namespace FineUIPro.Web.CQMS.WBS
         {
             if (this.trWBS.SelectedNode != null)
             {
-                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnDelete))
+                if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnDelete))
                 {
                     if (this.trWBS.SelectedNode.CommandName != "ProjectType" && this.trWBS.SelectedNode.CommandName != "UnitWork" && this.trWBS.SelectedNode.CommandName != "CNProfessional")   //非工程类型和单位工程、专业节点可以删除
                     {
                         string id = this.trWBS.SelectedNodeID;
-                        //var workPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InitWorkPackageCode == this.trWBS.SelectedNodeID);
+                        //var workPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.InitWorkPackageCode == this.trWBS.SelectedNodeID);
                         //if (workPackage != null)
                         //{
                         //    ShowNotify("WBS定制中已使用该数据，无法删除！", MessageBoxIcon.Warning);
@@ -605,8 +659,8 @@ namespace FineUIPro.Web.CQMS.WBS
                         }
                         BLL.DivisionProjectService.DeleteDivisionProject(divisionProjectId);
                     }
-                    // Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.QualityControlPoint);
-                    // Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.ProjectDivision);
+                    // Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.QualityControlPoint);
+                    // Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.ProjectDivision);
                 }
                 BLL.LogService.AddSys_Log(this.CurrUser, id, id, BLL.Const.ProjectControlPointMenuId, "删除分部或子分部工程及其下所有内容！");
             }
@@ -710,7 +764,7 @@ namespace FineUIPro.Web.CQMS.WBS
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            //var controlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InitControlItemCode == Grid1.SelectedRowID);
+            //var controlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.InitControlItemCode == Grid1.SelectedRowID);
             //if (controlItemAndCycle != null)
             //{
             //    ShowNotify("WBS定制中已使用该数据，无法删除！", MessageBoxIcon.Warning);
@@ -718,8 +772,8 @@ namespace FineUIPro.Web.CQMS.WBS
             //else
             //{
             BLL.BreakdownProjectService.DeleteBreakdown(Grid1.SelectedRowID);
-            //Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.QualityControlPoint);
-            //Project_CQMSDataService.StatisticalData(this.CurrUser.LoginProjectId, Project_CQMSDataService.CQMSDateType.ProjectDivision);
+            //Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.QualityControlPoint);
+            //Project_CQMSDataService.StatisticalData(this.ProjectId, Project_CQMSDataService.CQMSDateType.ProjectDivision);
             BLL.LogService.AddSys_Log(this.CurrUser, Grid1.SelectedRowID, Grid1.SelectedRowID, BLL.Const.ProjectControlPointMenuId, "删除分项");
             Grid1.DataBind();
             BindGrid();
@@ -773,12 +827,16 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL,CheckAcceptType"
                      + @" FROM WBS_BreakdownProject ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " where DivisionProjectId = @DivisionProjectId and ProjectId=@ProjectId";
             listStr.Add(new SqlParameter("@DivisionProjectId", this.trWBS.SelectedNodeID));
-            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);
 
@@ -868,7 +926,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                 if (trWBS.Nodes[i].Nodes[j].NodeID.Split('|')[1] == "1")  //建筑工程
                                 {
                                     var divisionsCV = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                       where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                       where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                        orderby x.SortIndex
                                                        select x).ToList();
                                     if (divisionsCV.Count > 0)   //建筑工程下存在土建内容
@@ -882,7 +940,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                         trWBS.Nodes[i].Nodes[j].Nodes.Add(newNode3);
                                         newNode3.Expanded = true;
                                         var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                          orderby x.SortIndex
                                                          select x).ToList();
                                         foreach (var q in divisions)
@@ -899,7 +957,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                             }
                                             newNode3.Nodes.Add(newNode4);
                                             var division1s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == q.DivisionProjectId
+                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == q.DivisionProjectId
                                                               orderby x.SortIndex
                                                               select x).ToList();
                                             if (list.Contains(q.DivisionProjectId))
@@ -915,7 +973,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                     newNode5.EnableClickEvent = true;
                                                     newNode4.Nodes.Add(newNode5);
                                                     var division2s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                      where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division1.DivisionProjectId
+                                                                      where x.ProjectId == this.ProjectId && x.SuperDivisionId == division1.DivisionProjectId
                                                                       orderby x.SortIndex
                                                                       select x).ToList();
                                                     if (list.Contains(division1.DivisionProjectId))
@@ -931,7 +989,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                             newNode6.EnableClickEvent = true;
                                                             newNode5.Nodes.Add(newNode6);
                                                             var division3s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division2.DivisionProjectId
+                                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == division2.DivisionProjectId
                                                                               orderby x.SortIndex
                                                                               select x).ToList();
                                                             if (list.Contains(division2.DivisionProjectId))
@@ -977,7 +1035,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                     else
                                     {
                                         var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalConstructId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalConstructId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                          orderby x.SortIndex
                                                          select x).ToList();
                                         foreach (var q in divisions)
@@ -994,7 +1052,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                 newNode4.Checked = true;
                                             }
                                             var division1s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == q.DivisionProjectId
+                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == q.DivisionProjectId
                                                               orderby x.SortIndex
                                                               select x).ToList();
                                             if (list.Contains(q.DivisionProjectId))
@@ -1010,7 +1068,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                     newNode5.EnableClickEvent = true;
                                                     newNode4.Nodes.Add(newNode5);
                                                     var division2s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                      where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division1.DivisionProjectId
+                                                                      where x.ProjectId == this.ProjectId && x.SuperDivisionId == division1.DivisionProjectId
                                                                       orderby x.SortIndex
                                                                       select x).ToList();
                                                     if (list.Contains(division1.DivisionProjectId))
@@ -1026,7 +1084,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                             newNode6.EnableClickEvent = true;
                                                             newNode5.Nodes.Add(newNode6);
                                                             var division3s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division2.DivisionProjectId
+                                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == division2.DivisionProjectId
                                                                               orderby x.SortIndex
                                                                               select x).ToList();
                                                             if (list.Contains(division2.DivisionProjectId))
@@ -1086,7 +1144,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                         {
                                             newCNProfessionalNode.Expanded = true;
                                             var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                             where x.CNProfessionalId == c.CNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                             where x.CNProfessionalId == c.CNProfessionalId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                              orderby x.SortIndex
                                                              select x).ToList();
                                             foreach (var q in divisions)
@@ -1103,7 +1161,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                     newNode4.Checked = true;
                                                 }
                                                 var division1s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                  where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == q.DivisionProjectId
+                                                                  where x.ProjectId == this.ProjectId && x.SuperDivisionId == q.DivisionProjectId
                                                                   orderby x.SortIndex
                                                                   select x).ToList();
                                                 if (list.Contains(q.DivisionProjectId))
@@ -1119,7 +1177,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                         newNode5.EnableClickEvent = true;
                                                         newNode4.Nodes.Add(newNode5);
                                                         var division2s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                          where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division1.DivisionProjectId
+                                                                          where x.ProjectId == this.ProjectId && x.SuperDivisionId == division1.DivisionProjectId
                                                                           orderby x.SortIndex
                                                                           select x).ToList();
                                                         if (list.Contains(division1.DivisionProjectId))
@@ -1135,7 +1193,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                                 newNode6.EnableClickEvent = true;
                                                                 newNode5.Nodes.Add(newNode6);
                                                                 var division3s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                                  where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division2.DivisionProjectId
+                                                                                  where x.ProjectId == this.ProjectId && x.SuperDivisionId == division2.DivisionProjectId
                                                                                   orderby x.SortIndex
                                                                                   select x).ToList();
                                                                 if (list.Contains(division2.DivisionProjectId))
@@ -1305,7 +1363,7 @@ namespace FineUIPro.Web.CQMS.WBS
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.designer.cs
index 559871e..121fce6 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.WBS {
-    
-    
-    public partial class ProjectControlPoint {
-        
+namespace FineUIPro.Web.CQMS.WBS
+{
+
+
+    public partial class ProjectControlPoint
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelLeftRegion 控件。
         /// </summary>
@@ -47,7 +49,34 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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>
+        /// panelLeftRegion2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion2;
+
         /// <summary>
         /// trWBS 控件。
         /// </summary>
@@ -56,7 +85,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trWBS;
-        
+
         /// <summary>
         /// hdSelectId 控件。
         /// </summary>
@@ -65,7 +94,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdSelectId;
-        
+
         /// <summary>
         /// hdUnitWorkId 控件。
         /// </summary>
@@ -74,7 +103,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdUnitWorkId;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -83,7 +112,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar4 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar4;
-        
+
         /// <summary>
         /// lbHd 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbHd;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// lbCheckAcceptType 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbCheckAcceptType;
-        
+
         /// <summary>
         /// ToolbarSeparator2 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
-        
+
         /// <summary>
         /// ToolbarText2 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText2;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Window3 控件。
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
-        
+
         /// <summary>
         /// Windowtt 控件。
         /// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Windowtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuAdd 控件。
         /// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAdd;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuCopy 控件。
         /// </summary>
@@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuCopy;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
@@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDelete;
-        
+
         /// <summary>
         /// Menu2 控件。
         /// </summary>
@@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu2;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx
index 3f8f5af..360a3c5 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectControlPointAuditRecord.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.ProjectControlPointAuditRecord" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>现场控制点审批记录</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
@@ -22,30 +24,39 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-           
-                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
-                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                <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="panel3" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
                         <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="AuditId" AllowSorting="true" EnableColumnLines="true"
-                            SortField="CreateDate" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1"  KeepCurrentSelection="true"
-                            ForceFit="true" OnRowCommand="Grid1_RowCommand"  EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                            SortField="CreateDate" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" KeepCurrentSelection="true"
+                            ForceFit="true" OnRowCommand="Grid1_RowCommand" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
                             ShowSelectedCell="true" DataIDField="AuditId" AllowPaging="true" IsDatabasePaging="true"
                             PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
                                     <Items>
-                                         <f:TextBox runat="server" ID="txtAuditCode" 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" ToolTip="新增" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" >
+                                        <f:TextBox runat="server" ID="txtAuditCode" 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" ToolTip="新增" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+
                                     </Items>
                                 </f:Toolbar>
                             </Toolbars>
@@ -55,7 +66,7 @@
                                 <f:RenderField Width="100px" ColumnID="AuditCode" DataField="AuditCode" FieldType="String"
                                     HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" FieldType="Date"  RendererArgument="yyyy-MM-dd"
+                                <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" FieldType="Date" RendererArgument="yyyy-MM-dd"
                                     HeaderText="日期" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="100px" ColumnID="AuditName" DataField="AuditName" FieldType="String"
@@ -63,11 +74,11 @@
                                 </f:RenderField>
                                 <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" FieldType="String"
                                     HeaderText="审批人" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>                                 
+                                </f:RenderField>
                                 <f:RenderField Width="40px" ColumnID="Remark" DataField="Remark" FieldType="String"
                                     HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
-                                </f:RenderField>                                 
-                                <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px"  Text="附件" CommandName="download" />
+                                </f:RenderField>
+                                <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" Text="附件" CommandName="download" />
                             </Columns>
                             <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -89,31 +100,31 @@
             </Items>
         </f:Panel>
 
-             <f:Menu ID="Menu1" runat="server">
-            
-            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"   Icon="Pencil"
+        <f:Menu ID="Menu1" runat="server">
+
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Icon="Pencil"
                 runat="server" Text="修改">
             </f:MenuButton>
             <%--        <f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true"
             runat="server" Text="拷贝" >
         </f:MenuButton>--%>
-            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDel_Click" EnablePostBack="true"   Icon="Delete"
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDel_Click" EnablePostBack="true" Icon="Delete"
                 ConfirmText="确认删除选中项？" ConfirmTarget="Top" runat="server" Text="删除">
             </f:MenuButton>
         </f:Menu>
-         <f:Window ID="Window1" Title="设计变更单管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <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="400px">
         </f:Window>
-       
 
 
-         <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+
+        <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
-        
-       
+
+
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
@@ -121,7 +132,7 @@
             F(menuID).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
-        
+
     </script>
 </body>
 </html>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.cs
index 2bccd30..7cb0b8d 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.cs
@@ -10,6 +10,21 @@ namespace FineUIPro.Web.CQMS.WBS
 {
     public partial class ProjectControlPointAuditRecord : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
         public bool Editable
         {
             get
@@ -22,6 +37,7 @@ namespace FineUIPro.Web.CQMS.WBS
             }
         }
 
+        #endregion
 
         #region  页面加载
         /// <summary>
@@ -35,13 +51,42 @@ namespace FineUIPro.Web.CQMS.WBS
             {
                 Editable = false;
 
-                GetButtonPower();
-                 BindGrid();
+                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();
 
             }
         }
-        #endregion      
-    
+        #endregion
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         #region  修改关闭窗口
         /// <summary>
         /// 关闭窗口
@@ -121,6 +166,10 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT AuditId
                               ,WBS_BreakdownProjectAuditRecord.ProjectId
                               ,AuditCode
@@ -134,7 +183,7 @@ namespace FineUIPro.Web.CQMS.WBS
                           FROM dbo.WBS_BreakdownProjectAuditRecord left join Sys_User on Auditer = UserId  ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " where   WBS_BreakdownProjectAuditRecord.ProjectId=@ProjectId";
-             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+             listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (!string.IsNullOrEmpty(txtAuditCode.Text))
             {
                 strSql += " and AuditCode like '%" + txtAuditCode.Text + "%'";
@@ -198,7 +247,7 @@ namespace FineUIPro.Web.CQMS.WBS
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointAuditMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointAuditMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.designer.cs
index 77f2f99..0e202b7 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecord.aspx.designer.cs
@@ -42,13 +42,40 @@ namespace FineUIPro.Web.CQMS.WBS
         protected global::FineUIPro.Panel Panel1;
 
         /// <summary>
-        /// panelCenterRegion 控件。
+        /// panelLeftRegion 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Panel panelCenterRegion;
+        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>
+        /// panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panel3;
 
         /// <summary>
         /// Grid1 控件。
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
index a2e6d87..1c147fb 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectControlPointFile.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.ProjectControlPointFile" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>现场控制点裁剪</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
@@ -24,14 +26,23 @@
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
         <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                <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="panelLeftRegion2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
                     RegionPercent="20%" Title="现场控制点裁剪" TitleToolTip="现场控制点裁剪" ShowBorder="true" ShowHeader="true"
                     BodyPadding="10px">
                     <Items>
-                        <f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck"  OnlyLeafCheck="true"
+                        <f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck" OnlyLeafCheck="true"
                             OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
                             runat="server">
-                           
                         </f:Tree>
                         <f:HiddenField runat="server" ID="hdSelectId">
                         </f:HiddenField>
@@ -44,11 +55,11 @@
                     <Items>
                         <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowSorting="true" EnableColumnLines="true"
-                            SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1"  KeepCurrentSelection="true"
+                            SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" KeepCurrentSelection="true"
                             ForceFit="true" OnRowCommand="Grid1_RowCommand"
                             ShowSelectedCell="true" DataIDField="BreakdownProjectId" AllowPaging="true" IsDatabasePaging="true"
                             PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
-                            
+
                             <Columns>
                                 <f:RenderField Width="70px" ColumnID="BreakdownCode" DataField="BreakdownCode" FieldType="String"
                                     HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
@@ -93,9 +104,9 @@
                                 <f:RenderField Width="40px" ColumnID="ModelURL" DataField="ModelURL" FieldType="String" Hidden="true"
                                     HeaderText="模板附件" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
-                                <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px"  Text="附件" CommandName="download" />
+                                <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" Text="附件" CommandName="download" />
                             </Columns>
-                           
+
                             <PageItems>
                                 <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
                                 </f:ToolbarSeparator>
@@ -112,20 +123,20 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        
-         <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+
+        <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
-        
-       
+
+
     </form>
     <script type="text/javascript">
         var treeID = '<%= trWBS.ClientID %>';
         // 保存当前菜单对应的树节点ID
         var currentNodeId;
 
-       
+
         // 显示菜单后，检查是否禁用菜单项
         function onMenuShow() {
             if (currentNodeId) {
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
index 4e41f1f..6f8048f 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
@@ -10,6 +10,22 @@ namespace FineUIPro.Web.CQMS.WBS
 {
     public partial class ProjectControlPointFile : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         /// <summary>
         /// 被选择项列表
         /// </summary>
@@ -50,9 +66,22 @@ namespace FineUIPro.Web.CQMS.WBS
         {
             if (!IsPostBack)
             {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.SelectedList = new List<string>();
                 this.NoSelectedList = new List<string>();
-                GetButtonPower();
+                //GetButtonPower();
                 InitTreeMenu();
                 this.Grid1.Columns[2].Hidden = false;
                 this.Grid1.Columns[3].Hidden = true;
@@ -68,18 +97,34 @@ namespace FineUIPro.Web.CQMS.WBS
         #endregion
 
         #region  加载树
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.GetButtonPower();
+            this.InitTreeMenu();
+        }
         /// <summary>
         /// 加载树
         /// </summary>
         private void InitTreeMenu()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             this.trWBS.Nodes.Clear();
             this.trWBS.ShowBorder = false;
             this.trWBS.ShowHeader = false;
             this.trWBS.EnableIcons = true;
             this.trWBS.AutoScroll = true;
             this.trWBS.EnableSingleClickExpand = true;
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.ProjectId orderby x.UnitWorkCode select x;
             foreach (var q in unitWorks)
             {
                 TreeNode newNode = new TreeNode();
@@ -196,7 +241,7 @@ namespace FineUIPro.Web.CQMS.WBS
                     cNProfessionalId = e.NodeID.Split('|')[1];
                 }
                 var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                 where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                 where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                  orderby x.SortIndex
                                  select x).ToList();
                 foreach (var q in divisions)
@@ -216,7 +261,7 @@ namespace FineUIPro.Web.CQMS.WBS
                         //newNode.Checked = true;
 
                         var list = (from x in Funs.DB.WBS_DivisionProject
-                                    where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+                                    where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.ProjectId
                                     orderby x.SortIndex
                                     select x).ToList();
                         if (list.Count > 0)
@@ -232,7 +277,7 @@ namespace FineUIPro.Web.CQMS.WBS
             else if (e.Node.CommandName == "DivisionProject")   //展开分部节点
             {
                 var childDivisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                      where x.SuperDivisionId == e.Node.NodeID && x.ProjectId == this.CurrUser.LoginProjectId
+                                      where x.SuperDivisionId == e.Node.NodeID && x.ProjectId == this.ProjectId
                                       orderby x.SortIndex
                                       select x).ToList();
                 foreach (var q in childDivisions)
@@ -251,7 +296,7 @@ namespace FineUIPro.Web.CQMS.WBS
                         //newNode.Checked = true;
 
                         var list = (from x in Funs.DB.WBS_DivisionProject
-                                    where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+                                    where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.ProjectId
                                     orderby x.SortIndex
                                     select x).ToList();
                         if (list.Count > 0)
@@ -275,7 +320,7 @@ namespace FineUIPro.Web.CQMS.WBS
         /// <param name="e"></param>
         protected void trWBS_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e)
         {
-            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnSave))
+            if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnSave))
             {
                 Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(e.NodeID);
                 divisionProject.IsSelected = e.Checked;
@@ -450,7 +495,7 @@ namespace FineUIPro.Web.CQMS.WBS
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            //var controlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InitControlItemCode == Grid1.SelectedRowID);
+            //var controlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.InitControlItemCode == Grid1.SelectedRowID);
             //if (controlItemAndCycle != null)
             //{
             //    ShowNotify("WBS定制中已使用该数据，无法删除！", MessageBoxIcon.Warning);
@@ -511,12 +556,17 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL 
                        FROM WBS_BreakdownProject ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " where IsSelected = 1 and DivisionProjectId = @DivisionProjectId and ProjectId=@ProjectId";
             listStr.Add(new SqlParameter("@DivisionProjectId", this.trWBS.SelectedNodeID));
-            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);
 
@@ -602,7 +652,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                 if (trWBS.Nodes[i].Nodes[j].NodeID == BLL.Const.CNProfessionalConstructId)  //建筑工程
                                 {
                                     var divisionsCV = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                       where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
+                                                       where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
                                                        orderby x.SortIndex
                                                        select x).ToList();
                                     if (divisionsCV.Count > 0)   //建筑工程下存在土建内容
@@ -616,7 +666,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                         trWBS.Nodes[i].Nodes[j].Nodes.Add(newNode3);
                                         newNode3.Expanded = true;
                                         var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                          orderby x.SortIndex
                                                          select x).ToList();
                                         foreach (var q in divisions)
@@ -633,7 +683,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                             }
                                             newNode3.Nodes.Add(newNode4);
                                             var division1s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == q.DivisionProjectId
+                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == q.DivisionProjectId
                                                               orderby x.SortIndex
                                                               select x).ToList();
                                             if (list.Contains(q.DivisionProjectId))
@@ -649,7 +699,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                     newNode5.EnableClickEvent = true;
                                                     newNode4.Nodes.Add(newNode5);
                                                     var division2s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                      where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division1.DivisionProjectId
+                                                                      where x.ProjectId == this.ProjectId && x.SuperDivisionId == division1.DivisionProjectId
                                                                       orderby x.SortIndex
                                                                       select x).ToList();
                                                     if (list.Contains(division1.DivisionProjectId))
@@ -665,7 +715,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                             newNode6.EnableClickEvent = true;
                                                             newNode5.Nodes.Add(newNode6);
                                                             var division3s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division2.DivisionProjectId
+                                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == division2.DivisionProjectId
                                                                               orderby x.SortIndex
                                                                               select x).ToList();
                                                             if (list.Contains(division2.DivisionProjectId))
@@ -711,7 +761,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                     else
                                     {
                                         var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalConstructId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                         where x.CNProfessionalId == BLL.Const.CNProfessionalConstructId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                          orderby x.SortIndex
                                                          select x).ToList();
                                         foreach (var q in divisions)
@@ -728,7 +778,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                 newNode4.Checked = true;
                                             }
                                             var division1s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == q.DivisionProjectId
+                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == q.DivisionProjectId
                                                               orderby x.SortIndex
                                                               select x).ToList();
                                             if (list.Contains(q.DivisionProjectId))
@@ -744,7 +794,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                     newNode5.EnableClickEvent = true;
                                                     newNode4.Nodes.Add(newNode5);
                                                     var division2s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                      where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division1.DivisionProjectId
+                                                                      where x.ProjectId == this.ProjectId && x.SuperDivisionId == division1.DivisionProjectId
                                                                       orderby x.SortIndex
                                                                       select x).ToList();
                                                     if (list.Contains(division1.DivisionProjectId))
@@ -760,7 +810,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                             newNode6.EnableClickEvent = true;
                                                             newNode5.Nodes.Add(newNode6);
                                                             var division3s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                              where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division2.DivisionProjectId
+                                                                              where x.ProjectId == this.ProjectId && x.SuperDivisionId == division2.DivisionProjectId
                                                                               orderby x.SortIndex
                                                                               select x).ToList();
                                                             if (list.Contains(division2.DivisionProjectId))
@@ -820,7 +870,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                         {
                                             newCNProfessionalNode.Expanded = true;
                                             var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                             where x.CNProfessionalId == c.CNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+                                                             where x.CNProfessionalId == c.CNProfessionalId && x.ProjectId == this.ProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
                                                              orderby x.SortIndex
                                                              select x).ToList();
                                             foreach (var q in divisions)
@@ -837,7 +887,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                     newNode4.Checked = true;
                                                 }
                                                 var division1s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                  where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == q.DivisionProjectId
+                                                                  where x.ProjectId == this.ProjectId && x.SuperDivisionId == q.DivisionProjectId
                                                                   orderby x.SortIndex
                                                                   select x).ToList();
                                                 if (list.Contains(q.DivisionProjectId))
@@ -853,7 +903,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                         newNode5.EnableClickEvent = true;
                                                         newNode4.Nodes.Add(newNode5);
                                                         var division2s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                          where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division1.DivisionProjectId
+                                                                          where x.ProjectId == this.ProjectId && x.SuperDivisionId == division1.DivisionProjectId
                                                                           orderby x.SortIndex
                                                                           select x).ToList();
                                                         if (list.Contains(division1.DivisionProjectId))
@@ -869,7 +919,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                                                 newNode6.EnableClickEvent = true;
                                                                 newNode5.Nodes.Add(newNode6);
                                                                 var division3s = (from x in BLL.Funs.DB.WBS_DivisionProject
-                                                                                  where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == division2.DivisionProjectId
+                                                                                  where x.ProjectId == this.ProjectId && x.SuperDivisionId == division2.DivisionProjectId
                                                                                   orderby x.SortIndex
                                                                                   select x).ToList();
                                                                 if (list.Contains(division2.DivisionProjectId))
@@ -999,7 +1049,7 @@ namespace FineUIPro.Web.CQMS.WBS
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId);
             if (buttonList.Count() > 0)
             {  
             }
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.designer.cs
index 45c49f0..c254092 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.designer.cs
@@ -50,6 +50,33 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </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>
+        /// panelLeftRegion2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion2;
+
         /// <summary>
         /// trWBS 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx b/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx
index 7dc16e0..5a9253c 100644
--- a/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx
+++ b/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BenchmarkWorkSite.aspx.cs" Inherits="FineUIPro.Web.ThreeYearAction.ConstructionStandardization.BenchmarkWorkSite" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -10,88 +12,102 @@
         <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" EnableColumnLines="true" DataKeyNames="Id"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
-                    SortField="Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:TextBox runat="server" Label="编号" ID="txtCode" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="名称" ID="txtName" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
-                                </f:TextBox>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                            TextAlign="Center" />
-                        <f:RenderField Width="100px" ColumnID="Code" DataField="Code"
-                            SortField="Code" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField MinWidth="220px" ColumnID="Name" DataField="Name" SortField="Name"
-                            FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField MinWidth="220px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
-                            FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField MinWidth="220px" ColumnID="GeneralContractorName" DataField="GeneralContractorName" SortField="GeneralContractorName"
-                            FieldType="String" HeaderText="总包单位" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField MinWidth="220px" ColumnID="SupervisorName" DataField="SupervisorName" SortField="SupervisorName"
-                            FieldType="String" HeaderText="监理单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField MinWidth="220px" ColumnID="OwnerName" DataField="OwnerName" SortField="OwnerName"
-                            FieldType="String" HeaderText="业主单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CompileManName" DataField="CompileManName" SortField="CompileManName"
-                            FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
-                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="编制时间" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" Text="附件" ToolTip="附件上传查看"
-                            DataIFrameUrlFields="Id" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/BenchmarkWorkSite&menuId=CF9B9DDD-F443-4983-8807-C7D876AF70E4"
-                            HeaderTextAlign="Center">
-                        </f:WindowField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="标杆示范工地" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="Id"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
+                            SortField="Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="编号" ID="txtCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="100px" ColumnID="Code" DataField="Code"
+                                    SortField="Code" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField MinWidth="220px" ColumnID="Name" DataField="Name" SortField="Name"
+                                    FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField MinWidth="220px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                                    FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField MinWidth="220px" ColumnID="GeneralContractorName" DataField="GeneralContractorName" SortField="GeneralContractorName"
+                                    FieldType="String" HeaderText="总包单位" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField MinWidth="220px" ColumnID="SupervisorName" DataField="SupervisorName" SortField="SupervisorName"
+                                    FieldType="String" HeaderText="监理单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField MinWidth="220px" ColumnID="OwnerName" DataField="OwnerName" SortField="OwnerName"
+                                    FieldType="String" HeaderText="业主单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileManName" DataField="CompileManName" SortField="CompileManName"
+                                    FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="编制时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" Text="附件" ToolTip="附件上传查看"
+                                    DataIFrameUrlFields="Id" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/BenchmarkWorkSite&menuId=CF9B9DDD-F443-4983-8807-C7D876AF70E4"
+                                    HeaderTextAlign="Center">
+                                </f:WindowField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
-
         <f:Window ID="Window1" Title="编辑标杆示范工地" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px"
             Height="700px">
diff --git a/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.cs b/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.cs
index bd15f58..fc3e211 100644
--- a/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.cs
@@ -1,34 +1,27 @@
 ﻿using BLL;
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-using System.Xml.Linq;
 
 namespace FineUIPro.Web.ThreeYearAction.ConstructionStandardization
 {
     public partial class BenchmarkWorkSite : PageBase
     {
         #region 项目主键
-        ///// <summary>
-        ///// 项目主键
-        ///// </summary>
-        //public string ProjectId
-        //{
-        //    get
-        //    {
-        //        return (string)ViewState["ProjectId"];
-        //    }
-        //    set
-        //    {
-        //        ViewState["ProjectId"] = value;
-        //    }
-        //}
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
         #endregion
 
         #region 加载
@@ -42,24 +35,56 @@ namespace FineUIPro.Web.ThreeYearAction.ConstructionStandardization
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("BenchmarkWorkSiteEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                ////权限按钮方法
-                this.GetButtonPower();
                 // 绑定表格
                 this.BindGrid();
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             var db = Funs.DB;
             var queryData = from x in db.ConstructionStandardization_BenchmarkWorkSite
                             join pro in db.Base_Project on x.ProjectId equals pro.ProjectId
@@ -67,10 +92,8 @@ namespace FineUIPro.Web.ThreeYearAction.ConstructionStandardization
                             join un2 in db.Base_Unit on x.Supervisor equals un2.UnitId
                             join un3 in db.Base_Unit on x.Owner equals un3.UnitId
                             join y in db.Sys_User on x.CompileMan equals y.UserId
-                            where
-                            //x.ProjectId == this.ProjectId
-                            //&& 
-                            (string.IsNullOrEmpty(txtCode.Text.Trim()) || x.Code.Contains(txtCode.Text.Trim()))
+                            where x.ProjectId == this.ProjectId
+                            && (string.IsNullOrEmpty(txtCode.Text.Trim()) || x.Code.Contains(txtCode.Text.Trim()))
                             && (string.IsNullOrEmpty(txtName.Text.Trim()) || x.Name.Contains(txtName.Text.Trim()))
                             && (string.IsNullOrEmpty(txtProjectName.Text.Trim()) || pro.ProjectName.Contains(txtProjectName.Text.Trim()))
                             select new
@@ -222,7 +245,7 @@ namespace FineUIPro.Web.ThreeYearAction.ConstructionStandardization
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.BenchmarkWorkSiteMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.BenchmarkWorkSiteMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.designer.cs
index 504e6aa..145c3dd 100644
--- a/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/ThreeYearAction/ConstructionStandardization/BenchmarkWorkSite.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.ThreeYearAction.ConstructionStandardization
         /// </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>
