diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx
index 13207f6..ad70617 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckFineList.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.CheckFineList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <title>质量罚款单</title>
@@ -35,11 +37,12 @@
             background-color: #79FF79;
         }*/
 
-        .Green  {
+        .Green {
             background-color: Green;
-            color:white;
+            color: white;
         }
-        .Yellow  {
+
+        .Yellow {
             background-color: #FFFF93;
         }
 
@@ -50,6 +53,7 @@
         .LightGreen {
             background-color: LightGreen
         }
+
         .f-grid-colheader-text {
             white-space: normal;
             word-break: break-all;
@@ -59,115 +63,128 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f: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"
+                            runat="server" BoxFlex="1" DataKeyNames="CheckFineId" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="CheckFineId" AllowSorting="true" SortField="CheckDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
+                            OnFilterChange="Grid1_FilterChange" OnRowDataBound="Grid1_RowDataBound" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpSponsorUnit" runat="server" Label="施工单位" EnableEdit="true" EmptyText="请选择查询条件"
+                                            LabelAlign="right">
+                                        </f:DropDownList>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="质量罚款单记录" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="CheckFineId" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="CheckFineId" AllowSorting="true" SortField="CheckDate"
-                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
-                    OnFilterChange="Grid1_FilterChange" OnRowDataBound="Grid1_RowDataBound" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpSponsorUnit" runat="server" Label="施工单位" EnableEdit="true" EmptyText="请选择查询条件"
-                                     LabelAlign="right">
+                                        <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+
+
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
+                                            LabelAlign="right">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
+                                            LabelAlign="right">
+                                        </f:DatePicker>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
+
+                                    </Items>
+                                </f:Toolbar>
+
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField ColumnID="DocCode" DataField="DocCode"
+                                    SortField="DocCode" FieldType="String" HeaderText="文件编号" TextAlign="Left" MinWidth="140px"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+
+                                <f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
+                                    SortField="UnitWorkName" FieldType="String" HeaderText="单位工程名称" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="70px" ColumnID="Fee" DataField="Fee" SortField="Fee"
+                                    FieldType="String" HeaderText="罚款金额" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("CheckFineId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+
+                                <f:RenderField Width="95px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="95px" ColumnID="userName" DataField="userName" SortField="userName"
+                                    FieldType="String" HeaderText="编制人" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+
+
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
                                 </f:DropDownList>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
 
-                                <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                                
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-              
-                                
-                                  <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
-                                      LabelAlign="right" >
-                                </f:DatePicker>
-                                  <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
-                                      LabelAlign="right"  >
-                                </f:DatePicker>
-                                   
-                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"    Icon="SystemSearch" EnablePostBack="true" runat="server" >
-                                </f:Button>
-                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"    Icon="ArrowUndo" EnablePostBack="true" runat="server" >
-                                </f:Button>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
-                                    Hidden="true">
-                                </f:Button>
-                                 
-                            </Items>
-                        </f:Toolbar>
-                       
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        
-                        <f:RenderField  ColumnID="DocCode" DataField="DocCode" 
-                            SortField="DocCode" FieldType="String" HeaderText="文件编号" TextAlign="Left" MinWidth="140px"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-
-                        <f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
-                            SortField="UnitWorkName" FieldType="String" HeaderText="单位工程名称" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Left" 
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                         <f:RenderField Width="70px" ColumnID="Fee" DataField="Fee" SortField="Fee"
-                            FieldType="String" HeaderText="罚款金额" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("CheckFineId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        
-                       
-                        <f:RenderField Width="95px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="95px" ColumnID="userName" DataField="userName" SortField="userName"
-                            FieldType="String" HeaderText="编制人" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        
-                         
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
-
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="质量罚款单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -179,11 +196,11 @@
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
                     OnClick="btnMenuModify_Click">
                 </f:MenuButton>
-                 
-                <f:MenuButton ID="MenuButton1" EnablePostBack="true"  EnableAjax="false" runat="server"  DisableControlBeforePostBack="false" Text="质量罚款单打印" Icon="Printer"
+
+                <f:MenuButton ID="MenuButton1" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="质量罚款单打印" Icon="Printer"
                     OnClick="btnMenuNotice_Click">
                 </f:MenuButton>
-               
+
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click">
                 </f:MenuButton>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs
index dc23c7b..6ed6b59 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs
@@ -51,31 +51,55 @@ namespace FineUIPro.Web.CQMS.Check
             //FilterDataRowItem = FilterDataRowItemImplement;
             if (!IsPostBack)
             {
+                //Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                GetButtonPower();
-                //if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
-                //{
-                //    this.ProjectId = Request.Params["projectId"];
-                //}
-                //权限按钮方法
-                UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
-                UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
-                 
+                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();
+                }
+
                 btnNew.OnClientClick = Window1.GetShowReference("CheckFineListEdit.aspx") + "return false;";
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
                 // 绑定表格
                 BindGrid();
-
-
-
             }
-            
-
         }
         #endregion
-      
-       
+
+        private void InitDropDownList()
+        {
+            //权限按钮方法
+            UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.ProjectId, BLL.Const.ProjectUnitType_2, true);
+            UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.ProjectId, true);
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         public Task<DataTable> data()
         {
             Task<DataTable> task = new Task<DataTable>(() =>
@@ -96,23 +120,21 @@ namespace FineUIPro.Web.CQMS.Check
 		left join sys_User u on u.userId = chec.CheckMan where chec.ProjectId=@ProjectId";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') ";
             listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
             listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + "  23:59:59" : ""));
-            if (drpSponsorUnit.SelectedValue != BLL.Const._Null)
+            if (this.drpSponsorUnit.SelectedValue != null && this.drpSponsorUnit.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND chec.unitId=@unitId";
                 listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue));
             }
-            if (drpUnitWork.SelectedValue != Const._Null)
+            if (this.drpUnitWork.SelectedValue != null && this.drpUnitWork.SelectedValue != Const._Null)
             {
                 strSql += " AND chec.unitworkId=@unitworkId";
                 listStr.Add(new SqlParameter("@unitworkId", drpUnitWork.SelectedValue));
             }
-           
-            
-             
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             return tb;
@@ -136,12 +158,13 @@ namespace FineUIPro.Web.CQMS.Check
             {
                 IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckFineListMenuId);
 
-                 if (sourlist != null&& sourlist.Count>0)
+                if (sourlist != null && sourlist.Count > 0)
                 {
                     string AttachUrl = "";
-                    foreach(var item in sourlist)
-                    {   if(!string.IsNullOrEmpty(item.AttachUrl)&& item.AttachUrl.ToLower().EndsWith(".jpg")|| item.AttachUrl.ToLower().EndsWith(".jpeg")|| item.AttachUrl.ToLower().EndsWith(".png"))
-                        AttachUrl += item.AttachUrl.TrimEnd(',')+",";
+                    foreach (var item in sourlist)
+                    {
+                        if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
+                            AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
                     }
                     url = BLL.UploadAttachmentService.ShowImage("../../", AttachUrl.TrimEnd(','));
                 }
@@ -153,7 +176,7 @@ namespace FineUIPro.Web.CQMS.Check
             string url = string.Empty;
             if (registrationId != null)
             {
-                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString()+"r", BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId);
 
                 if (sourlist != null && sourlist.Count > 0)
                 {
@@ -168,8 +191,8 @@ namespace FineUIPro.Web.CQMS.Check
             }
             return url;
         }
-        
-         
+
+
 
 
         /// <summary>
@@ -178,6 +201,10 @@ namespace FineUIPro.Web.CQMS.Check
 
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             DataTable tb = ChecklistData();
 
             // 2.获取当前分页数据
@@ -190,7 +217,7 @@ namespace FineUIPro.Web.CQMS.Check
             Grid1.DataSource = table;
             Grid1.DataBind();
 
-         
+
         }
 
 
@@ -359,7 +386,7 @@ namespace FineUIPro.Web.CQMS.Check
             }
         }
         #endregion
-        
+
         protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
         {
             //if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
@@ -723,7 +750,7 @@ namespace FineUIPro.Web.CQMS.Check
 
                 if (bookmarkSendDate != null)
                 {
-                   
+
                     if (checks.CheckDate.HasValue != null)
                     {
                         bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
@@ -736,7 +763,7 @@ namespace FineUIPro.Web.CQMS.Check
                     bookmarkNoticeNum.Text = checks.DocCode;
                 }
 
-               
+
 
                 Bookmark bookmarkUnit = doc.Range.Bookmarks["Unit"];
                 if (bookmarkUnit != null)
@@ -788,7 +815,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
 
                 Bookmark bookmarkCheckDate = doc.Range.Bookmarks["CheckDate"];
-                
+
                 if (bookmarkCheckDate != null)
                 {
 
@@ -822,7 +849,7 @@ namespace FineUIPro.Web.CQMS.Check
                         bookmarkCheckMan.Text = sysUser.UserName;
                     }
                 }
-                
+
                 Bookmark bookmarkResponseMan = doc.Range.Bookmarks["ResponseMan"];
                 Bookmark bookmarkResponseDate = doc.Range.Bookmarks["ResponseDate"];
                 if (bookmarkResponseMan != null)
@@ -992,7 +1019,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
 
 
-                IList<Model.AttachFile> reSourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode+"r", BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> reSourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode + "r", BLL.Const.CheckListMenuId);
 
                 if (reSourlist != null && reSourlist.Count > 0)
                 {
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.designer.cs
index f6ab94a..18c5c9a 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.CQMS.Check
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
index 7dfbbcf..c744708 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
@@ -65,9 +65,13 @@ namespace FineUIPro.Web.CQMS.Check
             //FilterDataRowItem = FilterDataRowItemImplement;
             if (!IsPostBack)
             {
-                 
-
                 this.ProjectId = this.CurrUser.LoginProjectId;
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
@@ -77,27 +81,15 @@ namespace FineUIPro.Web.CQMS.Check
                     ////权限按钮方法
                     this.GetButtonPower();
                 }
-                //if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
-                //{
-                //    this.ProjectId = Request.Params["projectId"];
-                //}
-                //权限按钮方法
-              
                 btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                GetList();
                 // 绑定表格
                 BindGrid();
-
-
-
             }
-            
-
         }
-        private void GetList()
+        private void InitDownList()
         {
-            if (!string .IsNullOrEmpty(this.ProjectId))
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 code = ProjectService.GetProjectByProjectId(this.ProjectId).ProjectCode + "-QC-TCC-XJ-";
             }
@@ -107,6 +99,24 @@ namespace FineUIPro.Web.CQMS.Check
             QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
             Funs.FineUIPleaseSelect(this.dpHandelStatus);
         }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDownList();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         #endregion
         //public System.Web.UI.WebControls.ListItem[] GetHandelStatus()
         //{
@@ -145,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Check
         }
         protected DataTable ChecklistData()
         {
-            DataTable tb=new DataTable();
+            DataTable tb = new DataTable();
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
@@ -205,8 +215,8 @@ namespace FineUIPro.Web.CQMS.Check
                     }
                 }
                 SqlParameter[] parameter = listStr.ToArray();
