From 787b9de1ae3787685906443cfb3fb8874f2a6f1e Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 20 Nov 2025 17:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=AE=BE=E8=AE=A1=E5=9B=BE?=
 =?UTF-8?q?=E7=BA=B8=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96:=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E5=B7=A6=E4=BE=A7=E6=8C=89=E4=B8=BB=E9=A1=B9=E5=92=8C?=
 =?UTF-8?q?=E4=B8=93=E4=B8=9A=E4=B8=8B=E6=8B=89=E6=A0=91=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/DesignDrawing/ArchivesLib.aspx       | 346 +++++++++---------
 .../CQMS/DesignDrawing/ArchivesLib.aspx.cs    | 250 +++++++++----
 .../ArchivesLib.aspx.designer.cs              | 139 ++++---
 .../CQMS/DesignDrawing/ArchivesLibIssue.aspx  |  36 +-
 .../DesignDrawing/ArchivesLibIssue.aspx.cs    | 248 +++++++++----
 .../ArchivesLibIssue.aspx.designer.cs         | 145 +++++---
 .../DesignDrawing/ArchivesLibReceive.aspx     | 337 +++++++++--------
 .../DesignDrawing/ArchivesLibReceive.aspx.cs  | 252 +++++++++----
 .../ArchivesLibReceive.aspx.designer.cs       | 137 ++++---
 SGGL/FineUIPro.Web/common/Menu_CQMS.xml       |   2 +
 SGGL/FineUIPro.Web/common/Menu_JDGL.xml       |   1 +
 11 files changed, 1164 insertions(+), 729 deletions(-)
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
index 11f1e9e6..c1ac3700 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
@@ -49,182 +49,200 @@
 <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:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
-                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlClass" runat="server" Label="保密等级" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlIfmail" runat="server" Label="蓝图寄出" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="是" Text="是"></f:ListItem>
-                                    <f:ListItem Value="否" Text="否"></f:ListItem>
-                                </f:DropDownList>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="ddlDesignUserName" runat="server" Label="设计人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlJiaoheUserName" runat="server" Label="校核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlShenheUserName" runat="server" Label="审核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlShendingUserName" runat="server" Label="审定人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlMajorResponsibleUserName" runat="server" Label="专业负责" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DatePicker runat="server" Label="入库日期" ID="txtStartUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" Label="验收日期" ID="txtStartSendTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label2" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndSendTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" Label="打印日期" ID="txtStartPrintTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label3" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndPrintTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
-                                </f:DatePicker>
-                                <f:RadioButtonList ID="rbType" Label="下发情况" runat="server" LabelWidth="80px" Width="280px" AutoPostBack="true" OnSelectedIndexChanged="rbType_SelectedIndexChanged">
-                                    <f:RadioItem Text="全部" Value="2" Selected="true" />
-                                    <f:RadioItem Text="未下发" Value="0" />
-                                    <f:RadioItem Text="已下发" Value="1" />
-                                </f:RadioButtonList>
-                            </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:GroupField ColumnID="GroupField2" runat="server" HeaderText="IDP系统数据信息" HeaderTextAlign="Center">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                    RegionPercent="20%" Title="装工主项-专业" TitleToolTip="装工主项-专业" ShowBorder="true" ShowHeader="true"
+                    BodyPadding="10px">
+                    <Items>
+                        <f:Tree ID="trSubjectMajor" EnableCollapse="true" ShowHeader="true" EnableCheckBox="true" OnlyLeafCheck="true"
+                            OnNodeCommand="trSubjectMajor_NodeCommand" OnNodeExpand="trSubjectMajor_NodeExpand" AutoLeafIdentification="true"
+                            runat="server">
+                        </f:Tree>
+                        <f:HiddenField runat="server" ID="hdSelectId">
+                        </f:HiddenField>
+                        <f:HiddenField runat="server" ID="hdMajorCode">
+                        </f:HiddenField>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
+                            runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <%--<f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>--%>
+                                        <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <%--<f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>--%>
+                                        <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlClass" runat="server" Label="保密等级" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlIfmail" runat="server" Label="蓝图寄出" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                            <f:ListItem Value="" Text=""></f:ListItem>
+                                            <f:ListItem Value="是" Text="是"></f:ListItem>
+                                            <f:ListItem Value="否" Text="否"></f:ListItem>
+                                        </f:DropDownList>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="ddlDesignUserName" runat="server" Label="设计人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlJiaoheUserName" runat="server" Label="校核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlShenheUserName" runat="server" Label="审核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlShendingUserName" runat="server" Label="审定人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlMajorResponsibleUserName" runat="server" Label="专业负责" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DatePicker runat="server" Label="入库日期" ID="txtStartUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label1" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" Label="验收日期" ID="txtStartSendTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label2" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndSendTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" Label="打印日期" ID="txtStartPrintTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label3" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndPrintTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                        </f:DatePicker>
+                                        <f:RadioButtonList ID="rbType" Label="下发情况" runat="server" LabelWidth="80px" Width="280px" AutoPostBack="true" OnSelectedIndexChanged="rbType_SelectedIndexChanged">
+                                            <f:RadioItem Text="全部" Value="2" Selected="true" />
+                                            <f:RadioItem Text="未下发" Value="0" />
+                                            <f:RadioItem Text="已下发" Value="1" />
+                                        </f:RadioButtonList>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
                             <Columns>
-                                <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
-                                    FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
-                                    FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
-                                    FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
-                                    FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
-                                    FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
-                                    FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
-                                    FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
-                                    FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
-                                    FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
-                                    FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
-                                    FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
-                                    FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
-                                    FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
-                                    FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="数字档案馆数据信息" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
-                                    FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
-                                    FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
+                                <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="IDP系统数据信息" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <%--<f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
+                                            FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
+                                            FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>--%>
+                                        <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
+                                            FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
+                                            FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <%--<f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
+                                            FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
+                                            FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>--%>
+                                        <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
+                                            FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
+                                            FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
+                                            FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
+                                            FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
+                                            FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
+                                            FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
+                                            FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
+                                            FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="数字档案馆数据信息" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
+                                            FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
+                                            FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
+                                            <ItemTemplate>
+                                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                    </Columns>
+                                </f:GroupField>
                             </Columns>