-                  tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-               
+                tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
             }
             return tb;
         }
@@ -222,7 +232,7 @@ namespace FineUIPro.Web.CQMS.Check
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();
         }
-        
+
         /// <summary>
         /// 导出方法
         /// </summary>
@@ -306,12 +316,13 @@ namespace FineUIPro.Web.CQMS.Check
             {
                 IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId);
 
-                 if (sourlist != null&& sourlist.Count>0)
+                if (sourlist != null && sourlist.Count > 0)
                 {
                     string AttachUrl = "";
-                    foreach(var item in sourlist)
-                    {   if(!string.IsNullOrEmpty(item.AttachUrl)&& item.AttachUrl.ToLower().EndsWith(".jpg")|| item.AttachUrl.ToLower().EndsWith(".jpeg")|| item.AttachUrl.ToLower().EndsWith(".png"))
-                        AttachUrl += item.AttachUrl.TrimEnd(',')+",";
+                    foreach (var item in sourlist)
+                    {
+                        if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
+                            AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
                     }
                     url = BLL.UploadAttachmentService.ShowImage(httpUrl, AttachUrl.TrimEnd(','));
                 }
@@ -329,7 +340,7 @@ namespace FineUIPro.Web.CQMS.Check
             }
             if (registrationId != null)
             {
-                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString()+"r", BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId);
 
                 if (sourlist != null && sourlist.Count > 0)
                 {
@@ -344,7 +355,7 @@ namespace FineUIPro.Web.CQMS.Check
             }
             return url;
         }
-        
+
         public string Convertstatus(Object code)
         {
             Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString());
@@ -376,6 +387,10 @@ namespace FineUIPro.Web.CQMS.Check
 
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             DataTable tb = ChecklistData();
 
             // 2.获取当前分页数据
@@ -414,19 +429,6 @@ namespace FineUIPro.Web.CQMS.Check
                 }
             }
         }
-        protected void changeTree(object sender, EventArgs e)
-        {
-
-            this.ProjectId = this.ucTree.ProjectId;
-            GetList();
-            this.BindGrid();
-
-            this.GetButtonPower();
-            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
-            {
-                btnNew.Hidden = true;
-            }
-        }
 
 
         #region 查询
@@ -798,7 +800,7 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkCheckCode = doc.Range.Bookmarks["CheckCode"];
                 if (bookmarkCheckCode != null)
                 {
-                    bookmarkCheckCode.Text =  checks.DocCode;
+                    bookmarkCheckCode.Text = checks.DocCode;
                 }
 
                 Bookmark bookmarkSendDate = doc.Range.Bookmarks["SendDate"];
@@ -903,7 +905,7 @@ namespace FineUIPro.Web.CQMS.Check
                         }
                     }
                 }
-               IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode, BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode, BLL.Const.CheckListMenuId);
 
                 if (sourlist != null && sourlist.Count > 0)
                 {
@@ -918,9 +920,10 @@ namespace FineUIPro.Web.CQMS.Check
                         }
 
                     }