-                        </f:GroupField>
-                    </Columns>
-                    <%-- <Listeners>
+                            <%-- <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>--%>
 
-                    <%--<Listeners>
+                            <%--<Listeners>
                         <f:Listener Event="dataload" Handler="onGridDataLoad" />
                     </Listeners>--%>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                        <f:ToolbarFill runat="server">
-                        </f:ToolbarFill>
+                            <PageItems>
+                                <f: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"
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs
index e08960ed..7bd875e9 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs
@@ -29,6 +29,34 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 ViewState["ProjectId"] = value;
             }
         }
+        /// <summary>
+        /// SubjectCode
+        /// </summary>
+        public string SubjectCode
+        {
+            get
+            {
+                return (string)ViewState["SubjectCode"];
+            }
+            set
+            {
+                ViewState["SubjectCode"] = value;
+            }
+        }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        public string MajorNo
+        {
+            get
+            {
+                return (string)ViewState["MajorNo"];
+            }
+            set
+            {
+                ViewState["MajorNo"] = value;
+            }
+        }
 
         #region 加载页面
 
@@ -41,38 +69,121 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         {
             if (!IsPostBack)
             {
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.InitDropDownList();
-
-                ////权限按钮方法
-                //UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
-                //UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
-                //CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
-                //QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
-                //Funs.FineUIPleaseSelect(this.dpHandelStatus);
-                //btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
-                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                //if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, CurrUser.UnitId))
-                //{
-                //    drpSponsorUnit.SelectedValue = CurrUser.UnitId;
-                //    drpSponsorUnit.Readonly = true;
-                //}
-                // 绑定表格
-                BindGrid();
-
+                GetButtonPower();
+                InitTreeMenu();
             }
-
         }
 
+        #region  加载树
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.trSubjectMajor.Nodes.Clear();
+            this.trSubjectMajor.ShowBorder = false;
+            this.trSubjectMajor.ShowHeader = false;
+            this.trSubjectMajor.EnableIcons = true;
+            this.trSubjectMajor.AutoScroll = true;
+            this.trSubjectMajor.EnableSingleClickExpand = true;
+            var subjects = (from x in Funs.DB.IDP_DesignDrawing
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            orderby x.ProjectDeviceProcedureSubjectCode
+                            select new
+                            {
+                                x.ProjectDeviceProcedureSubjectCode,
+                                x.WbsFullPath
+                            }).Distinct().ToList();
+            foreach (var q in subjects)
+            {
+                TreeNode newNode = new TreeNode();
+                newNode.Text = $"[{q.ProjectDeviceProcedureSubjectCode}]{q.WbsFullPath}";
+                newNode.NodeID = q.ProjectDeviceProcedureSubjectCode;
+                newNode.CommandName = "Subject";
+                newNode.EnableExpandEvent = true;
+                newNode.EnableClickEvent = true;
+                this.trSubjectMajor.Nodes.Add(newNode);
+                TreeNode emptyNode = new TreeNode();
+                emptyNode.Text = "";
+                emptyNode.NodeID = "";
+                newNode.Nodes.Add(emptyNode);
+            }
+        }
+        #endregion
+
+        #region  展开树
+
+        /// <summary>
+        /// 展开树
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trSubjectMajor_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            if (e.Node.CommandName == "Subject") //展开装工主编码、名称
+            {
+                var majors = (from x in BLL.Funs.DB.IDP_DesignDrawing
+                              where x.ProjectDeviceProcedureSubjectCode == e.Node.NodeID && x.ProjectId == this.CurrUser.LoginProjectId
+                              orderby x.MajorNo
+                              select new
+                              {
+                                  x.MajorNo,
+                                  x.MajorName
+                              }).Distinct().ToList();
+                foreach (var q in majors)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = $"[{q.MajorNo}]{q.MajorName}";
+                    newNode.NodeID = $"{e.Node.NodeID}#{q.MajorNo}";
+                    newNode.CommandName = "Major";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    newNode.EnableCheckBox = false;
+                    newNode.EnableCheckEvent = false;
+                    e.Node.Nodes.Add(newNode);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  Tree点击事件
+        /// <summary>
+        /// Tree点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trSubjectMajor_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            if (this.trSubjectMajor.SelectedNode.ParentNode == null)
+            {
+                //return;
+                this.SubjectCode = this.trSubjectMajor.SelectedNode.NodeID;
+                this.MajorNo = string.Empty;
+            }
+            else
+            {
+                this.SubjectCode = this.trSubjectMajor.SelectedNode.ParentNode.NodeID;
+                this.MajorNo = this.trSubjectMajor.SelectedNode.NodeID.Split('#')[1];
+            }
+            BindGrid();
+        }
+        #endregion
+
+
         /// <summary>
         /// 下拉加载
         /// </summary>
         private void InitDropDownList()
         {
-            BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false);
-            BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false);
-            BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
+            //BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false);
+            //BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
             //BLL.DesignDrawingService.InitMajorNoDropDownList(this.ddlMajorNo, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitStatusNameDropDownList(this.ddlStatus, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitClassDropDownList(this.ddlClass, this.CurrUser.LoginProjectId, false);
 
@@ -97,6 +208,16 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
 
+            if (!string.IsNullOrEmpty(this.SubjectCode))
+            {
+                strSql += " AND ProjectDeviceProcedureSubjectCode = @SubjectCode  ";
+                listStr.Add(new SqlParameter("@SubjectCode", this.SubjectCode));
+            }
+            if (!string.IsNullOrEmpty(this.MajorNo))
+            {
+                strSql += " AND MajorNo = @MajorNo  ";
+                listStr.Add(new SqlParameter("@MajorNo", this.MajorNo));
+            }
             if (!string.IsNullOrEmpty(txtStartUpdateTime.Text.Trim()))
             {
                 strSql += " AND UpdateTime >= @startUpdateTime  ";
@@ -127,21 +248,36 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 strSql += " AND Printtime <= @endPrintTime  ";
                 listStr.Add(new SqlParameter("@endPrintTime", $"{Funs.GetNewDateTime(txtEndPrintTime.Text.Trim())} 23:59:59"));
             }