-                    string []pics = AttachUrl.Split(',');
-                    foreach(string item in pics)
-                  { switch (indexPic)
+                    string[] pics = AttachUrl.Split(',');
+                    foreach (string item in pics)
+                    {
+                        switch (indexPic)
                         {
                             case 1:
                                 {
@@ -1096,7 +1099,7 @@ namespace FineUIPro.Web.CQMS.Check
 
                 if (bookmarkSendDate != null)
                 {
-                   
+
                     if (checks.CheckDate.HasValue != null)
                     {
                         bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
@@ -1163,7 +1166,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
 
                 Bookmark bookmarkCheckDate = doc.Range.Bookmarks["CheckDate"];
-                
+
                 if (bookmarkCheckDate != null)
                 {
 
@@ -1177,7 +1180,7 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkNoticeNum2 = doc.Range.Bookmarks["NoticeNum2"];
                 if (bookmarkNoticeNum2 != null)
                 {
-                    bookmarkNoticeNum2.Text =  checks.DocCode;
+                    bookmarkNoticeNum2.Text = checks.DocCode;
                 }
 
 
@@ -1197,7 +1200,7 @@ namespace FineUIPro.Web.CQMS.Check
                         bookmarkCheckMan.Text = sysUser.UserName;
                     }
                 }
-                
+
                 Bookmark bookmarkResponseMan = doc.Range.Bookmarks["ResponseMan"];
                 Bookmark bookmarkResponseDate = doc.Range.Bookmarks["ResponseDate"];
                 if (bookmarkResponseMan != null)
@@ -1367,7 +1370,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
 
 
-                IList<Model.AttachFile> reSourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode+"r", BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> reSourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode + "r", BLL.Const.CheckListMenuId);
 
                 if (reSourlist != null && reSourlist.Count > 0)
                 {
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx
index 386d7b9..d271345 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JointCheck.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.JointCheck" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <title>质量共检</title>
@@ -39,114 +41,128 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="GvJoinCheck" ShowBorder="true" ShowHeader="false" Title="质量共检" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="JointCheckId" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="JointCheckId" AllowSorting="true" SortField="CheckDate"
-                    SortDirection="DESC" OnSort="GvJoinCheck_Sort" EnableColumnLines="true" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="GvJoinCheck_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="GvJoinCheck_RowDoubleClick" AllowFilters="true"
-                    OnFilterChange="GvJoinCheck_FilterChange" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpSponsorUnit" runat="server" Label="受检施工单位" EnableEdit="true" EmptyText="请选择查询条件" Width="380px"
-                                     LabelAlign="right" LabelWidth="110px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="drpCheckType" runat="server" Label="检查类别" EnableEdit="true" EmptyText="请选择查询条件" Width="220px"
-                                     LabelAlign="right" LabelWidth="100px">
-                                </f:DropDownList>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
-                                      LabelAlign="right" Width="200px" LabelWidth="80px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
-                                      LabelAlign="right" Width="200px" LabelWidth="80px">
-                                </f:DatePicker>
-                                <f:DropDownList ID="drpState" runat="server" Label="审批状态" EnableEdit="true" EmptyText="请选择查询条件" Width="200px"
-                                     LabelAlign="right" LabelWidth="100px">
-                                </f:DropDownList>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置"  Icon="ArrowUndo" EnablePostBack="true" runat="server" Text="重置" >
-                                </f:Button>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add"  EnablePostBack="false" runat="server" Text="新增"
-                                    Hidden="true">
-                                </f:Button>
+                <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="GvJoinCheck" ShowBorder="true" ShowHeader="false" Title="质量共检" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="JointCheckId" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="JointCheckId" AllowSorting="true" SortField="CheckDate"
+                            SortDirection="DESC" OnSort="GvJoinCheck_Sort" EnableColumnLines="true" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="GvJoinCheck_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="GvJoinCheck_RowDoubleClick" AllowFilters="true"
+                            OnFilterChange="GvJoinCheck_FilterChange" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpSponsorUnit" runat="server" Label="受检施工单位" EnableEdit="true" EmptyText="请选择查询条件" Width="380px"
+                                            LabelAlign="right" LabelWidth="110px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpCheckType" runat="server" Label="检查类别" EnableEdit="true" EmptyText="请选择查询条件" Width="220px"
+                                            LabelAlign="right" LabelWidth="100px">
+                                        </f:DropDownList>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
+                                            LabelAlign="right" Width="200px" LabelWidth="80px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
+                                            LabelAlign="right" Width="200px" LabelWidth="80px">
+                                        </f:DatePicker>
+                                        <f:DropDownList ID="drpState" runat="server" Label="审批状态" EnableEdit="true" EmptyText="请选择查询条件" Width="200px"
+                                            LabelAlign="right" LabelWidth="100px">
+                                        </f:DropDownList>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server" Text="重置">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
 
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# GvJoinCheck.PageIndex * GvJoinCheck.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField  Width="180px" ColumnID="JointCheckCode" DataField="JointCheckCode"
-                            SortField="JointCheckCode" FieldType="String" HeaderText="编号" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField  Width="230px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="受检施工单位" TextAlign="Center"
-                            HeaderTextAlign="Center" >
-                        </f:RenderField>
-                         <f:TemplateField ColumnID="CheckType" Width="100px" HeaderText="检查类别" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertCheckType(Eval("CheckType")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField  ColumnID="CheckName" DataField="CheckName" Width="150px"
-                            SortField="CheckName" FieldType="String" HeaderText="检查名称" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                    </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='<%# GvJoinCheck.PageIndex * GvJoinCheck.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="180px" ColumnID="JointCheckCode" DataField="JointCheckCode"
+                                    SortField="JointCheckCode" FieldType="String" HeaderText="编号" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="230px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="受检施工单位" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="CheckType" Width="100px" HeaderText="检查类别" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# ConvertCheckType(Eval("CheckType")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="CheckName" DataField="CheckName" Width="150px"
+                                    SortField="CheckName" FieldType="String" HeaderText="检查名称" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                        <f:RenderField  ColumnID="CheckDate" DataField="CheckDate"
-                            SortField="CheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"  HeaderText="共检日期" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField  ColumnID="CheckMan" DataField="CheckMan"
-                            SortField="CheckMan" FieldType="String" HeaderText="发起人" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                         <f:TemplateField ColumnID="State" Width="120px" HeaderText="审批状态" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertState(Eval("State")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                         <f:TemplateField ColumnID="JointCheckId"  HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False" >
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertMan(Eval("JointCheckId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-  
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
-                    </PageItems>
-                </f:Grid>
+                                <f:RenderField ColumnID="CheckDate" DataField="CheckDate"
+                                    SortField="CheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="共检日期" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CheckMan" DataField="CheckMan"
+                                    SortField="CheckMan" FieldType="String" HeaderText="发起人" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="State" Width="120px" HeaderText="审批状态" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertState(Eval("State")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="JointCheckId" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertMan(Eval("JointCheckId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="质量共检" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -156,9 +172,9 @@
         <f:Menu ID="Menu1" runat="server">
             <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
-                      OnClick="btnMenuModify_Click">
+                    OnClick="btnMenuModify_Click">
                 </f:MenuButton>
-                 <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server"  Text="查看" Icon="Find"
+                <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="Find"
                     OnClick="btnMenuView_Click">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
@@ -175,7 +191,7 @@
             F(menuID).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
-       
+
     </script>
 </body>
 </html>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs
index 6e3bb4a..06ea9ff 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs
@@ -4,10 +4,6 @@ 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 System.Windows.Forms;
 
 namespace FineUIPro.Web.CQMS.Check
 {
@@ -62,21 +58,50 @@ namespace FineUIPro.Web.CQMS.Check
         {
             if (!IsPostBack)
             {
-                ProjectId = CurrUser.LoginProjectId;
-                GetButtonPower();
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
 
                 btnNew.OnClientClick = Window1.GetShowReference("EditJointCheck.aspx") + "return false;";
-                //if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
-                //{
-                //    this.ProjectId = Request.Params["projectId"];
-                //}
-                //权限按钮方法
-                UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
+
                 JointCheckService.Init(drpCheckType, true);
                 JointCheckService.InitState(drpState, true);
-                bindata();
+                BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.ProjectId, BLL.Const.ProjectUnitType_2, 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>
@@ -192,9 +217,12 @@ namespace FineUIPro.Web.CQMS.Check
         /// <summary>
         /// 列表数据
         /// </summary>
-        private void bindata()
+        private void BindGrid()
         {
-
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT chec.JointCheckId,chec.JointCheckCode,chec.State,chec.CheckDate,chec.CheckName,chec.unitId,"
                           + @" unit.UnitName,u.userName as CheckMan,chec.CheckType "
                           + @" FROM Check_JointCheck chec"
@@ -202,7 +230,7 @@ namespace FineUIPro.Web.CQMS.Check
                           + @" left join sys_User u on u.userId = chec.CheckMan"
                           + @" where chec.ProjectId=@ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') ";
             listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
             listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : ""));
@@ -265,13 +293,13 @@ namespace FineUIPro.Web.CQMS.Check
 
         protected void btnQuery_Click(object sender, EventArgs e)
         {
-            bindata();
+            BindGrid();
         }
 
         protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
         {
             GvJoinCheck.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
-            bindata();
+            BindGrid();
         }
 
         protected void GvJoinCheck_RowDoubleClick(object sender, GridRowClickEventArgs e)
@@ -283,7 +311,7 @@ namespace FineUIPro.Web.CQMS.Check
 
         protected void GvJoinCheck_PageIndexChange(object sender, GridPageEventArgs e)
         {
-            bindata();
+            BindGrid();
         }
 
         protected void GvJoinCheck_FilterChange(object sender, EventArgs e)
@@ -298,7 +326,7 @@ namespace FineUIPro.Web.CQMS.Check
 
         protected void Window1_Close(object sender, WindowCloseEventArgs e)
         {
-            bindata();
+            BindGrid();
         }
 
         protected void btnMenuModify_Click(object sender, EventArgs e)
@@ -330,7 +358,7 @@ namespace FineUIPro.Web.CQMS.Check
             JointCheckService.DeleteJointCheck(jointCheckId);
             LogService.AddSys_Log(CurrUser, "001", jointCheckId, Const.JointCheckMenuId, "删除质量共检记录");
             Alert.ShowInTop("删除成功！", MessageBoxIcon.Warning);
-            bindata();
+            BindGrid();
 
         }
 
@@ -399,7 +427,7 @@ namespace FineUIPro.Web.CQMS.Check
             drpState.SelectedIndex = 0;
             txtStartTime.Text = "";
             txtEndTime.Text = "";
-            bindata();
+            BindGrid();
         }
     }
 }
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs
index 5ca52c9..89b2fbb 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Check {
-    
-    
-    public partial class JointCheck {
-        
+namespace FineUIPro.Web.CQMS.Check
+{
+
+
+    public partial class JointCheck
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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>
         /// GvJoinCheck 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid GvJoinCheck;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpSponsorUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSponsorUnit;
-        
+
         /// <summary>
         /// drpCheckType 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCheckType;
-        
+
         /// <summary>
         /// txtStartTime 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartTime;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
         /// <summary>
         /// drpState 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpState;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnRset 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnRset;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs
index e9de53a..133be41 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs
@@ -38,17 +38,22 @@ namespace FineUIPro.Web.CQMS.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitUnitDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
                 {
                     this.panelLeftRegion.Hidden = true;
                     //   this.Grid1.Columns[0].Hidden = true;
-                    ////权限按钮方法
-                    this.GetList();
                 }
-                 
+                QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
+                Funs.FineUIPleaseSelect(drpQuestionType);
+                this.drpCheckType.DataTextField = "Text";
+                this.drpCheckType.DataValueField = "Value";
+                this.drpCheckType.DataSource = BLL.JointCheckService.GetCheckTypeList2();
+                this.drpCheckType.DataBind();
+                Funs.FineUIPleaseSelect(drpState);
+
                 BindGrid();
             }
 
@@ -56,28 +61,24 @@ namespace FineUIPro.Web.CQMS.Check
 
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
-            this.GetList();
+            this.InitUnitDownList();
             this.BindGrid();
-   
         }
-        private void GetList()
+
+        private void InitUnitDownList()
         {
-            QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
             UnitService.InitUnitDropDownList(drpSponsorUnit, this.ProjectId, true);//施工单位
             UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.ProjectId, true);//单位工程
             CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);//专业
-            this.drpCheckType.DataTextField = "Text";
-            this.drpCheckType.DataValueField = "Value";
-            this.drpCheckType.DataSource = BLL.JointCheckService.GetCheckTypeList2();
-            this.drpCheckType.DataBind();
-            Funs.FineUIPleaseSelect(drpState);
-            Funs.FineUIPleaseSelect(drpQuestionType);
         }
 
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"select * from  View_Check_JointCheckDetail where 1=1";
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs
index 1d39564..b8f76a7 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs
@@ -41,6 +41,7 @@ namespace FineUIPro.Web.CQMS.Check {
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                this.GetButtonPower();
                 this.txtEndTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
                 this.txtStartTime.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
                 this.ucTree.UnitId = this.CurrUser.UnitId;
@@ -49,8 +50,6 @@ namespace FineUIPro.Web.CQMS.Check {
                 {
                     this.panelLeftRegion.Hidden = true;
                     //   this.Grid1.Columns[0].Hidden = true;
-                    ////权限按钮方法
-                    this.GetButtonPower();
                 } 
                 BindGrid();
             }
@@ -59,8 +58,8 @@ namespace FineUIPro.Web.CQMS.Check {
         {
 
             this.ProjectId = this.ucTree.ProjectId;
-            this.BindGrid(); 
             this.GetButtonPower();
+            this.BindGrid(); 
         }
         private void GetButtonPower()
         {
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx
index 343ac1c..8a8ec17 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx
@@ -1,124 +1,139 @@
-﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RewardAndPunish.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.RewardAndPunish" %> 
+﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RewardAndPunish.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.RewardAndPunish" %>
+
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
 
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <title>奖罚通知单(定稿)</title>
-   
+
 </head>
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="奖罚通知单(定稿)" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="RewardAndPunishID" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="RewardAndPunishID" AllowSorting="true" SortField="Date"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
+                            OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpType" runat="server" Label="奖励通知单" EnableEdit="true" EmptyText="请选择查询条件" OnSelectedIndexChanged="drpType_SelectedIndexChanged" AutoPostBack="true"
+                                            LabelAlign="right">
+                                            <f:ListItem Value="0" Text="奖励通知单" />
+                                            <f:ListItem Value="1" Text="处罚通知单" />
+                                        </f:DropDownList>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="奖罚通知单(定稿)" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="RewardAndPunishID" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="RewardAndPunishID" AllowSorting="true" SortField="Date"
-                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
-                    OnFilterChange="Grid1_FilterChange"   EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpType" runat="server" Label="奖励通知单" EnableEdit="true" EmptyText="请选择查询条件" OnSelectedIndexChanged="drpType_SelectedIndexChanged" AutoPostBack="true"
-                                     LabelAlign="right">
-                                    <f:ListItem Value="0" Text="奖励通知单" />
-                                     <f:ListItem Value="1" Text="处罚通知单" />
-                                </f:DropDownList> 
-                                   
-                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 
-                               
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
-                                    Hidden="true">
-                                </f:Button>
-                                
-                            </Items>
-                        </f:Toolbar>
-                       
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="labNumber" runat="server" Text='<%#  Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField> 
-                      
-                        
-                        <f:TemplateField ColumnID="Type" Width="80px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertType(Eval("Type")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField ColumnID="ResponseUnit" Width="80px" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitName(Eval("ResponseUnit")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="80px" ColumnID="Description" DataField="Description" SortField="Description"
-                            FieldType="String" HeaderText="描述" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="Money" DataField="Money" SortField="Money"
-                            FieldType="String" HeaderText="金额" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                         
-                         
-                       
-                        <f:RenderField Width="95px" ColumnID="Date" DataField="Date" SortField="Date"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                      
-                      
-                        <f:TemplateField ColumnID="CreateMan" Width="80px" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lbCreateMan" runat="server" Text='<%# ConvertMan(Eval("CreateMan")) %>'></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("RewardAndPunishID")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
 
-                    </PageItems>
-                </f:Grid>
+
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
+
+                                    </Items>
+                                </f:Toolbar>
+
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="labNumber" runat="server" Text='<%#  Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+
+                                <f:TemplateField ColumnID="Type" Width="80px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# ConvertType(Eval("Type")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="ResponseUnit" Width="80px" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitName(Eval("ResponseUnit")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="80px" ColumnID="Description" DataField="Description" SortField="Description"
+                                    FieldType="String" HeaderText="描述" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Money" DataField="Money" SortField="Money"
+                                    FieldType="String" HeaderText="金额" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+
+
+
+                                <f:RenderField Width="95px" ColumnID="Date" DataField="Date" SortField="Date"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+
+
+                                <f:TemplateField ColumnID="CreateMan" Width="80px" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbCreateMan" runat="server" Text='<%# ConvertMan(Eval("CreateMan")) %>'></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("RewardAndPunishID")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="奖罚通知单(定稿)" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="700px" Height="360px">
-        </f:Window> 
+        </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
@@ -127,7 +142,7 @@
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click">
                 </f:MenuButton>
-               
+
             </Items>
         </f:Menu>
     </form>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs
index 8c98304..f176dcd 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs
@@ -11,9 +11,25 @@ using System.Web.UI.WebControls;
 namespace FineUIPro.Web.CQMS.Check
 {
     public partial class RewardAndPunish : PageBase
-    {/// <summary>
-     /// 项目id
-     /// </summary>
+    {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目id
+        /// </summary>
         public string RewardAndPunishID
         {
             get
@@ -25,17 +41,48 @@ namespace FineUIPro.Web.CQMS.Check
                 ViewState["RewardAndPunishID"] = value;
             }
         }
+        #endregion
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
-                GetButtonPower();
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 btnNew.OnClientClick = Window1.GetShowReference("RewardAndPunishEdit.aspx") + "return false;";
                 // 绑定表格
-                BindGrid(); 
+                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>
         /// 绑定数据
@@ -43,6 +90,10 @@ namespace FineUIPro.Web.CQMS.Check
 
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             DataTable tb = ChecklistData();
 
             // 2.获取当前分页数据
@@ -55,9 +106,9 @@ namespace FineUIPro.Web.CQMS.Check
             Grid1.DataSource = table;
             Grid1.DataBind();
 
-             }
+        }
+
 
-       
         protected DataTable ChecklistData()
         {
             string strSql = @" SELECT RewardAndPunishID
@@ -72,14 +123,14 @@ namespace FineUIPro.Web.CQMS.Check
                      where ProjectId=@ProjectId";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-               
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+
             if (drpType.SelectedValue != Const._Null)
             {
                 strSql += " AND Type=@Type";
                 listStr.Add(new SqlParameter("@Type", drpType.SelectedValue));
             }
-            
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             return tb;
@@ -172,7 +223,7 @@ namespace FineUIPro.Web.CQMS.Check
         /// <param name="e"></param>
         protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
         {
-          btnMenuModify_Click(null, null);
+            btnMenuModify_Click(null, null);
         }
 
 
@@ -226,7 +277,7 @@ namespace FineUIPro.Web.CQMS.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.RewardAndPunishMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.RewardAndPunishMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -266,8 +317,8 @@ namespace FineUIPro.Web.CQMS.Check
                 return;
             }
             string codes = Grid1.SelectedRowID.Split(',')[0];
-            
-             BLL.RewardAndPunishService.DeleteRewardAndPunishById(codes);
+
+            BLL.RewardAndPunishService.DeleteRewardAndPunishById(codes);
             BLL.LogService.AddSys_Log(this.CurrUser, "", codes, BLL.Const.CheckListMenuId, "删除奖罚通知单(定稿)");
             Grid1.DataBind();
             BindGrid();
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.designer.cs
index ab7a114..e6d9bc8 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.CQMS.Check
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx
index 8001dcf..1f21519 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SpecialCheckList.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.SpecialCheckList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <title>专项检查</title>
@@ -35,11 +37,12 @@
             background-color: #79FF79;
         }*/
 
-        .Green  {
+        .Green {
             background-color: Green;
-            color:white;
+            color: white;
         }
-        .Yellow  {
+
+        .Yellow {
             background-color: #FFFF93;
         }
 
@@ -50,6 +53,7 @@
         .LightGreen {
             background-color: LightGreen
         }
+
         .f-grid-colheader-text {
             white-space: normal;
             word-break: break-all;
@@ -59,167 +63,180 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f: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"
+                            runat="server" BoxFlex="1" DataKeyNames="CheckSpecialId" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="CheckSpecialId" AllowSorting="true" SortField="CheckTime"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
+                            OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpSponsorUnit" runat="server" Label="施工单位" EnableEdit="true" EmptyText="请选择查询条件"
+                                            LabelAlign="right">
+                                        </f:DropDownList>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="专项巡检记录" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="CheckSpecialId" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="CheckSpecialId" AllowSorting="true" SortField="CheckTime"
-                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
-                    OnFilterChange="Grid1_FilterChange"  EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpSponsorUnit" runat="server" Label="施工单位" EnableEdit="true" EmptyText="请选择查询条件"
-                                     LabelAlign="right">
+                                        <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+
+
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
+                                            LabelAlign="right">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
+                                            LabelAlign="right">
+                                        </f:DatePicker>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
+                                        </f:Button>
+
+
+                                        <f:Button ID="btnIn" OnClick="btnIn_Click" runat="server" ToolTip="导入" Icon="ApplicationGet" Text="导入"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField Width="55px" HeaderText="序号">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:TemplateField ColumnID="ProjectQualityType" Width="100px" HeaderText="检查单位" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertUnit(Eval("UnitId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="100px" ColumnID="CheckTime" DataField="CheckTime"
+                                    SortField="CheckTime" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CheckType" DataField="CheckType"
+                                    SortField="CheckType" FieldType="String" HeaderText="检查类型" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CheckClass" DataField="CheckClass"
+                                    SortField="CheckClass" FieldType="String" HeaderText="检查类别" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="CheckPerson" Width="100px" HeaderText="检查组成员" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label4" runat="server" Text='<%# ConvertUser(Eval("CheckPerson")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="100px" ColumnID="CheckPersonOther" DataField="CheckPersonOther"
+                                    SortField="CheckPersonOther" FieldType="String" HeaderText="检查组成员(手录)" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="WorkAreaId" Width="100px" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# ConvertWorkArea(Eval("WorkAreaId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField Width="180px" ColumnID="CheckAreas" DataField="CheckAreas"
+                                    SortField="Account" FieldType="String" HeaderText="部位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="CNProfessionalCode" Width="100px" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label5" runat="server" Text='<%# ConvertCNProfessional(Eval("CNProfessionalCode")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="CheckUnitId" Width="100px" HeaderText="受检单位" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label6" runat="server" Text='<%# ConvertUnit(Eval("CheckUnitId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="CheckPerson" Width="100px" HeaderText="责任人" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label7" runat="server" Text='<%# ConvertUser(Eval("ResponseMan")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField Width="220px" ColumnID="ProblemType" DataField="ProblemType" FieldType="String"
+                                    HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="ProblemDes" DataField="ProblemDes" FieldType="String"
+                                    HeaderText="问题描述" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="Suggest" DataField="Suggest" FieldType="String"
+                                    HeaderText="整改意见" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="LimitedTime" DataField="LimitedTime"
+                                    SortField="LimitedTime" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="现时日期" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
                                 </f:DropDownList>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
 
-                                <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                                <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                               
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                  
-                                
-                                  <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
-                                      LabelAlign="right" >
-                                </f:DatePicker>
-                                  <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
-                                      LabelAlign="right"  >
-                                </f:DatePicker>
-                                   
-                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"    Icon="SystemSearch" EnablePostBack="true" runat="server" >
-                                </f:Button>
-                                  
-                                
-                                <f:Button ID="btnIn" OnClick="btnIn_Click" runat="server" ToolTip="导入" Icon="ApplicationGet" Text="导入"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                       
-                    </Toolbars>
-                    <Columns>
-                         <f:TemplateField Width="55px" HeaderText="序号">
-                                <ItemTemplate>
-                                    <asp:Label ID="Label2" runat="server" Text='<%# Container.DataItemIndex + 1 %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                             
-                              <f:TemplateField ColumnID="ProjectQualityType" Width="100px" HeaderText="检查单位" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                               <ItemTemplate>
-                                    <asp:Label ID="Label3" runat="server" Text='<%# ConvertUnit(Eval("UnitId")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                             <f:RenderField Width="100px" ColumnID="CheckTime" DataField="CheckTime"
-                                SortField="CheckTime" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="100px" ColumnID="CheckType" DataField="CheckType"
-                                SortField="CheckType" FieldType="String" HeaderText="检查类型" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="100px" ColumnID="CheckClass" DataField="CheckClass"
-                                SortField="CheckClass" FieldType="String" HeaderText="检查类别" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:TemplateField ColumnID="CheckPerson" Width="100px" HeaderText="检查组成员" HeaderTextAlign="Center" TextAlign="Center"
-                                EnableLock="true" Locked="False">
-                               <ItemTemplate>
-                                    <asp:Label ID="Label4" runat="server" Text='<%# ConvertUser(Eval("CheckPerson")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                           <f:RenderField Width="100px" ColumnID="CheckPersonOther" DataField="CheckPersonOther"
-                                SortField="CheckPersonOther" FieldType="String" HeaderText="检查组成员(手录)" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                            <f:TemplateField ColumnID="WorkAreaId" Width="100px" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Center"
-                                EnableLock="true" Locked="False">
-                               <ItemTemplate>
-                                    <asp:Label ID="Label1" runat="server" Text='<%# ConvertWorkArea(Eval("WorkAreaId")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-
-                             <f:RenderField Width="180px" ColumnID="CheckAreas" DataField="CheckAreas"
-                                SortField="Account" FieldType="String" HeaderText="部位" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                             <f:TemplateField ColumnID="CNProfessionalCode" Width="100px" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Center"
-                                EnableLock="true" Locked="False">
-                               <ItemTemplate>
-                                    <asp:Label ID="Label5" runat="server" Text='<%# ConvertCNProfessional(Eval("CNProfessionalCode")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                            <f:TemplateField ColumnID="CheckUnitId" Width="100px" HeaderText="受检单位" HeaderTextAlign="Center" TextAlign="Center"
-                                EnableLock="true" Locked="False">
-                               <ItemTemplate>
-                                    <asp:Label ID="Label6" runat="server" Text='<%# ConvertUnit(Eval("CheckUnitId")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                            <f:TemplateField ColumnID="CheckPerson" Width="100px" HeaderText="责任人" HeaderTextAlign="Center" TextAlign="Center"
-                                EnableLock="true" Locked="False">
-                               <ItemTemplate>
-                                    <asp:Label ID="Label7" runat="server" Text='<%# ConvertUser(Eval("ResponseMan")) %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                            
-                            <f:RenderField Width="220px" ColumnID="ProblemType" DataField="ProblemType" FieldType="String"
-                                HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="220px" ColumnID="ProblemDes" DataField="ProblemDes" FieldType="String"
-                                HeaderText="问题描述" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField> 
-                            <f:RenderField Width="220px" ColumnID="Suggest" DataField="Suggest" FieldType="String"
-                                HeaderText="整改意见" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                             <f:RenderField Width="100px" ColumnID="LimitedTime" DataField="LimitedTime"
-                                SortField="LimitedTime" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="现时日期" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
-
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="专项巡检详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="1300px" Height="660px">
         </f:Window>
-         <f:Window ID="Window2" Title="质量罚款单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window2" Title="质量罚款单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="1000px" Height="450px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-   <%--             <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
+                <%--             <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
                     OnClick="btnMenuModify_Click">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="Find"
@@ -234,7 +251,7 @@
                <f:MenuButton ID="MenuButton3" EnablePostBack="true" EnableAjax="false" runat="server"  DisableControlBeforePostBack="false"  Text="生成质量罚款单" Icon="Find"
                     OnClick="btnMenuFine_Click">
                 </f:MenuButton>--%>
-               
+
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click">
                 </f:MenuButton>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs
index bd1f94c..91bf919 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs
@@ -58,35 +58,64 @@ namespace FineUIPro.Web.CQMS.Check
         /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
-
             // 表头过滤
             //FilterDataRowItem = FilterDataRowItemImplement;
             if (!IsPostBack)
             {
-                  code = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode + "-QC-TCC-XJ-";
-
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                GetButtonPower();
-                //if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
-                //{
-                //    this.ProjectId = Request.Params["projectId"];
-                //}
-                //权限按钮方法
-                UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
-                UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
+                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();
+                }
                 CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
-                
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
                 // 绑定表格
                 BindGrid();
-
-
-
             }
-            
-
         }
+
+
+
+        private void InitDropDownList()
+        {
+            if (!string.IsNullOrWhiteSpace(this.ProjectId))
+            {
+                code = ProjectService.GetProjectByProjectId(this.ProjectId).ProjectCode + "-QC-TCC-XJ-";
+            }
+            UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.ProjectId, BLL.Const.ProjectUnitType_2, true);
+            UnitWorkService.InitUnitWorkDownList(drpUnitWork, 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();
+        }
+
+
         #endregion
         //public System.Web.UI.WebControls.ListItem[] GetHandelStatus()
         //{
@@ -129,7 +158,7 @@ namespace FineUIPro.Web.CQMS.Check
                             where chec.ProjectId=@ProjectId";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             strSql += " AND (chec.CheckTime>=@startTime or @startTime='') and (chec.CheckTime<=@endTime or @endTime='') ";
             listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
             listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + "  23:59:59" : ""));
@@ -148,8 +177,8 @@ namespace FineUIPro.Web.CQMS.Check
                 strSql += " AND chec.CNProfessionalCode=@CNProfessionalCode";
                 listStr.Add(new SqlParameter("@CNProfessionalCode", drpCNProfessional.SelectedValue));
             }
-          
-            
+
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             return tb;
@@ -211,12 +240,13 @@ namespace FineUIPro.Web.CQMS.Check
             {
                 IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId);
 
-                 if (sourlist != null&& sourlist.Count>0)
+                if (sourlist != null && sourlist.Count > 0)
                 {
                     string AttachUrl = "";
-                    foreach(var item in sourlist)
-                    {   if(!string.IsNullOrEmpty(item.AttachUrl)&& item.AttachUrl.ToLower().EndsWith(".jpg")|| item.AttachUrl.ToLower().EndsWith(".jpeg")|| item.AttachUrl.ToLower().EndsWith(".png"))
-                        AttachUrl += item.AttachUrl.TrimEnd(',')+",";
+                    foreach (var item in sourlist)
+                    {
+                        if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
+                            AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
                     }
                     url = BLL.UploadAttachmentService.ShowImage("../../", AttachUrl.TrimEnd(','));
                 }
@@ -228,7 +258,7 @@ namespace FineUIPro.Web.CQMS.Check
             string url = string.Empty;
             if (registrationId != null)
             {
-                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString()+"r", BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId);
 
                 if (sourlist != null && sourlist.Count > 0)
                 {
@@ -243,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Check
             }
             return url;
         }
-        
+
         public string Convertstatus(Object code)
         {
             Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString());
@@ -275,6 +305,10 @@ namespace FineUIPro.Web.CQMS.Check
 
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             DataTable tb = ChecklistData();
 
             // 2.获取当前分页数据
@@ -286,9 +320,6 @@ namespace FineUIPro.Web.CQMS.Check
 
             Grid1.DataSource = table;
             Grid1.DataBind();
-
-          
-           
         }
 
 
@@ -391,11 +422,12 @@ namespace FineUIPro.Web.CQMS.Check
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SpecialCheckListView.aspx?CheckSpecialId={0}", codes, "查看 - ")));
                 return;
             }
-            else {
+            else
+            {
                 Alert.ShowInTop("未查询到详情数据，请与管理员联系！", MessageBoxIcon.Warning);
                 return;
             }
-           
+
             //if (checks != null)
             //{
             //    if (checks.State.Equals(Const.CheckControl_Complete))
@@ -468,11 +500,11 @@ namespace FineUIPro.Web.CQMS.Check
             }
             string codes = Grid1.SelectedRowID.Split(',')[0];
             //var checks = BLL.CheckControlService.GetCheckControl(codes);
-           var spec= Funs.DB.Check_CheckSpecialDataIn.FirstOrDefault(x => x.CheckSpecialId == codes);
+            var spec = Funs.DB.Check_CheckSpecialDataIn.FirstOrDefault(x => x.CheckSpecialId == codes);
             Funs.DB.Check_CheckSpecialDataIn.DeleteOnSubmit(spec);
             Funs.DB.SubmitChanges();
             //BLL.CheckControlApproveService.DeleteCheckControlApprovesByCheckControlCode(codes);
-           // BLL.CheckControlService.DeleteCheckControl(codes);
+            // BLL.CheckControlService.DeleteCheckControl(codes);
             BLL.LogService.AddSys_Log(this.CurrUser, codes, codes, BLL.Const.CheckSpecialListMenuId, "删除质量专项巡检记录");
             Grid1.DataBind();
             BindGrid();
@@ -494,10 +526,10 @@ namespace FineUIPro.Web.CQMS.Check
             var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.CheckListMenuId);
             if (buttonList.Count() > 0)
             {
-                 
+
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
-                   // this.btnMenuModify.Hidden = false;
+                    // this.btnMenuModify.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
@@ -771,7 +803,7 @@ namespace FineUIPro.Web.CQMS.Check
                         }
                     }
                 }
-               IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode, BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode, BLL.Const.CheckListMenuId);
 
                 if (sourlist != null && sourlist.Count > 0)
                 {
@@ -786,9 +818,10 @@ namespace FineUIPro.Web.CQMS.Check
                         }
 
                     }
-                    string []pics = AttachUrl.Split(',');
-                    foreach(string item in pics)
-                  { switch (indexPic)
+                    string[] pics = AttachUrl.Split(',');
+                    foreach (string item in pics)
+                    {
+                        switch (indexPic)
                         {
                             case 1:
                                 {
@@ -963,7 +996,7 @@ namespace FineUIPro.Web.CQMS.Check
 
                 if (bookmarkSendDate != null)
                 {
-                   
+
                     if (checks.CheckDate.HasValue != null)
                     {
                         bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
@@ -1030,7 +1063,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
 
                 Bookmark bookmarkCheckDate = doc.Range.Bookmarks["CheckDate"];
-                
+
                 if (bookmarkCheckDate != null)
                 {
 
@@ -1064,7 +1097,7 @@ namespace FineUIPro.Web.CQMS.Check
                         bookmarkCheckMan.Text = sysUser.UserName;
                     }
                 }
-                
+
                 Bookmark bookmarkResponseMan = doc.Range.Bookmarks["ResponseMan"];
                 Bookmark bookmarkResponseDate = doc.Range.Bookmarks["ResponseDate"];
                 if (bookmarkResponseMan != null)
@@ -1234,7 +1267,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
 
 
-                IList<Model.AttachFile> reSourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode+"r", BLL.Const.CheckListMenuId);
+                IList<Model.AttachFile> reSourlist = AttachFileService.GetBeforeFileList(checks.CheckControlCode + "r", BLL.Const.CheckListMenuId);
 
                 if (reSourlist != null && reSourlist.Count > 0)
                 {
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.designer.cs
index 3b448b4..83ac819 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.CQMS.Check
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
index e5df598..f1d3ca1 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MajorPlanApproval.aspx.cs" Inherits="FineUIPro.Web.Comprehensive.MajorPlanApproval" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,94 +11,108 @@
 </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="MajorPlanApprovalId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="MajorPlanApprovalId" AllowSorting="true" SortField="PlanCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="超过一定规模的危大施工方案" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="MajorPlanApprovalId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="MajorPlanApprovalId" AllowSorting="true" SortField="PlanCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpCNPr" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
+                                        <f:TextBox runat="server" ID="txtPlanName" Label="方案名称" LabelAlign="Right"></f:TextBox>
+
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" Icon="SystemSearch"
+                                            EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" 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="200px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="PlanCode" DataField="PlanCode" FieldType="String" HeaderText="编号" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="PlanName" DataField="PlanName" FieldType="String" HeaderText="方案名称" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="180px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ReviewMan" DataField="ReviewMan" FieldType="String" HeaderText="评审人员" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="审批日期" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="AuditMan" DataField="AuditMan" FieldType="String" HeaderText="审核人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="批准人" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="220px">
+                                </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("MajorPlanApprovalId")) %>' ToolTip="附件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
                                 </f:DropDownList>
-                                <f:DropDownList ID="drpCNPr" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
-                                <f:TextBox runat="server" ID="txtPlanName" Label="方案名称" LabelAlign="Right"></f:TextBox>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSearch" Icon="SystemSearch"
-                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                </f:Button>
-                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" 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="200px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField ColumnID="PlanCode" DataField="PlanCode" FieldType="String" HeaderText="编号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="PlanName" DataField="PlanName" FieldType="String" HeaderText="方案名称" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="180px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ReviewMan" DataField="ReviewMan" FieldType="String" HeaderText="评审人员" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="审批日期" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="AuditMan" DataField="AuditMan" FieldType="String" HeaderText="审核人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="批准人" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="220px">
-                        </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("MajorPlanApprovalId")) %>'   ToolTip="附件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="超过一定规模的危大施工方案" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs
index 458f636..f93529c 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs
@@ -1,4 +1,5 @@
 ﻿using BLL;
+using FineUIPro.Web.DataShow;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -9,6 +10,22 @@ namespace FineUIPro.Web.Comprehensive
 {
     public partial class MajorPlanApproval : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,18 +36,59 @@ 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.drpCNPr, 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 MajorPlanApprovalId, ProjectId, PlanCode, PlanName, ReviewMan, ApprovalDate,
                               AuditMan, ApprovalMan, ImplementationDeviation, AttachUrl, CompileMan, CompileDate, 
                               UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName 
@@ -39,7 +97,7 @@ namespace FineUIPro.Web.Comprehensive
 							  left join Base_Unit as u on u.UnitId = C.UnitId
                               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";
@@ -232,7 +290,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.MajorPlanApprovalMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.MajorPlanApprovalMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs
index 83e202b..1c60d31 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class MajorPlanApproval {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class MajorPlanApproval
+    {
+
         /// <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>
         /// drpCNPr 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNPr;
-        
+
         /// <summary>
         /// txtPlanName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPlanName;
-        
+
         /// <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>
         /// lblPageIndex 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <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>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx b/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx
index 1116ecd..140422f 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QuarterlyProjectQuality.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReport.QuarterlyProjectQuality" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -11,69 +13,83 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="季度工程项目质量信息表" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="QuarterlyProjectQualityId"
-                    DataIDField="QuarterlyProjectQualityId" AllowSorting="true" ForceFit="true"
-                    SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <f: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="QuarterlyProjectQualityId"
+                            DataIDField="QuarterlyProjectQualityId" AllowSorting="true" ForceFit="true"
+                            SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpYear" runat="server" Label="年度" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
+                                    SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="YearAndQuarters" DataField="YearAndQuarters"
+                                    SortField="YearAndQuarters" FieldType="String" HeaderText="季报时间" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="ResponsiblePersonName" DataField="ResponsiblePersonName"
+                                    SortField="ResponsiblePersonName" FieldType="String" HeaderText="填报单位负责人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                 </f:DropDownList>
-                                <f:DropDownList ID="drpQuarters" runat="server" Label="季度" LabelAlign="Right" Width="250px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:DropDownList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                            TextAlign="Center" />
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
-                            SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="YearAndQuarters" DataField="YearAndQuarters"
-                            SortField="YearAndQuarters" FieldType="String" HeaderText="季报时间" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="110px" ColumnID="ResponsiblePersonName" DataField="ResponsiblePersonName"
-                            SortField="ResponsiblePersonName" FieldType="String" HeaderText="填报单位负责人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="110px" ColumnID="CompileManName" DataField="CompileManName"
-                            SortField="CompileManName" FieldType="String" HeaderText="填报人" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
-                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="填报日期" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="季度工程项目质量信息表" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.cs
index 912c55f..f8d99e8 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.cs
@@ -42,8 +42,15 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, BLL.ConstValue.Group_0011, true);
@@ -58,10 +65,30 @@ namespace FineUIPro.Web.CQMS.ManageReport
             }
         }
         /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT QuarterlyProjectQuality.QuarterlyProjectQualityId, "
                           + @"QuarterlyProjectQuality.ProjectId,"
                           + @"QuarterlyProjectQuality.UnitId,"
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.designer.cs
index 22252fc..9ae7a64 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQuality.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ManageReport {
-    
-    
-    public partial class QuarterlyProjectQuality {
-        
+namespace FineUIPro.Web.CQMS.ManageReport
+{
+
+
+    public partial class QuarterlyProjectQuality
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpQuarters 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQuarters;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
index c88f44d..ead2084 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
@@ -1,10 +1,12 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructSolution.aspx.cs" Inherits="FineUIPro.Web.CQMS.Solution.ConstructSolution" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>施工组织设计及施工方案</title>
     <style type="text/css">
@@ -21,6 +23,7 @@
             color: Red;
             font-size: small;
         }
+
         .red {
             background-color: red;
         }
@@ -56,157 +59,170 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f: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"
+                            runat="server" BoxFlex="1" DataKeyNames="ConstructSolutionId" AllowCellEditing="true"
+                            OnRowDataBound="Grid1_RowDataBound"
+                            ClicksToEdit="2" DataIDField="ConstructSolutionId" AllowSorting="true" SortField="ApproveDate"
+                            SortDirection="DESC" EnableColumnLines="true" OnPageIndexChange="Grid1_PageIndexChange"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true" OnRowCommand="Grid1_RowCommand"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                            EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpModelType" runat="server" Label="模板类别" LabelAlign="Right" EnableEdit="true">
+                                            <f:ListItem Text="施工组织设计模板" Value="1" />
+                                            <f:ListItem Text="施工方案模板" Value="3" />
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpProposeUnit" runat="server" Label="单位名称" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpSolutionType" runat="server" Label="方案类别" LabelAlign="Right" EnableEdit="true">
+                                        </f:DropDownList>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpState" runat="server" Label="审批状态" LabelAlign="Right" EnableEdit="true">
+                                            <f:ListItem Text="全部" Value="null" />
+                                            <f:ListItem Text="已闭合" Value="1" />
+                                            <f:ListItem Text="未闭合" Value="0" Selected="true" />
+                                        </f:DropDownList>
 
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="施工方案" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="ConstructSolutionId" AllowCellEditing="true"
-                    OnRowDataBound="Grid1_RowDataBound"
-                    ClicksToEdit="2" DataIDField="ConstructSolutionId" AllowSorting="true" SortField="ApproveDate"
-                    SortDirection="DESC" EnableColumnLines="true"  OnPageIndexChange="Grid1_PageIndexChange"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10"  ForceFit="true" OnRowCommand="Grid1_RowCommand"
-                    EnableRowDoubleClickEvent="true" AllowFilters="true" OnRowDoubleClick="Grid1_RowDoubleClick"
-                    EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpModelType" runat="server"  Label="模板类别" LabelAlign="Right" EnableEdit="true">
-                                    <f:ListItem Text="施工组织设计模板" Value="1" />
-                                    <f:ListItem Text="施工方案模板" Value="3" />
-                                </f:DropDownList>
-                                   <f:DropDownList ID="drpUnitWork" runat="server"  Label="单位工程" LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                                    <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业"   LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                                 <f:DropDownList ID="drpProposeUnit" runat="server"  Label="单位名称" LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                                 <f:DropDownList ID="drpSolutionType" runat="server"  Label="方案类别" LabelAlign="Right" EnableEdit="true">
-                                </f:DropDownList>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                  <f:DropDownList ID="drpState" runat="server" Label="审批状态" LabelAlign="Right" EnableEdit="true" >
-                                      <f:ListItem Text="全部" Value="null" />  
-                                      <f:ListItem Text="已闭合" Value="1" />
-                                      <f:ListItem Text="未闭合" Value="0"  Selected="true"/>
-                                </f:DropDownList>
-                                
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnQuery" ToolTip="查询" OnClick="btnQuery_Click" Icon="SystemSearch" EnablePostBack="true" runat="server" Text="查询">
-                                </f:Button>
-                                <f:Button runat="server" ID="btnDownLoad" Icon="ArrowDown" ToolTip="模板下载" Text="模板下载">
-                                    <Listeners>
-                                        <f:Listener Event="click" Handler="ButtonClick" />
-                                    </Listeners>
-                                </f:Button>
-                                
-                                <f:Button ID="btnRset" ToolTip="重置" OnClick="btnRset_Click" Icon="ArrowUndo" EnablePostBack="true" runat="server" Text="重置">
-                                </f:Button>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增">
-                                </f:Button>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" OnClick="btnQuery_Click" Icon="SystemSearch" EnablePostBack="true" runat="server" Text="查询">
+                                        </f:Button>
+                                        <f:Button runat="server" ID="btnDownLoad" Icon="ArrowDown" ToolTip="模板下载" Text="模板下载">
+                                            <Listeners>
+                                                <f:Listener Event="click" Handler="ButtonClick" />
+                                            </Listeners>
+                                        </f:Button>
 
-                    </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="code" DataField="code" Width="120px"
-                            SortField="code" FieldType="String" HeaderText="编号" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SolutionName" DataField="SolutionName" Width="130px"
-                            SortField="SolutionName" FieldType="String" HeaderText="方案名称" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
+                                        <f:Button ID="btnRset" ToolTip="重置" OnClick="btnRset_Click" Icon="ArrowUndo" EnablePostBack="true" runat="server" Text="重置">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
 
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" Width="160px" 
-                            SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                          <f:RenderField ColumnID="UnitWorkIds" Width="120px" DataField="UnitWorkIds"
-                            SortField="UnitWorkIds" FieldType="String" HeaderText="单位工程" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="70px" ColumnID="CNProfessionalCodes"  DataField="CNProfessionalCodes" SortField="CNProfessionalCodes"
-                            FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                         
-                         <f:TemplateField ColumnID="Edition" Width="70px" HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label41" runat="server" Text='<%# ConvertEdition(Eval("Edition")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="120px" ColumnID="SolutionTempleteTypeName"  DataField="SolutionTempleteTypeName" SortField="SolutionTempleteTypeName"
-                            FieldType="String" HeaderText="方案类别" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
+                            </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="code" DataField="code" Width="120px"
+                                    SortField="code" FieldType="String" HeaderText="编号" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SolutionName" DataField="SolutionName" Width="130px"
+                                    SortField="SolutionName" FieldType="String" HeaderText="方案名称" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="UnitName" DataField="UnitName" Width="160px"
+                                    SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="UnitWorkIds" Width="120px" DataField="UnitWorkIds"
+                                    SortField="UnitWorkIds" FieldType="String" HeaderText="单位工程" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="70px" ColumnID="CNProfessionalCodes" DataField="CNProfessionalCodes" SortField="CNProfessionalCodes"
+                                    FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+
+                                <f:TemplateField ColumnID="Edition" Width="70px" HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label41" runat="server" Text='<%# ConvertEdition(Eval("Edition")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="120px" ColumnID="SolutionTempleteTypeName" DataField="SolutionTempleteTypeName" SortField="SolutionTempleteTypeName"
+                                    FieldType="String" HeaderText="方案类别" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
 
 
-                        <f:RenderField ColumnID="CompileManName" Width="70px" DataField="CompileManName"
-                            SortField="CompileManName" FieldType="String" HeaderText="编制人" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                         
-                        <f:TemplateField ColumnID="AuditDate" Width="100px" HeaderText="审核时间" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.ConvertAuditDate(Eval("ConstructSolutionId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                         <f:TemplateField ColumnID="ToAuditMan" Width="60px" HeaderText="待审批人" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.ConvertToDo(Eval("ConstructSolutionId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:LinkButtonField ColumnID="exportSuggestion" HeaderText="意见" Width="70px" Icon="ArrowDown" CommandName="exportSuggestion" />
-                        <f:LinkButtonField HeaderText="审批表" ColumnID="exportApproval" Width="70px" Icon="ArrowDown" CommandName="exportApproval" />
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="60px" CommandName="attchUrl" ColumnID="AttchUrl"
-                            TextAlign="Center" ToolTip="附件" Text="附件" />
-                        </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>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
+                                <f:RenderField ColumnID="CompileManName" Width="70px" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="编制人" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
 
-                    </PageItems>
-                </f:Grid>
+                                <f:TemplateField ColumnID="AuditDate" Width="100px" HeaderText="审核时间" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.ConvertAuditDate(Eval("ConstructSolutionId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="ToAuditMan" Width="60px" HeaderText="待审批人" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.ConvertToDo(Eval("ConstructSolutionId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:LinkButtonField ColumnID="exportSuggestion" HeaderText="意见" Width="70px" Icon="ArrowDown" CommandName="exportSuggestion" />
+                                <f:LinkButtonField HeaderText="审批表" ColumnID="exportApproval" Width="70px" Icon="ArrowDown" CommandName="exportApproval" />
+                                <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="60px" CommandName="attchUrl" ColumnID="AttchUrl"
+                                    TextAlign="Center" ToolTip="附件" Text="附件" />
+                            </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>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <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>
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
         <f:Window ID="Window1" Title="施工组织设计及施工方案" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="850px" Height="500px">
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
index 254b7d5..1a87ed6 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
@@ -15,52 +15,43 @@ namespace FineUIPro.Web.CQMS.Solution
 {
     public partial class ConstructSolution : PageBase
     {
-        #region 获取按钮权限
+        #region 项目主键
         /// <summary>
-        /// 获取按钮权限
+        /// 项目主键
         /// </summary>
-        /// <param name="button"></param>
-        /// <returns></returns>
-        private void GetButtonPower()
+        public string ProjectId
         {
-            if (Request.Params["value"] == "0")
+            get
             {
-                return;
+                return (string)ViewState["ProjectId"];
             }
-            var buttonList = CommonService.GetAllButtonList(CurrUser.LoginProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId);
-            if (buttonList.Count() > 0)
+            set
             {
-                if (buttonList.Contains(Const.BtnAdd))
-                {
-                    btnNew.Hidden = false;
-
-                }
-                if (buttonList.Contains(Const.BtnModify) || buttonList.Contains(Const.BtnSubmit))
-                {
-                    btnMenuModify.Hidden = false;
-                }
-                if (buttonList.Contains(Const.BtnDelete))
-                {
-                    btnMenuDel.Hidden = false;
-                }
+                ViewState["ProjectId"] = value;
             }
         }
         #endregion
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
-                GetButtonPower();
-                BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpSolutionType, true);
-                //Funs.FineUIPleaseSelect(drpState);
-                UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
-                CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
-                UnitService.InitMainAndSubUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, false);
-                btnNew.OnClientClick = window_tt.GetShowReference("EditConstructSolution.aspx") + "return false;";
-                if (this.CurrUser.UnitId != null && CommonService.GetProjectUnitType(this.CurrUser.LoginProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UnitId != Const.hfnbdId)
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpProposeUnit.Hidden = true;
+                    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();
+                }
+                CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
+                btnNew.OnClientClick = window_tt.GetShowReference("EditConstructSolution.aspx") + "return false;";
                 BindGrid();
             }
             else
@@ -93,6 +84,65 @@ namespace FineUIPro.Web.CQMS.Solution
             }
         }
 
+        private void InitDropDownList()
+        {
+            BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpSolutionType, true);
+            //Funs.FineUIPleaseSelect(drpState);
+            UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.ProjectId, true);
+            UnitService.InitMainAndSubUnitDropDownList(drpProposeUnit, ProjectId, false);
+            if (this.CurrUser.UnitId != null && CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UnitId != Const.hfnbdId)
+            {
+                this.drpProposeUnit.Hidden = 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();
+        }
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = CommonService.GetAllButtonList(ProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(Const.BtnAdd))
+                {
+                    btnNew.Hidden = false;
+
+                }
+                if (buttonList.Contains(Const.BtnModify) || buttonList.Contains(Const.BtnSubmit))
+                {
+                    btnMenuModify.Hidden = false;
+                }
+                if (buttonList.Contains(Const.BtnDelete))
+                {
+                    btnMenuDel.Hidden = false;
+                }
+            }
+        }
+        #endregion
         protected string ConvertEdition(object edition)
         {
            return string.Format("{0:#0.#}",((int)edition)/10.0);
@@ -136,8 +186,8 @@ namespace FineUIPro.Web.CQMS.Solution
                               + @" where chec.ProjectId=@ProjectId";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
-            if (this.CurrUser.UnitId != null && CommonService.GetProjectUnitType(this.CurrUser.LoginProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UnitId != Const.hfnbdId)
+            listStr.Add(new SqlParameter("@ProjectId", ProjectId));
+            if (this.CurrUser.UnitId != null && CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UnitId != Const.hfnbdId)
             {
                 strSql += " AND chec.UnitId='" + this.CurrUser.UnitId + "'";
             }
@@ -216,10 +266,14 @@ namespace FineUIPro.Web.CQMS.Solution
         }
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             var list = ChecklistData();
             Grid1.RecordCount = list.Rows.Count;
             var CNProfessional = CNProfessionalService.GetCNProfessionalItem();
-            var uniWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
+            var uniWork = UnitWorkService.GetUnitWorkLists(ProjectId);
             if (list.Rows.Count > 0)
             {
                 for (int i = 0; i < list.Rows.Count; i++)
@@ -835,7 +889,7 @@ namespace FineUIPro.Web.CQMS.Solution
                 return;
             }
             string id = Grid1.SelectedRowID.Split(',')[0];
-            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId, Const.BtnDelete))
+            if (CommonService.GetAllButtonPowerList(ProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId, Const.BtnDelete))
             {
                 var constructSolution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(id);
                 CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id);
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs
index f878b05..de3fc17 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.CQMS.Solution
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs
index 6cc1466..069f437 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.CQMS.Solution
             {
                 return;
             }
-            var buttonList = CommonService.GetAllButtonList(CurrUser.LoginProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId);
+            var buttonList = CommonService.GetAllButtonList(ProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId);
             if (buttonList.Count() > 0)
             {
                 
@@ -138,7 +138,7 @@ namespace FineUIPro.Web.CQMS.Solution
                                where ProjectId=@ProjectId";
 
                 List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", ProjectId));
                 if (this.CurrUser.UnitId != null && CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UnitId != Const.hfnbdId)
                 {
                     strSql += " AND solution.UnitId='" + this.CurrUser.UnitId + "'";
@@ -192,6 +192,10 @@ namespace FineUIPro.Web.CQMS.Solution
         }
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             var list = ChecklistData();
             Grid1.RecordCount = list.Rows.Count;
             var CNProfessional = CNProfessionalService.GetCNProfessionalItem();
@@ -661,7 +665,7 @@ namespace FineUIPro.Web.CQMS.Solution
                 return;
             }
             string id = Grid1.SelectedRowID.Split(',')[0];
-            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId, Const.BtnDelete))
+            if (CommonService.GetAllButtonPowerList(ProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId, Const.BtnDelete))
             {
                 var constructSolution = CQMSConstructSolutionFinalService.GetConstructSolutionByConstructSolutionId(id);
                  CQMSConstructSolutionFinalService.DeleteConstructSolution(id);
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx
index 1050f07..c8a190e 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx
+++ b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NDTPersonRegister.aspx.cs" Inherits="FineUIPro.Web.HJGL.PersonManage.NDTPersonRegister" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,74 +12,87 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="无损检测人员登记表" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WED_ID"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="WED_ID" AllowSorting="true"
-                    SortField="WED_Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="无损检测人员登记表" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WED_ID"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="WED_ID" AllowSorting="true"
+                            SortField="WED_Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
 
-                             <f:DropDownList ID="dpUnit" runat="server"   Label="检测单位" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="dpUnit_SelectedIndexChanged"  ></f:DropDownList>
+                                        <f:DropDownList ID="dpUnit" runat="server" Label="检测单位" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="dpUnit_SelectedIndexChanged"></f:DropDownList>
 
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                                 <f:Button ID="btnPrint" runat="server" Icon="Printer" EnablePostBack="true"    Text="打印" ToolTip="打印" OnClick="btnPrint_Click" DisableControlBeforePostBack="false">
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnPrint" runat="server" Icon="Printer" EnablePostBack="true" Text="打印" ToolTip="打印" OnClick="btnPrint_Click" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
 
-                            </f:Button>           
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
-                         
-                        <f:RenderField Width="110px" ColumnID="WED_Name" DataField="WED_Name" FieldType="String"
-                            HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="110px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                            HeaderText="检测单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        
-                        <f:RenderField Width="220px" ColumnID="WorkCode" DataField="WorkCode" FieldType="String"
-                            HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="280px" ColumnID="EquipmentID" DataField="EquipmentID" FieldType="String"
-                            HeaderText="项目合格代号" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="170px" ColumnID="QueClass" DataField="QueClass" FieldType="String"
-                            HeaderText="级别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="320px" ColumnID="WLimitDate" DataField="WLimitDate" FieldType="String"
-                            HeaderText="有效期限" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="60px" CommandName="attchUrl" ColumnID="AttchUrl"
-                            TextAlign="Center" ToolTip="附件" Text="附件" />
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                                <f:RenderField Width="110px" ColumnID="WED_Name" DataField="WED_Name" FieldType="String"
+                                    HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="检测单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+
+                                <f:RenderField Width="220px" ColumnID="WorkCode" DataField="WorkCode" FieldType="String"
+                                    HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="280px" ColumnID="EquipmentID" DataField="EquipmentID" FieldType="String"
+                                    HeaderText="项目合格代号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="170px" ColumnID="QueClass" DataField="QueClass" FieldType="String"
+                                    HeaderText="级别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="320px" ColumnID="WLimitDate" DataField="WLimitDate" FieldType="String"
+                                    HeaderText="有效期限" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="60px" CommandName="attchUrl" ColumnID="AttchUrl"
+                                    TextAlign="Center" ToolTip="附件" Text="附件" />
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="无损检测人员登记" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -94,10 +109,10 @@
             </f:MenuButton>
         </f:Menu>
         <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false"   runat="server" IsModal="true" Width="700px"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
-         <f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
+        <f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
             IsModal="true" Width="1010px" Height="680px">
         </f:Window>
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.cs b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.cs
index 0d3b878..4704390 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.cs
@@ -1,4 +1,5 @@
 ﻿using BLL;
+using FineUIPro.Web.DataShow;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -9,6 +10,22 @@ namespace FineUIPro.Web.HJGL.PersonManage
 {
     public partial class NDTPersonRegister : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         /// <summary>
         /// 加载页面
         /// </summary>
@@ -18,20 +35,58 @@ namespace FineUIPro.Web.HJGL.PersonManage
         {
             if (!IsPostBack)
             {
-                var cUnit = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_5);
-                if (cUnit != null)
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.dpUnit.DataTextField = "UnitName";
-                    this.dpUnit.DataValueField = "UnitId";
-                    this.dpUnit.DataSource = cUnit;
-                    this.dpUnit.DataBind();
-                    Funs.FineUIPleaseSelect(dpUnit);
+                    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();
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
             }
         }
+        
+
+
+        private void InitDropDownList()
+        {
+            var cUnit = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.ProjectId, BLL.Const.ProjectUnitType_5);
+            if (cUnit != null)
+            {
+                this.dpUnit.DataTextField = "UnitName";
+                this.dpUnit.DataValueField = "UnitId";
+                this.dpUnit.DataSource = cUnit;
+                this.dpUnit.DataBind();
+                Funs.FineUIPleaseSelect(dpUnit);
+            }
+        }
+
+        /// <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();
+        }
+  
 
         #region 绑定数据
         /// <summary>
@@ -39,6 +94,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT welder.WED_ID,
                                     welder.WED_Code,
                                     welder.WED_Name,
@@ -52,7 +111,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                          + @" FROM View_PersonManageList AS welder"
                          + @" WHERE welder.WederType ='2' AND welder.ProjectId=@projectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@projectId", this.ProjectId));
             if (this.dpUnit.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND welder.WED_Unit=@WED_Unit ";
@@ -250,7 +309,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_NDTPersonRegisterMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_NDTPersonRegisterMenuId, button);
         }
         #endregion
 