-            if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
-            {
-                strSql += " AND (1=2 ";
-                int i = 0;
-                foreach (var item in this.ddlWbsFullPath.SelectedValueArray)
-                {
-                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
-                    {
-                        strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString();
-                        listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item));
-                    }
-                    i++;
-                }
-                strSql += ")";
-            }
+            //if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
+            //{
+            //    strSql += " AND (1=2 ";
+            //    int i = 0;
+            //    foreach (var item in this.ddlWbsFullPath.SelectedValueArray)
+            //    {
+            //        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+            //        {
+            //            strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString();
+            //            listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item));
+            //        }
+            //        i++;
+            //    }
+            //    strSql += ")";
+            //}
+            //if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1))
+            //{
+            //    strSql += " AND (1=2 ";
+            //    int i = 0;
+            //    foreach (var item in this.ddlMajorName.SelectedValueArray)
+            //    {
+            //        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+            //        {
+            //            strSql += " OR MajorName = @MajorName" + i.ToString();
+            //            listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item));
+            //        }
+            //        i++;
+            //    }
+            //    strSql += ")";
+            //}
             if (this.ddlFileVersion.SelectedItemArray.Count() > 1 || (this.ddlFileVersion.SelectedValue != BLL.Const._Null && this.ddlFileVersion.SelectedItemArray.Count() == 1))
             {
                 strSql += " AND (1=2 ";
@@ -157,21 +293,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 }
                 strSql += ")";
             }
-            if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1))
-            {
-                strSql += " AND (1=2 ";
-                int i = 0;
-                foreach (var item in this.ddlMajorName.SelectedValueArray)
-                {
-                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
-                    {
-                        strSql += " OR MajorName = @MajorName" + i.ToString();
-                        listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item));
-                    }
-                    i++;
-                }
-                strSql += ")";
-            }
             if (this.ddlStatus.SelectedItemArray.Count() > 1 || (this.ddlStatus.SelectedValue != BLL.Const._Null && this.ddlStatus.SelectedItemArray.Count() == 1))
             {
                 strSql += " AND (1=2 ";
@@ -302,7 +423,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         /// <summary>
         /// 绑定数据
         /// </summary>
-
         public void BindGrid()
         {
             DataTable tb = BindData();
@@ -316,32 +436,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
 
             Grid1.DataSource = table;
             Grid1.DataBind();
-
-            //for (int i = 0; i < Grid1.Rows.Count; i++)
-            //{
-            //    string rowID = Grid1.Rows[i].DataKeys[0].ToString();
-            //    if (rowID.Count() > 0)
-            //    {
-            //        Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID);
-            //        if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认      
-            //        }
-            //        else if (checkControl.State == Const.CheckControl_Complete)
-            //        { //闭环
-            //            Grid1.Rows[i].CellCssClasses[11] = "Green";
-
-            //        }
-            //        else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now)  //延期未整改
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = "Red";
-            //        }
-            //        else  //期内未整改
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = " Yellow ";
-            //        }
-            //    }
-            //}
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs
index aed2a65b..211d3cd9 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.DesignDrawing {
-    
-    
-    public partial class ArchivesLib {
-        
+namespace FineUIPro.Web.CQMS.DesignDrawing
+{
+
+
+    public partial class ArchivesLib
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,52 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// trSubjectMajor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trSubjectMajor;
+
+        /// <summary>
+        /// hdSelectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdSelectId;
+
+        /// <summary>
+        /// hdMajorCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdMajorCode;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +94,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,16 +103,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
-        /// <summary>
-        /// ddlWbsFullPath 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlWbsFullPath;
-        
+
         /// <summary>
         /// ddlFileVersion 控件。
         /// </summary>
@@ -74,16 +112,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlFileVersion;
-        
-        /// <summary>
-        /// ddlMajorName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlMajorName;
-        
+
         /// <summary>
         /// ddlStatus 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlStatus;
-        
+
         /// <summary>
         /// ddlClass 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlClass;
-        
+
         /// <summary>
         /// ddlIfmail 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlIfmail;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ddlDesignUserName 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlDesignUserName;
-        
+
         /// <summary>
         /// ddlJiaoheUserName 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlJiaoheUserName;
-        
+
         /// <summary>
         /// ddlShenheUserName 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlShenheUserName;
-        
+
         /// <summary>
         /// ddlShendingUserName 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlShendingUserName;
-        
+
         /// <summary>
         /// ddlMajorResponsibleUserName 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlMajorResponsibleUserName;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// txtStartUpdateTime 控件。
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartUpdateTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndUpdateTime 控件。
         /// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndUpdateTime;
-        
+
         /// <summary>
         /// txtStartSendTime 控件。
         /// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartSendTime;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label2;
-        
+
         /// <summary>
         /// txtEndSendTime 控件。
         /// </summary>
@@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndSendTime;
-        
+
         /// <summary>
         /// txtStartPrintTime 控件。
         /// </summary>
@@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartPrintTime;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label3;
-        
+
         /// <summary>
         /// txtEndPrintTime 控件。
         /// </summary>
@@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndPrintTime;
-        
+
         /// <summary>
         /// rbType 控件。
         /// </summary>
@@ -272,7 +301,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbType;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -281,7 +310,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -290,7 +319,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -299,7 +328,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -308,7 +337,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -317,7 +346,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx
index 0e10d62b..5df9c1f2 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx
@@ -49,9 +49,25 @@
 <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:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                    RegionPercent="20%" Title="装工主项-专业" TitleToolTip="装工主项-专业" ShowBorder="true" ShowHeader="true"
+                    BodyPadding="10px">
+                    <Items>
+                        <f:Tree ID="trSubjectMajor" EnableCollapse="true" ShowHeader="true" EnableCheckBox="true" OnlyLeafCheck="true"
+                            OnNodeCommand="trSubjectMajor_NodeCommand" OnNodeExpand="trSubjectMajor_NodeExpand" AutoLeafIdentification="true"
+                            runat="server">
+                        </f:Tree>
+                        <f:HiddenField runat="server" ID="hdSelectId">
+                        </f:HiddenField>
+                        <f:HiddenField runat="server" ID="hdMajorCode">
+                        </f:HiddenField>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -60,11 +76,11 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                <%--<f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
                                 </f:DropDownList>
                                 <f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>--%>
+                                <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
                                 </f:DropDownList>
                                 <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
                                 </f:DropDownList>
@@ -139,24 +155,24 @@
                         </f:TemplateField>
                         <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="IDP系统数据信息" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
+                               <%-- <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
                                     FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
                                     FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
+                                </f:RenderField>--%>
                                 <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
                                     FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
                                     FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
                                 </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
+                                <%--<f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
                                     FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
                                     FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
+                                </f:RenderField>--%>
                                 <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
                                     FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
                                 </f:RenderField>
@@ -229,6 +245,8 @@
 
                     </PageItems>
                 </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="设计图纸管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.cs
index 5a1648ed..9ab43c2a 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.cs
@@ -30,6 +30,35 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
             }
         }
 
+        /// <summary>
+        /// SubjectCode
+        /// </summary>
+        public string SubjectCode
+        {
+            get
+            {
+                return (string)ViewState["SubjectCode"];
+            }
+            set
+            {
+                ViewState["SubjectCode"] = value;
+            }
+        }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        public string MajorNo
+        {
+            get
+            {
+                return (string)ViewState["MajorNo"];
+            }
+            set
+            {
+                ViewState["MajorNo"] = value;
+            }
+        }
+
         #region 加载页面
 
         /// <summary>
@@ -41,38 +70,122 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         {
             if (!IsPostBack)
             {
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.InitDropDownList();
                 GetButtonPower();
-                ////权限按钮方法
-                //UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
-                //UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
-                //CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
-                //QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
-                //Funs.FineUIPleaseSelect(this.dpHandelStatus);
-                //btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
-                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                //if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, CurrUser.UnitId))
-                //{
-                //    drpSponsorUnit.SelectedValue = CurrUser.UnitId;
-                //    drpSponsorUnit.Readonly = true;
-                //}
-                // 绑定表格
-                BindGrid();
-
+                InitTreeMenu();
             }
 
         }
 
+        #region  加载树
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.trSubjectMajor.Nodes.Clear();
+            this.trSubjectMajor.ShowBorder = false;
+            this.trSubjectMajor.ShowHeader = false;
+            this.trSubjectMajor.EnableIcons = true;
+            this.trSubjectMajor.AutoScroll = true;
+            this.trSubjectMajor.EnableSingleClickExpand = true;
+            var subjects = (from x in Funs.DB.IDP_DesignDrawing
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            orderby x.ProjectDeviceProcedureSubjectCode
+                            select new
+                            {
+                                x.ProjectDeviceProcedureSubjectCode,
+                                x.WbsFullPath
+                            }).Distinct().ToList();
+            foreach (var q in subjects)
+            {
+                TreeNode newNode = new TreeNode();
+                newNode.Text = $"[{q.ProjectDeviceProcedureSubjectCode}]{q.WbsFullPath}";
+                newNode.NodeID = q.ProjectDeviceProcedureSubjectCode;
+                newNode.CommandName = "Subject";
+                newNode.EnableExpandEvent = true;
+                newNode.EnableClickEvent = true;
+                this.trSubjectMajor.Nodes.Add(newNode);
+                TreeNode emptyNode = new TreeNode();
+                emptyNode.Text = "";
+                emptyNode.NodeID = "";
+                newNode.Nodes.Add(emptyNode);
+            }
+        }
+        #endregion
+
+        #region  展开树
+
+        /// <summary>
+        /// 展开树
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trSubjectMajor_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            if (e.Node.CommandName == "Subject") //展开装工主编码、名称
+            {
+                var majors = (from x in BLL.Funs.DB.IDP_DesignDrawing
+                              where x.ProjectDeviceProcedureSubjectCode == e.Node.NodeID && x.ProjectId == this.CurrUser.LoginProjectId
+                              orderby x.MajorNo
+                              select new
+                              {
+                                  x.MajorNo,
+                                  x.MajorName
+                              }).Distinct().ToList();
+                foreach (var q in majors)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = $"[{q.MajorNo}]{q.MajorName}";
+                    newNode.NodeID = $"{e.Node.NodeID}#{q.MajorNo}";
+                    newNode.CommandName = "Major";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    newNode.EnableCheckBox = false;
+                    newNode.EnableCheckEvent = false;
+                    e.Node.Nodes.Add(newNode);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  Tree点击事件
+        /// <summary>
+        /// Tree点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trSubjectMajor_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            if (this.trSubjectMajor.SelectedNode.ParentNode == null)
+            {
+                //return;
+                this.SubjectCode = this.trSubjectMajor.SelectedNode.NodeID;
+                this.MajorNo = string.Empty;
+            }
+            else
+            {
+                this.SubjectCode = this.trSubjectMajor.SelectedNode.ParentNode.NodeID;
+                this.MajorNo = this.trSubjectMajor.SelectedNode.NodeID.Split('#')[1];
+            }
+            BindGrid();
+        }
+        #endregion
+
+
         /// <summary>
         /// 下拉加载
         /// </summary>
         private void InitDropDownList()
         {
-            BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false);
-            BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false);
-            BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
+            //BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false);
+            //BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
             //BLL.DesignDrawingService.InitMajorNoDropDownList(this.ddlMajorNo, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitStatusNameDropDownList(this.ddlStatus, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitClassDropDownList(this.ddlClass, this.CurrUser.LoginProjectId, false);
 
@@ -94,10 +207,19 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         protected DataTable BindData()
         {
             string strSql = $@"SELECT * FROM IDP_DesignDrawing as lib WHERE lib.ProjectId=@ProjectId ";
-            //ORDER BY lib.updatetime DESC
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
 
+            if (!string.IsNullOrEmpty(this.SubjectCode))
+            {
+                strSql += " AND ProjectDeviceProcedureSubjectCode = @SubjectCode  ";
+                listStr.Add(new SqlParameter("@SubjectCode", this.SubjectCode));
+            }
+            if (!string.IsNullOrEmpty(this.MajorNo))
+            {
+                strSql += " AND MajorNo = @MajorNo  ";
+                listStr.Add(new SqlParameter("@MajorNo", this.MajorNo));
+            }
             if (!string.IsNullOrEmpty(txtStartUpdateTime.Text.Trim()))
             {
                 strSql += " AND UpdateTime >= @startUpdateTime  ";
@@ -128,21 +250,36 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 strSql += " AND Printtime <= @endPrintTime  ";
                 listStr.Add(new SqlParameter("@endPrintTime", $"{Funs.GetNewDateTime(txtEndPrintTime.Text.Trim())} 23:59:59"));
             }
-            if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
-            {
-                strSql += " AND (1=2 ";
-                int i = 0;
-                foreach (var item in this.ddlWbsFullPath.SelectedValueArray)
-                {
-                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
-                    {
-                        strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString();
-                        listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item));
-                    }
-                    i++;
-                }
-                strSql += ")";
-            }
+            //if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
+            //{
+            //    strSql += " AND (1=2 ";
+            //    int i = 0;
+            //    foreach (var item in this.ddlWbsFullPath.SelectedValueArray)
+            //    {
+            //        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+            //        {
+            //            strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString();
+            //            listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item));
+            //        }
+            //        i++;
+            //    }
+            //    strSql += ")";
+            //}
+            //if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1))
+            //{
+            //    strSql += " AND (1=2 ";
+            //    int i = 0;
+            //    foreach (var item in this.ddlMajorName.SelectedValueArray)
+            //    {
+            //        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+            //        {
+            //            strSql += " OR MajorName = @MajorName" + i.ToString();
+            //            listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item));
+            //        }
+            //        i++;
+            //    }
+            //    strSql += ")";
+            //}
             if (this.ddlFileVersion.SelectedItemArray.Count() > 1 || (this.ddlFileVersion.SelectedValue != BLL.Const._Null && this.ddlFileVersion.SelectedItemArray.Count() == 1))
             {
                 strSql += " AND (1=2 ";
@@ -158,21 +295,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 }
                 strSql += ")";
             }