@@ -281,7 +340,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
             // string reportId = this.tvControlItem.SelectedNode.NodeID;
             // var trust = BLL.TrustManageEditService.GetCH_TrustByID(reportId);
             Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
-            keyValuePairs.Add("ProjectName", ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId));
+            keyValuePairs.Add("ProjectName", ProjectService.GetProjectNameByProjectId(this.ProjectId));
             string strSql = @"SELECT welder.WED_ID,
                                     welder.WED_Code,
                                     welder.WED_Name,
@@ -294,7 +353,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                        + @" FROM View_PersonManageList AS welder"
                        + @" WHERE welder.WederType ='2' AND welder.ProjectId=@projectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@projectId", this.ProjectId));
 
             SqlParameter[] parameter = listStr.ToArray();
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.designer.cs
index 4a1f048..ab709d3 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/NDTPersonRegister.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx
index b5dee9a..70d024f 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx
+++ b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonManage.aspx.cs" Inherits="FineUIPro.Web.HJGL.PersonManage.PersonManage" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,97 +12,111 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员管理" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WED_ID"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="WED_ID" AllowSorting="true"
-                    SortField="WED_Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="drpUnitId" runat="server" Label="单位" EnableEdit="true" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpUnitId_SelectedIndexChanged" Width="300px"></f:DropDownList>
-                                <f:DropDownList ID="drpTeamGroupId" runat="server" Label="班组" EnableEdit="true" LabelAlign="Right" Width="300px"></f:DropDownList>
-                                <f:TextBox ID="txtWelderCode" runat="server" Label="焊工代号" EmptyText="输入查询条件"
-                                    LabelAlign="Right" Width="300px">
-                                </f:TextBox>
-                                <f:TextBox ID="txtWelderName" runat="server" Label="焊工姓名" EmptyText="输入查询条件"
-                                    LabelAlign="Right" Width="300px">
-                                </f:TextBox>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" runat="server">
-                            <Items>
-                                <f:TextBox ID="txtWorkCodeS" runat="server" Label="上岗证号" EmptyText="输入查询条件" LabelAlign="Right" Width="300px">
-                                </f:TextBox>
-                                <f:TextBox ID="txtClassS" runat="server" Label="焊工等级" EmptyText="输入查询条件" LabelAlign="Right" Width="300px">
-                                </f:TextBox>
-                                
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnQuery" Text="查询" ToolTip="查询" Icon="SystemSearch"
-                                    EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
-                                </f:Button>
-                                <f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
-                        <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                            HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String"
-                            HeaderText="班组" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="WED_Code" DataField="WED_Code" FieldType="String"
-                            HeaderText="焊工代号" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="WED_Name" DataField="WED_Name" FieldType="String"
-                            HeaderText="焊工姓名" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="WED_Sex" DataField="WED_Sex" FieldType="String"
-                            HeaderText="性别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="WED_Birthday" DataField="WED_Birthday" FieldType="Date"
-                            HeaderText="出生日期" HeaderTextAlign="Center" TextAlign="Left" Renderer="Date">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="WED_WorkCode" DataField="WED_WorkCode" FieldType="String"
-                            HeaderText="上岗证号" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="WED_Class" DataField="WED_Class" FieldType="String"
-                            HeaderText="焊工等级" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="WED_IfOnGuardName" DataField="WED_IfOnGuardName" FieldType="String"
-                            HeaderText="是否在岗" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:LinkButtonField Width="80px" TextAlign="Center" CommandName="PersonQualifiedProject" Text="合格项目" HeaderText="合格项目" />
-                        <f:LinkButtonField Width="80px" TextAlign="Center" CommandName="BS_SteelClick" Text="资质条件" HeaderText="焊工资质" />
-                        <f:LinkButtonField Width="80px" TextAlign="Center" CommandName="BS_WelderScore" Text="焊工业绩" HeaderText="焊工业绩" />
-                        <%--<f:LinkButtonField Width="90px" TextAlign="Center" CommandName="BS_WelderScore" Text="焊工资质证书" HeaderText="焊工资质证书"/>--%>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员管理" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WED_ID"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="WED_ID" AllowSorting="true"
+                            SortField="WED_Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" EnableEdit="true" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpUnitId_SelectedIndexChanged" Width="300px"></f:DropDownList>
+                                        <f:DropDownList ID="drpTeamGroupId" runat="server" Label="班组" EnableEdit="true" LabelAlign="Right" Width="300px"></f:DropDownList>
+                                        <f:TextBox ID="txtWelderCode" runat="server" Label="焊工代号" EmptyText="输入查询条件"
+                                            LabelAlign="Right" Width="300px">
+                                        </f:TextBox>
+                                        <f:TextBox ID="txtWelderName" runat="server" Label="焊工姓名" EmptyText="输入查询条件"
+                                            LabelAlign="Right" Width="300px">
+                                        </f:TextBox>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar2" runat="server">
+                                    <Items>
+                                        <f:TextBox ID="txtWorkCodeS" runat="server" Label="上岗证号" EmptyText="输入查询条件" LabelAlign="Right" Width="300px">
+                                        </f:TextBox>
+                                        <f:TextBox ID="txtClassS" runat="server" Label="焊工等级" EmptyText="输入查询条件" LabelAlign="Right" Width="300px">
+                                        </f:TextBox>
+
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" Text="查询" ToolTip="查询" Icon="SystemSearch"
+                                            EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
+                                <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String"
+                                    HeaderText="班组" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="WED_Code" DataField="WED_Code" FieldType="String"
+                                    HeaderText="焊工代号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="WED_Name" DataField="WED_Name" FieldType="String"
+                                    HeaderText="焊工姓名" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="WED_Sex" DataField="WED_Sex" FieldType="String"
+                                    HeaderText="性别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="WED_Birthday" DataField="WED_Birthday" FieldType="Date"
+                                    HeaderText="出生日期" HeaderTextAlign="Center" TextAlign="Left" Renderer="Date">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="WED_WorkCode" DataField="WED_WorkCode" FieldType="String"
+                                    HeaderText="上岗证号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="WED_Class" DataField="WED_Class" FieldType="String"
+                                    HeaderText="焊工等级" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="WED_IfOnGuardName" DataField="WED_IfOnGuardName" FieldType="String"
+                                    HeaderText="是否在岗" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:LinkButtonField Width="80px" TextAlign="Center" CommandName="PersonQualifiedProject" Text="合格项目" HeaderText="合格项目" />
+                                <f:LinkButtonField Width="80px" TextAlign="Center" CommandName="BS_SteelClick" Text="资质条件" HeaderText="焊工资质" />
+                                <f:LinkButtonField Width="80px" TextAlign="Center" CommandName="BS_WelderScore" Text="焊工业绩" HeaderText="焊工业绩" />
+                                <%--<f:LinkButtonField Width="90px" TextAlign="Center" CommandName="BS_WelderScore" Text="焊工资质证书" HeaderText="焊工资质证书"/>--%>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="人员管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs
index 810581d..4ff3dbb 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.HJGL.PersonManage
 {
     public partial class PersonManage : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -19,27 +35,62 @@ namespace FineUIPro.Web.HJGL.PersonManage
             if (!IsPostBack)
             {
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
+                //Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 Funs.FineUIPleaseSelect(drpTeamGroupId);
 
-                var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
-                if (unit == null || CommonService.GetProjectUnitType(this.CurrUser.LoginProjectId, this.CurrUser.UnitId) == BLL.Const.ProjectUnitType_1 || UnitService.IsSubUnitByProjectAndUnit(this.CurrUser.LoginProjectId, this.CurrUser.UnitId))
-                {
-                    drpUnitId.Enabled = true;
-                }
-                else
-                {
-                    drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    drpUnitId.Enabled = false;
-                    BLL.TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);
-
-                }
-
                 // 绑定表格
                 this.BindGrid();
             }
         }