-            if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1))
-            {
-                strSql += " AND (1=2 ";
-                int i = 0;
-                foreach (var item in this.ddlMajorName.SelectedValueArray)
-                {
-                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
-                    {
-                        strSql += " OR MajorName = @MajorName" + i.ToString();
-                        listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item));
-                    }
-                    i++;
-                }
-                strSql += ")";
-            }
             if (this.ddlStatus.SelectedItemArray.Count() > 1 || (this.ddlStatus.SelectedValue != BLL.Const._Null && this.ddlStatus.SelectedItemArray.Count() == 1))
             {
                 strSql += " AND (1=2 ";
@@ -316,32 +438,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
 
             Grid1.DataSource = table;
             Grid1.DataBind();
-
-            //for (int i = 0; i < Grid1.Rows.Count; i++)
-            //{
-            //    string rowID = Grid1.Rows[i].DataKeys[0].ToString();
-            //    if (rowID.Count() > 0)
-            //    {
-            //        Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID);
-            //        if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认      
-            //        }
-            //        else if (checkControl.State == Const.CheckControl_Complete)
-            //        { //闭环
-            //            Grid1.Rows[i].CellCssClasses[11] = "Green";
-
-            //        }
-            //        else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now)  //延期未整改
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = "Red";
-            //        }
-            //        else  //期内未整改
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = " Yellow ";
-            //        }
-            //    }
-            //}
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.designer.cs
index 3e7258f9..bfa1bf59 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.DesignDrawing {
-    
-    
-    public partial class ArchivesLibIssue {
-        
+namespace FineUIPro.Web.CQMS.DesignDrawing
+{
+
+
+    public partial class ArchivesLibIssue
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,52 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// trSubjectMajor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trSubjectMajor;
+
+        /// <summary>
+        /// hdSelectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdSelectId;
+
+        /// <summary>
+        /// hdMajorCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdMajorCode;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +94,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,16 +103,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
-        /// <summary>
-        /// ddlWbsFullPath 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlWbsFullPath;
-        
+
         /// <summary>
         /// ddlFileVersion 控件。
         /// </summary>
@@ -74,16 +112,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlFileVersion;
-        
-        /// <summary>
-        /// ddlMajorName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlMajorName;
-        
+
         /// <summary>
         /// ddlStatus 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlStatus;
-        
+
         /// <summary>
         /// ddlClass 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlClass;
-        
+
         /// <summary>
         /// ddlIfmail 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlIfmail;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ddlDesignUserName 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlDesignUserName;
-        
+
         /// <summary>
         /// ddlJiaoheUserName 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlJiaoheUserName;
-        
+
         /// <summary>
         /// ddlShenheUserName 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlShenheUserName;
-        
+
         /// <summary>
         /// ddlShendingUserName 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlShendingUserName;
-        
+
         /// <summary>
         /// ddlMajorResponsibleUserName 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlMajorResponsibleUserName;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// txtStartUpdateTime 控件。
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartUpdateTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndUpdateTime 控件。
         /// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndUpdateTime;
-        
+
         /// <summary>
         /// txtStartSendTime 控件。
         /// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartSendTime;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label2;
-        
+
         /// <summary>
         /// txtEndSendTime 控件。
         /// </summary>
@@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndSendTime;
-        
+
         /// <summary>
         /// txtStartPrintTime 控件。
         /// </summary>
@@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartPrintTime;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label3;
-        
+
         /// <summary>
         /// txtEndPrintTime 控件。
         /// </summary>
@@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndPrintTime;
-        
+
         /// <summary>
         /// Toolbar4 控件。
         /// </summary>
@@ -272,7 +301,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar4;
-        
+
         /// <summary>
         /// drpReceiveUser 控件。
         /// </summary>
@@ -281,7 +310,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpReceiveUser;
-        
+
         /// <summary>
         /// btnIssue 控件。
         /// </summary>
@@ -290,7 +319,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnIssue;
-        
+
         /// <summary>
         /// rbType 控件。
         /// </summary>
@@ -299,7 +328,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbType;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -308,7 +337,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -317,7 +346,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -326,7 +355,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -335,7 +364,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -344,7 +373,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx
index 5fde4f62..ce00235b 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx
@@ -4,7 +4,7 @@
 
 <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>
@@ -49,173 +49,190 @@
 <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:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
-                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlClass" runat="server" Label="保密等级" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlIfmail" runat="server" Label="蓝图寄出" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="是" Text="是"></f:ListItem>
-                                    <f:ListItem Value="否" Text="否"></f:ListItem>
-                                </f:DropDownList>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="ddlDesignUserName" runat="server" Label="设计人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlJiaoheUserName" runat="server" Label="校核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlShenheUserName" runat="server" Label="审核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlShendingUserName" runat="server" Label="审定人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlMajorResponsibleUserName" runat="server" Label="专业负责" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
-                                </f:DropDownList>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DatePicker runat="server" Label="入库日期" ID="txtStartUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" Label="验收日期" ID="txtStartSendTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label2" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndSendTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" Label="打印日期" ID="txtStartPrintTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
-                                </f:DatePicker>
-                                <f:Label ID="Label3" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndPrintTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
-                                </f:DatePicker>
-                            </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:GroupField ColumnID="GroupField2" runat="server" HeaderText="IDP系统数据信息" HeaderTextAlign="Center">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                    RegionPercent="20%" Title="装工主项-专业" TitleToolTip="装工主项-专业" ShowBorder="true" ShowHeader="true"
+                    BodyPadding="10px">
+                    <Items>
+                        <f:Tree ID="trSubjectMajor" EnableCollapse="true" ShowHeader="true" EnableCheckBox="true" OnlyLeafCheck="true"
+                            OnNodeCommand="trSubjectMajor_NodeCommand" OnNodeExpand="trSubjectMajor_NodeExpand" AutoLeafIdentification="true"
+                            runat="server">
+                        </f:Tree>
+                        <f:HiddenField runat="server" ID="hdSelectId">
+                        </f:HiddenField>
+                        <f:HiddenField runat="server" ID="hdMajorCode">
+                        </f:HiddenField>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
+                            runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" EnableTextSelection="true">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <%--<f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>--%>
+                                        <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlClass" runat="server" Label="保密等级" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlIfmail" runat="server" Label="蓝图寄出" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                            <f:ListItem Value="" Text=""></f:ListItem>
+                                            <f:ListItem Value="是" Text="是"></f:ListItem>
+                                            <f:ListItem Value="否" Text="否"></f:ListItem>
+                                        </f:DropDownList>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="ddlDesignUserName" runat="server" Label="设计人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlJiaoheUserName" runat="server" Label="校核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlShenheUserName" runat="server" Label="审核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlShendingUserName" runat="server" Label="审定人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="ddlMajorResponsibleUserName" runat="server" Label="专业负责" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                        </f:DropDownList>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DatePicker runat="server" Label="入库日期" ID="txtStartUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label1" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" Label="验收日期" ID="txtStartSendTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label2" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndSendTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" Label="打印日期" ID="txtStartPrintTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:Label ID="Label3" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker runat="server" ID="txtEndPrintTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                        </f:DatePicker>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
                             <Columns>
-                                <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
-                                    FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
-                                    FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
-                                    FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
-                                    FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
-                                    FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
-                                    FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
-                                    FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
-                                    FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
-                                    FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
-                                    FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
-                                    FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
-                                    FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
-                                    FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
-                                    FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="数字档案馆数据信息" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
-                                    FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
-                                    FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
-                                </f:RenderField>
-                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
+                                <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="IDP系统数据信息" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <%--<f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
+                                            FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
+                                            FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>--%>
+                                        <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
+                                            FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
+                                            FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <%--<f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
+                                            FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
+                                            FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>--%>
+                                        <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
+                                            FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
+                                            FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
+                                            FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
+                                            FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
+                                            FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
+                                            FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
+                                            FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
+                                            FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="数字档案馆数据信息" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
+                                            FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
+                                            FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
+                                            <ItemTemplate>
+                                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                    </Columns>
+                                </f:GroupField>
                             </Columns>
-                        </f:GroupField>
-                    </Columns>
-                    <%-- <Listeners>
+                            <%-- <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:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="设计图纸管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.cs
index 7d1fb7e0..b4d90723 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.cs
@@ -30,6 +30,35 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
             }
         }
 
+        /// <summary>
+        /// SubjectCode
+        /// </summary>
+        public string SubjectCode
+        {
+            get
+            {
+                return (string)ViewState["SubjectCode"];
+            }
+            set
+            {
+                ViewState["SubjectCode"] = value;
+            }
+        }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        public string MajorNo
+        {
+            get
+            {
+                return (string)ViewState["MajorNo"];
+            }
+            set
+            {
+                ViewState["MajorNo"] = value;
+            }
+        }
+
         #region 加载页面
 
         /// <summary>
@@ -44,7 +73,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.InitDropDownList();
                 Model.SGGLDB db = Funs.DB;
-                var list= from x in db.IDP_DesignDrawingIssue where x.ProjectId == this.CurrUser.LoginProjectId && x.ReceiveUserId == this.CurrUser.UserId select x;
+                var list = from x in db.IDP_DesignDrawingIssue where x.ProjectId == this.CurrUser.LoginProjectId && x.ReceiveUserId == this.CurrUser.UserId select x;
                 if (list.Count() > 0)
                 {
                     foreach (var item in list)
@@ -53,35 +82,124 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                     }
                     db.SubmitChanges();
                 }
-                ////权限按钮方法
-                //UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
-                //UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
-                //CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
-                //QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
-                //Funs.FineUIPleaseSelect(this.dpHandelStatus);
-                //btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                //if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, CurrUser.UnitId))
-                //{
-                //    drpSponsorUnit.SelectedValue = CurrUser.UnitId;
-                //    drpSponsorUnit.Readonly = true;
-                //}
-                // 绑定表格
-                BindGrid();
-
+                GetButtonPower();
+                InitTreeMenu();
             }
 
         }
 