+        
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
+            if (unit == null || CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) == BLL.Const.ProjectUnitType_1 || UnitService.IsSubUnitByProjectAndUnit(this.ProjectId, this.CurrUser.UnitId))
+            {
+                drpUnitId.Enabled = true;
+            }
+            else
+            {
+                drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                drpUnitId.Enabled = false;
+                BLL.TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, 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();
+        }
 
         #region 绑定数据
         /// <summary>
@@ -47,6 +98,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT Welder.WED_ID,
                                     Welder.ProjectId,
                                     Welder.WED_Unit,
@@ -66,7 +121,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                          + @" LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId"
                          + @" WHERE Welder.ProjectId=@projectId AND (Welder.WederType='1' OR Welder.WederType is null)";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@projectId", this.ProjectId));
             if (this.drpUnitId.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND Welder.WED_Unit = @unitId";
@@ -258,7 +313,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                             }
                         }
                     }
-                    Project_HJGLData_HJGLService.StatisticalData(this.CurrUser.LoginProjectId, Project_HJGLData_HJGLService.HJGLDateType.TotalNumberOfWelders);
+                    Project_HJGLData_HJGLService.StatisticalData(this.ProjectId, Project_HJGLData_HJGLService.HJGLDateType.TotalNumberOfWelders);
                     BindGrid();
                     if (!string.IsNullOrEmpty(strShowNotify))
                     {
@@ -345,7 +400,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
             this.drpTeamGroupId.Items.Clear();
             if (this.drpUnitId.SelectedValue != BLL.Const._Null)
             {
-                BLL.TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);
+                BLL.TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true);
                 this.drpTeamGroupId.SelectedIndex = 0;
             }
             else