+        #region  加载树
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.trSubjectMajor.Nodes.Clear();
+            this.trSubjectMajor.ShowBorder = false;
+            this.trSubjectMajor.ShowHeader = false;
+            this.trSubjectMajor.EnableIcons = true;
+            this.trSubjectMajor.AutoScroll = true;
+            this.trSubjectMajor.EnableSingleClickExpand = true;
+            var subjects = (from y in Funs.DB.IDP_DesignDrawingIssue
+                            join x in Funs.DB.IDP_DesignDrawing on y.IDPId equals x.Id into xGroup
+                            from x in xGroup.DefaultIfEmpty()
+                            where y.ProjectId == this.CurrUser.LoginProjectId && y.ReceiveUserId == this.CurrUser.UserId
+                            orderby x.ProjectDeviceProcedureSubjectCode
+                            select new
+                            {
+                                x.ProjectDeviceProcedureSubjectCode,
+                                x.WbsFullPath
+                            }).Distinct().ToList();
+            foreach (var q in subjects)
+            {
+                TreeNode newNode = new TreeNode();
+                newNode.Text = $"[{q.ProjectDeviceProcedureSubjectCode}]{q.WbsFullPath}";
+                newNode.NodeID = q.ProjectDeviceProcedureSubjectCode;
+                newNode.CommandName = "Subject";
+                newNode.EnableExpandEvent = true;
+                newNode.EnableClickEvent = true;
+                this.trSubjectMajor.Nodes.Add(newNode);
+                TreeNode emptyNode = new TreeNode();
+                emptyNode.Text = "";
+                emptyNode.NodeID = "";
+                newNode.Nodes.Add(emptyNode);
+            }
+        }
+        #endregion
+
+        #region  展开树
+
+        /// <summary>
+        /// 展开树
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trSubjectMajor_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            if (e.Node.CommandName == "Subject") //展开装工主编码、名称
+            {
+                var majors = (from y in Funs.DB.IDP_DesignDrawingIssue
+                              join x in Funs.DB.IDP_DesignDrawing on y.IDPId equals x.Id into xGroup
+                              from x in xGroup.DefaultIfEmpty()
+                              where x.ProjectDeviceProcedureSubjectCode == e.Node.NodeID && y.ProjectId == this.CurrUser.LoginProjectId && y.ReceiveUserId == this.CurrUser.UserId
+                              orderby x.MajorNo
+                              select new
+                              {
+                                  x.MajorNo,
+                                  x.MajorName
+                              }).Distinct().ToList();
+                foreach (var q in majors)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = $"[{q.MajorNo}]{q.MajorName}";
+                    newNode.NodeID = $"{e.Node.NodeID}#{q.MajorNo}";
+                    newNode.CommandName = "Major";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    newNode.EnableCheckBox = false;
+                    newNode.EnableCheckEvent = false;
+                    e.Node.Nodes.Add(newNode);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  Tree点击事件
+        /// <summary>
+        /// Tree点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trSubjectMajor_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            if (this.trSubjectMajor.SelectedNode.ParentNode == null)
+            {
+                //return;
+                this.SubjectCode = this.trSubjectMajor.SelectedNode.NodeID;
+                this.MajorNo = string.Empty;
+            }
+            else
+            {
+                this.SubjectCode = this.trSubjectMajor.SelectedNode.ParentNode.NodeID;
+                this.MajorNo = this.trSubjectMajor.SelectedNode.NodeID.Split('#')[1];
+            }
+            BindGrid();
+        }
+        #endregion
+
+
         /// <summary>
         /// 下拉加载
         /// </summary>
         private void InitDropDownList()
         {
-            BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false);
-            BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false);
-            BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
+            //BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false);
+            //BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
             //BLL.DesignDrawingService.InitMajorNoDropDownList(this.ddlMajorNo, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitStatusNameDropDownList(this.ddlStatus, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitClassDropDownList(this.ddlClass, this.CurrUser.LoginProjectId, false);
 
@@ -109,6 +227,16 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
 
+                if (!string.IsNullOrEmpty(this.SubjectCode))
+                {
+                    strSql += " AND ProjectDeviceProcedureSubjectCode = @SubjectCode  ";
+                    listStr.Add(new SqlParameter("@SubjectCode", this.SubjectCode));
+                }
+                if (!string.IsNullOrEmpty(this.MajorNo))
+                {
+                    strSql += " AND MajorNo = @MajorNo  ";
+                    listStr.Add(new SqlParameter("@MajorNo", this.MajorNo));
+                }
                 if (!string.IsNullOrEmpty(txtStartUpdateTime.Text.Trim()))
                 {
                     strSql += " AND UpdateTime >= @startUpdateTime  ";
@@ -139,21 +267,36 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                     strSql += " AND Printtime <= @endPrintTime  ";
                     listStr.Add(new SqlParameter("@endPrintTime", $"{Funs.GetNewDateTime(txtEndPrintTime.Text.Trim())} 23:59:59"));
                 }
-                if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
-                {
-                    strSql += " AND (1=2 ";
-                    int i = 0;
-                    foreach (var item in this.ddlWbsFullPath.SelectedValueArray)
-                    {
-                        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
-                        {
-                            strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString();
-                            listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item));
-                        }
-                        i++;
-                    }
-                    strSql += ")";
-                }
+                //if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
+                //{
+                //    strSql += " AND (1=2 ";
+                //    int i = 0;
+                //    foreach (var item in this.ddlWbsFullPath.SelectedValueArray)
+                //    {
+                //        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                //        {
+                //            strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString();
+                //            listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item));
+                //        }
+                //        i++;
+                //    }
+                //    strSql += ")";
+                //}
+                //if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1))
+                //{
+                //    strSql += " AND (1=2 ";
+                //    int i = 0;
+                //    foreach (var item in this.ddlMajorName.SelectedValueArray)
+                //    {
+                //        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                //        {
+                //            strSql += " OR MajorName = @MajorName" + i.ToString();
+                //            listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item));
+                //        }
+                //        i++;
+                //    }
+                //    strSql += ")";
+                //}
                 if (this.ddlFileVersion.SelectedItemArray.Count() > 1 || (this.ddlFileVersion.SelectedValue != BLL.Const._Null && this.ddlFileVersion.SelectedItemArray.Count() == 1))
                 {
                     strSql += " AND (1=2 ";
@@ -169,21 +312,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                     }
                     strSql += ")";
                 }