@@ -364,7 +419,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_WelderManageMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_WelderManageMenuId, button);
         }
         #endregion
     }
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.designer.cs
index 8ddc30a..a184913 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.PersonManage {
-    
-    
-    public partial class PersonManage {
-        
+namespace FineUIPro.Web.HJGL.PersonManage
+{
+
+
+    public partial class PersonManage
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// drpTeamGroupId 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpTeamGroupId;
-        
+
         /// <summary>
         /// txtWelderCode 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWelderCode;
-        
+
         /// <summary>
         /// txtWelderName 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWelderName;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtWorkCodeS 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkCodeS;
-        
+
         /// <summary>
         /// txtClassS 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtClassS;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Window3 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
-        
+
         /// <summary>
         /// Window4 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window4;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx b/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx
index aa83fcf..ac85132 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx
@@ -1,5 +1,7 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProcedureImageList.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.ProcedureImageList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,61 +12,75 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工艺评定图片" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ImageId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="ImageId" AllowSorting="true"
-                    SortField="ImageContent" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" EnablePostBack="true"
-                                    runat="server" OnClick="btnNew_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
-                        <f:RenderField Width="200px" ColumnID="ImageContent" DataField="ImageContent" FieldType="String"
-                            HeaderText="图片摘要" HeaderTextAlign="Center" TextAlign="Left" SortField="ImageContent" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField Width="220px" ColumnID="WeldingMethodName" DataField="WeldingMethodName" FieldType="String"
-                            HeaderText="焊接方法" HeaderTextAlign="Center" TextAlign="Left" SortField="WeldingMethodName">
-                        </f:RenderField>
-                        <f:RenderField Width="220px" ColumnID="Thickness" DataField="Thickness" FieldType="String"
-                            HeaderText="厚度" HeaderTextAlign="Center" TextAlign="Left" SortField="Thickness">
-                        </f:RenderField>
-                        <f:RenderField Width="220px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
-                            HeaderText="焊缝类型" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="220px" ColumnID="GrooveTypeName" DataField="GrooveTypeName" FieldType="String"
-                            HeaderText="坡口形式" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工艺评定图片" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ImageId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ImageId" AllowSorting="true"
+                            SortField="ImageContent" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" EnablePostBack="true"
+                                            runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
+                                <f:RenderField Width="200px" ColumnID="ImageContent" DataField="ImageContent" FieldType="String"
+                                    HeaderText="图片摘要" HeaderTextAlign="Center" TextAlign="Left" SortField="ImageContent" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="WeldingMethodName" DataField="WeldingMethodName" FieldType="String"
+                                    HeaderText="焊接方法" HeaderTextAlign="Center" TextAlign="Left" SortField="WeldingMethodName">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="Thickness" DataField="Thickness" FieldType="String"
+                                    HeaderText="厚度" HeaderTextAlign="Center" TextAlign="Left" SortField="Thickness">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
+                                    HeaderText="焊缝类型" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="GrooveTypeName" DataField="GrooveTypeName" FieldType="String"
+                                    HeaderText="坡口形式" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="工艺图片管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.cs b/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.cs
index 15415b5..792bc89 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 {
     public partial class ProcedureImageList : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -18,18 +34,53 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             if (!IsPostBack)
             {
+                //Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            //this.GetButtonPower();
+            this.BindGrid();
+        }
         #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT Proce.ImageId, 
                                      Proce.ImageContent, 
                                      Proce.AttachUrl, 
@@ -46,7 +97,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                          + @" LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=Proce.GrooveTypeId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " Where Proce.ProjectId = @ProjectId";
-            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);
@@ -238,7 +289,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <returns></returns>
         private bool GetButtonPower(string button)
         {
-            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_ProcedureImageListMenuId, button);
+            return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_ProcedureImageListMenuId, button);
         }
         #endregion
     }
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.designer.cs
index 0568f35..f81c543 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage {
-    
-    
-    public partial class ProcedureImageList {
-        
+namespace FineUIPro.Web.HJGL.WeldingManage
+{
+
+
+    public partial class ProcedureImageList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