-                if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1))
-                {
-                    strSql += " AND (1=2 ";
-                    int i = 0;
-                    foreach (var item in this.ddlMajorName.SelectedValueArray)
-                    {
-                        if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
-                        {
-                            strSql += " OR MajorName = @MajorName" + i.ToString();
-                            listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item));
-                        }
-                        i++;
-                    }
-                    strSql += ")";
-                }
                 if (this.ddlStatus.SelectedItemArray.Count() > 1 || (this.ddlStatus.SelectedValue != BLL.Const._Null && this.ddlStatus.SelectedItemArray.Count() == 1))
                 {
                     strSql += " AND (1=2 ";
@@ -335,32 +463,6 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 Grid1.DataSource = table;
                 Grid1.DataBind();
             }
-
-            //for (int i = 0; i < Grid1.Rows.Count; i++)
-            //{
-            //    string rowID = Grid1.Rows[i].DataKeys[0].ToString();
-            //    if (rowID.Count() > 0)
-            //    {
-            //        Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID);
-            //        if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认      
-            //        }
-            //        else if (checkControl.State == Const.CheckControl_Complete)
-            //        { //闭环
-            //            Grid1.Rows[i].CellCssClasses[11] = "Green";
-
-            //        }
-            //        else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now)  //延期未整改
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = "Red";
-            //        }
-            //        else  //期内未整改
-            //        {
-            //            Grid1.Rows[i].CellCssClasses[11] = " Yellow ";
-            //        }
-            //    }
-            //}
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.designer.cs
index a95c7ed7..9dd49729 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.DesignDrawing {
-    
-    
-    public partial class ArchivesLibReceive {
-        
+namespace FineUIPro.Web.CQMS.DesignDrawing
+{
+
+
+    public partial class ArchivesLibReceive
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,52 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// trSubjectMajor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trSubjectMajor;
+
+        /// <summary>
+        /// hdSelectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdSelectId;
+
+        /// <summary>
+        /// hdMajorCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdMajorCode;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +94,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,16 +103,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
-        /// <summary>
-        /// ddlWbsFullPath 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlWbsFullPath;
-        
+
         /// <summary>
         /// ddlFileVersion 控件。
         /// </summary>
@@ -74,16 +112,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlFileVersion;
-        
-        /// <summary>
-        /// ddlMajorName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlMajorName;
-        
+
         /// <summary>
         /// ddlStatus 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlStatus;
-        
+
         /// <summary>
         /// ddlClass 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlClass;
-        
+
         /// <summary>
         /// ddlIfmail 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlIfmail;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ddlDesignUserName 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlDesignUserName;
-        
+
         /// <summary>
         /// ddlJiaoheUserName 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlJiaoheUserName;
-        
+
         /// <summary>
         /// ddlShenheUserName 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlShenheUserName;
-        
+
         /// <summary>
         /// ddlShendingUserName 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlShendingUserName;
-        
+
         /// <summary>
         /// ddlMajorResponsibleUserName 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlMajorResponsibleUserName;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// txtStartUpdateTime 控件。
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartUpdateTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndUpdateTime 控件。
         /// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndUpdateTime;
-        
+
         /// <summary>
         /// txtStartSendTime 控件。
         /// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartSendTime;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label2;
-        
+
         /// <summary>
         /// txtEndSendTime 控件。
         /// </summary>
@@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndSendTime;
-        
+
         /// <summary>
         /// txtStartPrintTime 控件。
         /// </summary>
@@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartPrintTime;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label3;
-        
+
         /// <summary>
         /// txtEndPrintTime 控件。
         /// </summary>
@@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndPrintTime;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -272,7 +301,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -281,7 +310,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -290,7 +319,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -299,7 +328,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -308,7 +337,7 @@ namespace FineUIPro.Web.CQMS.DesignDrawing {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index 0909b3f1..f4ccbe67 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -69,5 +69,7 @@
 <TreeNode id="753BED05-3B04-43F3-9D97-1534C581A49F" Text="施工绩效设置" NavigateUrl="CQMS/Performance/PerformanceConfig.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="A334796C-1D85-47F9-A9B2-E36BE49FADC2" Text="设计图纸管理" NavigateUrl=""><TreeNode id="13E3544E-AC56-48F9-9BC0-EB14EF4620FF" Text="档案文件库" NavigateUrl="CQMS/DesignDrawing/ArchivesLib.aspx"></TreeNode>
+<TreeNode id="7FF0C99B-64E6-4AE5-BE90-26AB3EF1B662" Text="档案文件下发" NavigateUrl="CQMS/DesignDrawing/ArchivesLibIssue.aspx"></TreeNode>
+<TreeNode id="C62F4256-4AC5-44BB-A990-2D330541A968" Text="档案文件接收" NavigateUrl="CQMS/DesignDrawing/ArchivesLibReceive.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index b24737db..6650a387 100644
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@@ -36,6 +36,7 @@
 <TreeNode id="1BCD283A-F33C-488C-8FCA-F7B7B9C1A003" Text="施工人力" NavigateUrl=""><TreeNode id="D87CD627-A18C-4C5D-962D-424E582F2379" Text="施工人力计划" NavigateUrl="JDGL/SGManPower/ManPowerPlan.aspx"></TreeNode>
 <TreeNode id="B1F87873-FEC8-4BEC-8AB6-AFDEDB26ECEE" Text="现场考勤人力" NavigateUrl="JDGL/SGManPower/ManPowerWork.aspx"></TreeNode>
 <TreeNode id="CE4D8228-3971-4F81-B992-5FC564CBFDA6" Text="人力统计分析" NavigateUrl="JDGL/SGManPower/ManPowerStat.aspx"></TreeNode>
+<TreeNode id="AF67CC3D-A130-4074-AF31-803A9F3C7202" Text="人力预警" NavigateUrl="JDGL/SGManPower/SGWarningDetailsEdit.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""><TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx"></TreeNode>
 <TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
