diff --git a/DataBase/版本日志/SGGLDB_WH_2024-6-7-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-6-7-bwj.sql
new file mode 100644
index 00000000..b79f06b2
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-6-7-bwj.sql
@@ -0,0 +1,3 @@
+
+update Inspection_SummaryMb set MenuC='��ȫ�쵼С�����' where InspectionSummaryMbId=5
+go
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx
index 07777800..d327752d 100644
--- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>质量管理组织机构</title>
+    <title></title>
     <style type="text/css">
         .auto-style91 {
             width: 1300px;
@@ -23,369 +23,412 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" runat="server" />
-        <f:ContentPanel ID="ContentPanel1" runat="server" BodyPadding="0px"
-            ShowBorder="true" ShowHeader="true" Title="内容面板" AutoScroll="true">
-            <div style="text-align: right">
-                <f:Button ID="btnOut" EnablePostBack="true" runat="server" Text="导出" Icon="Printer" OnClick="btnOut_Click" EnableAjax="false" DisableControlBeforePostBack="false"></f:Button>
-            </div>
-            <div id="divOrganizational" runat="server" style="background-image: url('../../res/images/Organizational.png');" class="auto-style91">
-                <table class="auto-style91">
-                    <tr style="height: 15px;">
-                        <td style="width: 15px"></td>
-                        <td style="width: 25px"></td>
-                        <td style="width: 160px"></td>
-                        <td style="width: 50px"></td>
-                        <td style="width: 10px"></td>
-                        <td style="width: 150px"></td>
-                        <td style="width: 20px"></td>
-                        <td style="width: 30px"></td>
-                        <td style="width: 140px"></td>
-                        <td style="width: 30px"></td>
-                        <td style="width: 30px"></td>
-                        <td style="width: 170px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 150px"></td>
-                        <td style="width: 20px"></td>
-                        <td style="width: 30px"></td>
-                        <td style="width: 170px"></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 45px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td colspan="3">
-                            <asp:Label ID="Label1" runat="server" Text="项目经理："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 95px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 55px;">
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label2" runat="server" Text="设计经理："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label3" runat="server" Text="采购经理："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label4" runat="server" Text="施工经理："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label5" runat="server" Text="质量经理："></asp:Label></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label6" runat="server" Text="HSE经理："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label7" runat="server" Text="开车经理："></asp:Label></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 95px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 85px; vertical-align: top;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label8" runat="server" Text="仓库管理员："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label9" runat="server" Text="文控工程师："></asp:Label></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label10" runat="server" Text="HSE工程师："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label11" runat="server" Text="开车工程师："></asp:Label></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 70px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 100px; vertical-align: top;">
-                        <td></td>
-                        <td colspan="2">
-                            <asp:Label ID="Label12" runat="server" Text="土建工程师："></asp:Label></td>
-                        <td></td>
-                        <td colspan="3">
-                            <asp:Label ID="Label13" runat="server" Text="设备工程师："></asp:Label></td>
-                        <td></td>
-                        <td colspan="2">
-                            <asp:Label ID="Label14" runat="server" Text="管道工程师："></asp:Label></td>
-                        <td></td>
-                        <td>
-                            <asp:Label ID="Label15" runat="server" Text="电气工程师："></asp:Label></td>
-                        <td></td>
-                        <td colspan="3">
-                            <asp:Label ID="Label16" runat="server" Text="仪表工程师："></asp:Label></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                </table>
-            </div>
-            <div id="divSubOrganizational" runat="server" style="background-image: url('../../res/images/SubOrganizational.png'); padding: 0px" class="auto-style92">
-                <table class="auto-style92">
-                    <tr style="height: 15px;">
-                        <td style="width: 10px;"></td>
-                        <td style="width: 150px;"></td>
-                        <td style="width: 40px;"></td>
-                        <td style="width: 160px;"></td>
-                        <td style="width: 30px;"></td>
-                        <td style="width: 2px;"></td>
-                        <td style="width: 130px;"></td>
-                        <td style="width: 25px;"></td>
-                        <td style="width: 30px;"></td>
-                        <td style="width: 153px;"></td>
-                        <td style="width: 20px;"></td>
-                        <td style="width: 120px;"></td>
-                        <td style="width: 30px;"></td>
-                        <td style="width: 30px;"></td>
-                        <td style="width: 130px;"></td>
-                        <td style="width: 20px;"></td>
-                        <td style="width: 40px;"></td>
-                        <td style="width: 150px;"></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 50px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td colspan="2">
-                            <asp:Label ID="Label17" runat="server" Text="项目经理："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 100px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 65px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td colspan="2">
-                            <asp:Label ID="Label18" runat="server" Text="施工经理："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td colspan="3">
-                            <asp:Label ID="Label19" runat="server" Text="质量经理："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td colspan="3">
-                            <asp:Label ID="Label20" runat="server" Text="HSE经理："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 240px;">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 100px;">
-                        <td></td>
-                        <td style="vertical-align: top;">
-                            <asp:Label ID="Label23" runat="server" Text="土建工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td style="vertical-align: top;">
-                            <asp:Label ID="Label24" runat="server" Text="设备工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td style="vertical-align: top;" colspan="2">
-                            <asp:Label ID="Label25" runat="server" Text="管道工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td style="vertical-align: top;">&nbsp;</td>
-                        <td style="vertical-align: top;">
-                            <asp:Label ID="Label26" runat="server" Text="电气工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td style="vertical-align: top;" colspan="2">
-                            <asp:Label ID="Label27" runat="server" Text="仪表工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td style="vertical-align: top" colspan="2">
-                            <asp:Label ID="Label21" runat="server" Text="文控工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                        <td style="vertical-align: top">
-                            <asp:Label ID="Label22" runat="server" Text="HSE工程师："></asp:Label>
-                        </td>
-                        <td></td>
-                    </tr>
-                    <tr style="height: 90px">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                </table>
-            </div>
-        </f:ContentPanel>
+        <f:ContentPanel ID="ContentPanel3" runat="server" BodyPadding="0px"
+                            ShowBorder="false" ShowHeader="true">
+        <f:TabStrip ID="TabStrip1" IsFluid="true"
+            AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged"
+            ShowBorder="true" ActiveTabIndex="0" runat="server">
+            <Toolbars>
+                <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                    <Items>
+                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" LabelAlign="Right" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="drpUnitId_SelectedIndexChanged"></f:DropDownList>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnOut" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"
+                            EnableAjax="false" DisableControlBeforePostBack="false" OnClick="btnOut_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Tabs>
+                <f:Tab Title="总包" BodyPadding="10px" Layout="Fit" runat="server">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" BodyPadding="0px"
+                            ShowBorder="false" ShowHeader="false">
+                            <div id="divOrganizational" runat="server" style="background-image: url('../../res/images/Organizational.png');" class="auto-style91">
+                                <table id="table91" runat="server" class="auto-style91">
+                                    <tr style="height: 15px;">
+                                        <td style="width: 15px"></td>
+                                        <td style="width: 25px"></td>
+                                        <td style="width: 160px"></td>
+                                        <td style="width: 50px"></td>
+                                        <td style="width: 10px"></td>
+                                        <td style="width: 150px"></td>
+                                        <td style="width: 20px"></td>
+                                        <td style="width: 30px"></td>
+                                        <td style="width: 140px"></td>
+                                        <td style="width: 30px"></td>
+                                        <td style="width: 30px"></td>
+                                        <td style="width: 170px"></td>
+                                        <td style="width: 45px"></td>
+                                        <td style="width: 150px"></td>
+                                        <td style="width: 20px"></td>
+                                        <td style="width: 30px"></td>
+                                        <td style="width: 170px"></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 45px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td colspan="3">
+                                            <f:Label ID="Label1" runat="server" Text="项目经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 95px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 55px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label2" runat="server" Text="设计经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label3" runat="server" Text="采购经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label4" runat="server" Text="施工经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label5" runat="server" Text="质量经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label6" runat="server" Text="HSE经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label7" runat="server" Text="开车经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 95px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 85px; vertical-align: top;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label8" runat="server" Text="仓库管理员："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label9" runat="server" Text="文控工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label10" runat="server" Text="HSE工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label11" runat="server" Text="开车工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 70px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 100px; vertical-align: top;">
+                                        <td></td>
+                                        <td colspan="2">
+                                            <f:Label ID="Label12" runat="server" Text="土建工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td colspan="3">
+                                            <f:Label ID="Label13" runat="server" Text="设备工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td colspan="2">
+                                            <f:Label ID="Label14" runat="server" Text="管道工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td>
+                                            <f:Label ID="Label15" runat="server" Text="电气工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td colspan="3">
+                                            <f:Label ID="Label16" runat="server" Text="仪表工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </f:ContentPanel>
+                    </Items>
+                </f:Tab>
+                <f:Tab Title="分包" BodyPadding="10px" runat="server">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" runat="server" BodyPadding="0px"
+                            ShowBorder="false" ShowHeader="false">
+                            <div id="divSubOrganizational" runat="server" style="background-image: url('../../res/images/SubOrganizational.png'); padding: 0px" class="auto-style92">
+                                <table id="table92" runat="server" class="auto-style92">
+                                    <tr style="height: 15px;">
+                                        <td style="width: 10px;"></td>
+                                        <td style="width: 150px;"></td>
+                                        <td style="width: 40px;"></td>
+                                        <td style="width: 160px;"></td>
+                                        <td style="width: 30px;"></td>
+                                        <td style="width: 2px;"></td>
+                                        <td style="width: 130px;"></td>
+                                        <td style="width: 25px;"></td>
+                                        <td style="width: 30px;"></td>
+                                        <td style="width: 153px;"></td>
+                                        <td style="width: 20px;"></td>
+                                        <td style="width: 120px;"></td>
+                                        <td style="width: 30px;"></td>
+                                        <td style="width: 30px;"></td>
+                                        <td style="width: 130px;"></td>
+                                        <td style="width: 20px;"></td>
+                                        <td style="width: 40px;"></td>
+                                        <td style="width: 150px;"></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 50px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td colspan="2">
+                                            <f:Label ID="Label17" runat="server" Text="项目经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 100px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 65px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td colspan="2">
+                                            <f:Label ID="Label18" runat="server" Text="施工经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td colspan="3">
+                                            <f:Label ID="Label19" runat="server" Text="质量经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td colspan="3">
+                                            <f:Label ID="Label20" runat="server" Text="HSE经理："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 240px;">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 100px;">
+                                        <td></td>
+                                        <td style="vertical-align: top;">
+                                            <f:Label ID="Label23" runat="server" Text="土建工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td style="vertical-align: top;">
+                                            <f:Label ID="Label24" runat="server" Text="设备工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td style="vertical-align: top;" colspan="2">
+                                            <f:Label ID="Label25" runat="server" Text="管道工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td style="vertical-align: top;">&nbsp;</td>
+                                        <td style="vertical-align: top;">
+                                            <f:Label ID="Label26" runat="server" Text="电气工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td style="vertical-align: top;" colspan="2">
+                                            <f:Label ID="Label27" runat="server" Text="仪表工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td style="vertical-align: top" colspan="2">
+                                            <f:Label ID="Label21" runat="server" Text="文控工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                        <td style="vertical-align: top">
+                                            <f:Label ID="Label22" runat="server" Text="HSE工程师："></f:Label>
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                    <tr style="height: 90px">
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </f:ContentPanel>
+                    </Items>
+                </f:Tab>
+            </Tabs>
+        </f:TabStrip>
+            </f:ContentPanel>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs
index ee14d5df..58bc1312 100644
--- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs
@@ -1,11 +1,12 @@
-using Aspose.Words;
+﻿using Aspose.Words;
 using BLL;
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.CQMS.QualityPlanning
 {
@@ -22,439 +23,456 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             if (!IsPostBack)
             {
                 string projectId = this.CurrUser.LoginProjectId;
-                string unitId = this.CurrUser.UnitId;
+                this.ContentPanel3.Title = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
 
-                if (this.CurrUser.UserId == BLL.Const.hfnbdId)
+                if (TabStrip1.ActiveTabIndex == 0)
                 {
-                    unitId = BLL.Const.UnitId_CWCEC;
+                    this.drpUnitId.Items.Clear();
+                    BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, projectId, BLL.Const.ProjectUnitType_1, false);
+                }
+                else if (TabStrip1.ActiveTabIndex == 1)
+                {
+                    this.drpUnitId.Items.Clear();
+                    BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, projectId, BLL.Const.ProjectUnitType_2, false);
+                }
+                DataBind(this.drpUnitId.SelectedValue);
+            }
+        }
+
+        /// <summary>
+        /// 加载数据
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <returns></returns>
+        private void DataBind(string unitId)
+        {
+            string projectId = this.CurrUser.LoginProjectId;
+            if (unitId == BLL.Const.UnitId_CWCEC)
+            {
+                string projectManagerName = string.Empty;
+                var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
+                if (projectManager != null)
+                {
+                    foreach (var item in projectManager)
+                    {
+                        projectManagerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(projectManagerName))
+                    {
+                        this.Label1.Text = "项目经理：" + projectManagerName.Substring(0, projectManagerName.LastIndexOf(','));
+                    }
                 }
 
-                this.divSubOrganizational.Visible = false;
-                this.divOrganizational.Visible = true;
-
-                this.ContentPanel1.Title = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
-
-                var unit = (from x in Funs.DB.Project_ProjectUnit
-                            join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
-                            where x.ProjectId == projectId
-                            //&& x.UnitType == BLL.Const.ProjectUnitType_2
-                            && x.UnitId == unitId
-                            select x).FirstOrDefault();
-                if (unit != null)
+                string sjName = string.Empty;
+                var sj = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理");
+                if (sj != null)
                 {
-                    if (unit.UnitType == BLL.Const.ProjectUnitType_1)
+                    foreach (var item in sj)
                     {
-                        this.divSubOrganizational.Visible = false;
-                        this.divOrganizational.Visible = true;
-
-                        string projectManagerName = string.Empty;
-                        var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
-                        if (projectManager != null)
-                        {
-                            foreach (var item in projectManager)
-                            {
-                                projectManagerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(projectManagerName))
-                            {
-                                this.Label1.Text = "项目经理：" + projectManagerName.Substring(0, projectManagerName.LastIndexOf(','));
-                            }
-                        }
-
-                        string sjName = string.Empty;
-                        var sj = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理");
-                        if (sj != null)
-                        {
-                            foreach (var item in sj)
-                            {
-                                sjName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(sjName))
-                            {
-                                this.Label2.Text = "设计经理：" + sjName.Substring(0, sjName.LastIndexOf(','));
-                            }
-                        }
-
-                        string cgName = string.Empty;
-                        var cg = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "采购经理");
-                        if (cg != null)
-                        {
-                            foreach (var item in cg)
-                            {
-                                cgName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(cgName))
-                            {
-                                this.Label3.Text = "采购经理：" + cgName.Substring(0, cgName.LastIndexOf(','));
-                            }
-                        }
-
-                        string name4 = string.Empty;
-                        var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
-                        if (con != null)
-                        {
-                            foreach (var item in con)
-                            {
-                                name4 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name4))
-                            {
-                                this.Label4.Text = "施工经理：" + name4.Substring(0, name4.LastIndexOf(','));
-                            }
-                        }
-
-                        string name5 = string.Empty;
-                        var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
-                        if (qa != null)
-                        {
-                            foreach (var item in qa)
-                            {
-                                name5 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name5))
-                            {
-                                this.Label5.Text = "质量经理：" + name5.Substring(0, name5.LastIndexOf(','));
-                            }
-                        }
-
-                        string name6 = string.Empty;
-                        var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
-                        if (hseManager != null)
-                        {
-                            foreach (var item in hseManager)
-                            {
-                                name6 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name6))
-                            {
-                                this.Label6.Text = "HSE经理：" + name6.Substring(0, name6.LastIndexOf(','));
-                            }
-                        }
-
-                        string name7 = string.Empty;
-                        var carManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车经理");
-                        if (carManager != null)
-                        {
-                            foreach (var item in carManager)
-                            {
-                                name7 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name7))
-                            {
-                                this.Label7.Text = "开车经理：" + name7.Substring(0, name7.LastIndexOf(','));
-                            }
-                        }
-
-                        string warehousemanName = string.Empty;
-                        var warehousemanLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仓库管理员");
-                        if (warehousemanLists != null)
-                        {
-                            foreach (var item in warehousemanLists)
-                            {
-                                warehousemanName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(warehousemanName))
-                            {
-                                warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label8.Text = "仓库管理员：" + warehousemanName;
-
-                        string docName = string.Empty;
-                        var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
-                        if (doc != null)
-                        {
-                            foreach (var item in doc)
-                            {
-                                docName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(docName))
-                            {
-                                docName = docName.Substring(0, docName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label9.Text = "文控工程师：" + docName;
-
-                        string hseEngineerName = string.Empty;
-                        var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
-                        if (hseEngineerLists != null)
-                        {
-                            foreach (var item in hseEngineerLists)
-                            {
-                                hseEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(hseEngineerName))
-                            {
-                                hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label10.Text = "HSE工程师：" + hseEngineerName;
-
-                        string carEngineerName = string.Empty;
-                        var carEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车工程师");
-                        if (carEngineerLists != null)
-                        {
-                            foreach (var item in carEngineerLists)
-                            {
-                                carEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(carEngineerName))
-                            {
-                                carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label11.Text = "开车工程师：" + carEngineerName;
-
-                        string CVEngineerName = string.Empty;
-                        var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
-                        if (CVEngineerLists != null)
-                        {
-                            foreach (var item in CVEngineerLists)
-                            {
-                                CVEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(CVEngineerName))
-                            {
-                                CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label12.Text = "土建工程师：" + CVEngineerName;
-
-                        string FEEngineerName = string.Empty;
-                        var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
-                        if (FEEngineerLists != null)
-                        {
-                            foreach (var item in FEEngineerLists)
-                            {
-                                FEEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(FEEngineerName))
-                            {
-                                FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label13.Text = "设备工程师：" + FEEngineerName;
-
-                        string PDEngineerName = string.Empty;
-                        var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
-                        if (PDEngineerLists != null)
-                        {
-                            foreach (var item in PDEngineerLists)
-                            {
-                                PDEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(PDEngineerName))
-                            {
-                                PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label14.Text = "管道工程师：" + PDEngineerName;
-
-                        string EHEngineerName = string.Empty;
-                        var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
-                        if (EHEngineerLists != null)
-                        {
-                            foreach (var item in EHEngineerLists)
-                            {
-                                EHEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(EHEngineerName))
-                            {
-                                EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label15.Text = "电气工程师：" + EHEngineerName;
-
-                        string EAEngineerName = string.Empty;
-                        var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
-                        if (EAEngineerLists != null)
-                        {
-                            foreach (var item in EAEngineerLists)
-                            {
-                                EAEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(EAEngineerName))
-                            {
-                                EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label16.Text = "仪表工程师：" + EAEngineerName;
+                        sjName += item + ",";
                     }
-                    else if (unit.UnitType == BLL.Const.ProjectUnitType_2)
+                    if (!string.IsNullOrEmpty(sjName))
                     {
-                        this.divSubOrganizational.Visible = true;
-                        this.divOrganizational.Visible = false;
-
-                        string projectManagerName = string.Empty;
-                        var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
-                        if (projectManager != null)
-                        {
-                            foreach (var item in projectManager)
-                            {
-                                projectManagerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(projectManagerName))
-                            {
-                                projectManagerName = projectManagerName.Substring(0, projectManagerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label17.Text = "项目经理：" + projectManagerName;
-
-                        string name4 = string.Empty;
-                        var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
-                        if (con != null)
-                        {
-                            foreach (var item in con)
-                            {
-                                name4 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name4))
-                            {
-                                name4 = name4.Substring(0, name4.LastIndexOf(','));
-                            }
-                        }
-                        this.Label18.Text = "施工经理：" + name4;
-
-                        string name5 = string.Empty;
-                        var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
-                        if (qa != null)
-                        {
-                            foreach (var item in qa)
-                            {
-                                name5 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name5))
-                            {
-                                name5 = name5.Substring(0, name5.LastIndexOf(','));
-                            }
-                        }
-                        this.Label19.Text = "质量经理：" + name5;
-
-                        string name6 = string.Empty;
-                        var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
-                        if (hseManager != null)
-                        {
-                            foreach (var item in hseManager)
-                            {
-                                name6 += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(name6))
-                            {
-                                name6 = name6.Substring(0, name6.LastIndexOf(','));
-                            }
-                        }
-                        this.Label20.Text = "HSE经理：" + name6;
-
-                        string docName = string.Empty;
-                        var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
-                        if (doc != null)
-                        {
-                            foreach (var item in doc)
-                            {
-                                docName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(docName))
-                            {
-                                docName = docName.Substring(0, docName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label21.Text = "文控工程师：" + docName;
-
-                        string hseEngineerName = string.Empty;
-                        var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
-                        if (hseEngineerLists != null)
-                        {
-                            foreach (var item in hseEngineerLists)
-                            {
-                                hseEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(hseEngineerName))
-                            {
-                                hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label22.Text = "HSE工程师：" + hseEngineerName;
-
-                        string CVEngineerName = string.Empty;
-                        var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
-                        if (CVEngineerLists != null)
-                        {
-                            foreach (var item in CVEngineerLists)
-                            {
-                                CVEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(CVEngineerName))
-                            {
-                                CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label23.Text = "土建工程师：" + CVEngineerName;
-
-                        string FEEngineerName = string.Empty;
-                        var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
-                        if (FEEngineerLists != null)
-                        {
-                            foreach (var item in FEEngineerLists)
-                            {
-                                FEEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(FEEngineerName))
-                            {
-                                FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label24.Text = "设备工程师：" + FEEngineerName;
-
-                        string PDEngineerName = string.Empty;
-                        var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
-                        if (PDEngineerLists != null)
-                        {
-                            foreach (var item in PDEngineerLists)
-                            {
-                                PDEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(PDEngineerName))
-                            {
-                                PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label25.Text = "管道工程师：" + PDEngineerName;
-
-                        string EHEngineerName = string.Empty;
-                        var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
-                        if (EHEngineerLists != null)
-                        {
-                            foreach (var item in EHEngineerLists)
-                            {
-                                EHEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(EHEngineerName))
-                            {
-                                EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label26.Text = "电气工程师：" + EHEngineerName;
-
-                        string EAEngineerName = string.Empty;
-                        var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
-                        if (EAEngineerLists != null)
-                        {
-                            foreach (var item in EAEngineerLists)
-                            {
-                                EAEngineerName += item + ",";
-                            }
-                            if (!string.IsNullOrEmpty(EAEngineerName))
-                            {
-                                EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
-                            }
-                        }
-                        this.Label27.Text = "仪表工程师：" + EAEngineerName;
+                        this.Label2.Text = "设计经理：" + sjName.Substring(0, sjName.LastIndexOf(','));
                     }
-                }                
+                }
+
+                string cgName = string.Empty;
+                var cg = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "采购经理");
+                if (cg != null)
+                {
+                    foreach (var item in cg)
+                    {
+                        cgName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(cgName))
+                    {
+                        this.Label3.Text = "采购经理：" + cgName.Substring(0, cgName.LastIndexOf(','));
+                    }
+                }
+
+                string name4 = string.Empty;
+                var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
+                if (con != null)
+                {
+                    foreach (var item in con)
+                    {
+                        name4 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name4))
+                    {
+                        this.Label4.Text = "施工经理：" + name4.Substring(0, name4.LastIndexOf(','));
+                    }
+                }
+
+                string name5 = string.Empty;
+                var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
+                if (qa != null)
+                {
+                    foreach (var item in qa)
+                    {
+                        name5 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name5))
+                    {
+                        this.Label5.Text = "质量经理：" + name5.Substring(0, name5.LastIndexOf(','));
+                    }
+                }
+
+                string name6 = string.Empty;
+                var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
+                if (hseManager != null)
+                {
+                    foreach (var item in hseManager)
+                    {
+                        name6 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name6))
+                    {
+                        this.Label6.Text = "HSE经理：" + name6.Substring(0, name6.LastIndexOf(','));
+                    }
+                }
+
+                string name7 = string.Empty;
+                var carManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车经理");
+                if (carManager != null)
+                {
+                    foreach (var item in carManager)
+                    {
+                        name7 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name7))
+                    {
+                        this.Label7.Text = "开车经理：" + name7.Substring(0, name7.LastIndexOf(','));
+                    }
+                }
+
+                string warehousemanName = string.Empty;
+                var warehousemanLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仓库管理员");
+                if (warehousemanLists != null)
+                {
+                    foreach (var item in warehousemanLists)
+                    {
+                        warehousemanName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(warehousemanName))
+                    {
+                        warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(','));
+                    }
+                }
+                this.Label8.Text = "仓库管理员：" + warehousemanName;
+
+                string docName = string.Empty;
+                var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
+                if (doc != null)
+                {
+                    foreach (var item in doc)
+                    {
+                        docName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(docName))
+                    {
+                        docName = docName.Substring(0, docName.LastIndexOf(','));
+                    }
+                }
+                this.Label9.Text = "文控工程师：" + docName;
+
+                string hseEngineerName = string.Empty;
+                var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
+                if (hseEngineerLists != null)
+                {
+                    foreach (var item in hseEngineerLists)
+                    {
+                        hseEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(hseEngineerName))
+                    {
+                        hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label10.Text = "HSE工程师：" + hseEngineerName;
+
+                string carEngineerName = string.Empty;
+                var carEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车工程师");
+                if (carEngineerLists != null)
+                {
+                    foreach (var item in carEngineerLists)
+                    {
+                        carEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(carEngineerName))
+                    {
+                        carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label11.Text = "开车工程师：" + carEngineerName;
+
+                string CVEngineerName = string.Empty;
+                var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
+                if (CVEngineerLists != null)
+                {
+                    foreach (var item in CVEngineerLists)
+                    {
+                        CVEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(CVEngineerName))
+                    {
+                        CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label12.Text = "土建工程师：" + CVEngineerName;
+
+                string FEEngineerName = string.Empty;
+                var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
+                if (FEEngineerLists != null)
+                {
+                    foreach (var item in FEEngineerLists)
+                    {
+                        FEEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(FEEngineerName))
+                    {
+                        FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label13.Text = "设备工程师：" + FEEngineerName;
+
+                string PDEngineerName = string.Empty;
+                var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
+                if (PDEngineerLists != null)
+                {
+                    foreach (var item in PDEngineerLists)
+                    {
+                        PDEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(PDEngineerName))
+                    {
+                        PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label14.Text = "管道工程师：" + PDEngineerName;
+
+                string EHEngineerName = string.Empty;
+                var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
+                if (EHEngineerLists != null)
+                {
+                    foreach (var item in EHEngineerLists)
+                    {
+                        EHEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EHEngineerName))
+                    {
+                        EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label15.Text = "电气工程师：" + EHEngineerName;
+
+                string EAEngineerName = string.Empty;
+                var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
+                if (EAEngineerLists != null)
+                {
+                    foreach (var item in EAEngineerLists)
+                    {
+                        EAEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EAEngineerName))
+                    {
+                        EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label16.Text = "仪表工程师：" + EAEngineerName;
+            }
+            else
+            {
+                this.divSubOrganizational.Visible = true;
+                this.divOrganizational.Visible = false;
+
+                string projectManagerName = string.Empty;
+                var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
+                if (projectManager != null)
+                {
+                    foreach (var item in projectManager)
+                    {
+                        projectManagerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(projectManagerName))
+                    {
+                        projectManagerName = projectManagerName.Substring(0, projectManagerName.LastIndexOf(','));
+                    }
+                }
+                this.Label17.Text = "项目经理：" + projectManagerName;
+
+                string name4 = string.Empty;
+                var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
+                if (con != null)
+                {
+                    foreach (var item in con)
+                    {
+                        name4 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name4))
+                    {
+                        name4 = name4.Substring(0, name4.LastIndexOf(','));
+                    }
+                }
+                this.Label18.Text = "施工经理：" + name4;
+
+                string name5 = string.Empty;
+                var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
+                if (qa != null)
+                {
+                    foreach (var item in qa)
+                    {
+                        name5 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name5))
+                    {
+                        name5 = name5.Substring(0, name5.LastIndexOf(','));
+                    }
+                }
+                this.Label19.Text = "质量经理：" + name5;
+
+                string name6 = string.Empty;
+                var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
+                if (hseManager != null)
+                {
+                    foreach (var item in hseManager)
+                    {
+                        name6 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name6))
+                    {
+                        name6 = name6.Substring(0, name6.LastIndexOf(','));
+                    }
+                }
+                this.Label20.Text = "HSE经理：" + name6;
+
+                string docName = string.Empty;
+                var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
+                if (doc != null)
+                {
+                    foreach (var item in doc)
+                    {
+                        docName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(docName))
+                    {
+                        docName = docName.Substring(0, docName.LastIndexOf(','));
+                    }
+                }
+                this.Label21.Text = "文控工程师：" + docName;
+
+                string hseEngineerName = string.Empty;
+                var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
+                if (hseEngineerLists != null)
+                {
+                    foreach (var item in hseEngineerLists)
+                    {
+                        hseEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(hseEngineerName))
+                    {
+                        hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label22.Text = "HSE工程师：" + hseEngineerName;
+
+                string CVEngineerName = string.Empty;
+                var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
+                if (CVEngineerLists != null)
+                {
+                    foreach (var item in CVEngineerLists)
+                    {
+                        CVEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(CVEngineerName))
+                    {
+                        CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label23.Text = "土建工程师：" + CVEngineerName;
+
+                string FEEngineerName = string.Empty;
+                var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
+                if (FEEngineerLists != null)
+                {
+                    foreach (var item in FEEngineerLists)
+                    {
+                        FEEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(FEEngineerName))
+                    {
+                        FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label24.Text = "设备工程师：" + FEEngineerName;
+
+                string PDEngineerName = string.Empty;
+                var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
+                if (PDEngineerLists != null)
+                {
+                    foreach (var item in PDEngineerLists)
+                    {
+                        PDEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(PDEngineerName))
+                    {
+                        PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label25.Text = "管道工程师：" + PDEngineerName;
+
+                string EHEngineerName = string.Empty;
+                var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
+                if (EHEngineerLists != null)
+                {
+                    foreach (var item in EHEngineerLists)
+                    {
+                        EHEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EHEngineerName))
+                    {
+                        EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label26.Text = "电气工程师：" + EHEngineerName;
+
+                string EAEngineerName = string.Empty;
+                var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
+                if (EAEngineerLists != null)
+                {
+                    foreach (var item in EAEngineerLists)
+                    {
+                        EAEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EAEngineerName))
+                    {
+                        EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
+                    }
+                }
+                this.Label27.Text = "仪表工程师：" + EAEngineerName;
             }
         }
         #endregion
 
+        protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
+        {
+            if (TabStrip1.ActiveTabIndex == 0)
+            {
+                this.drpUnitId.Items.Clear();
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_1, false);
+                this.drpUnitId.SelectedIndex = 0;
+            }
+            else if (TabStrip1.ActiveTabIndex == 1)
+            {
+                this.drpUnitId.Items.Clear();
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
+                this.drpUnitId.SelectedIndex = 0;
+            }
+            DataBind(this.drpUnitId.SelectedValue);
+        }
+
+        #region 导出
         /// <summary>
         /// 导出
         /// </summary>
@@ -469,504 +487,489 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             string filePath = string.Empty;
 
             string projectId = this.CurrUser.LoginProjectId;
-            string unitId = this.CurrUser.UnitId;
-            
+            string unitId = this.drpUnitId.SelectedValue;
+
             var pModel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId);
 
-            if(this.CurrUser.UserId==BLL.Const.hfnbdId)
+            if (unitId == BLL.Const.UnitId_CWCEC)
             {
-                unitId = BLL.Const.UnitId_CWCEC;
+                initTemplatePath = Const.CQMS_OrganizationalUrl;
+                uploadfilepath = rootPath + initTemplatePath;
+
+                newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图（" + pModel.ShortName + "）");
+                //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf");
+                if (File.Exists(newUrl))
+                {
+                    File.Delete(newUrl);
+                }
+
+                File.Copy(uploadfilepath, newUrl);
+                Document doc = new Aspose.Words.Document(uploadfilepath);
+
+
+                Bookmark projectName = doc.Range.Bookmarks["ProjectName"];
+                if (projectName != null)
+                {
+                    projectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
+                }
+
+                Bookmark projectManager = doc.Range.Bookmarks["ProjectManager"];
+                string pm = string.Empty;
+                var lists1 = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
+                if (lists1 != null)
+                {
+                    foreach (var item in lists1)
+                    {
+                        pm += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(pm))
+                    {
+                        pm = pm.Substring(0, pm.LastIndexOf(','));
+                    }
+                }
+                projectManager.Text = "项目经理：" + pm;
+
+                Bookmark sj = doc.Range.Bookmarks["sjManager"];
+                string sjName = string.Empty;
+                var sjLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理");
+                if (sjLists != null)
+                {
+                    foreach (var item in sjLists)
+                    {
+                        sjName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(sjName))
+                    {
+                        sjName = sjName.Substring(0, sjName.LastIndexOf(','));
+                    }
+                }
+                sj.Text = "设计经理：" + sjName;
+
+                Bookmark cgManager = doc.Range.Bookmarks["cgManager"];
+                string cgName = string.Empty;
+                var cg = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "采购经理");
+                if (cg != null)
+                {
+                    foreach (var item in cg)
+                    {
+                        cgName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(cgName))
+                    {
+                        cgName = cgName.Substring(0, cgName.LastIndexOf(','));
+                    }
+                }
+                cgManager.Text = "采购经理：" + cgName;
+
+                Bookmark sgManager = doc.Range.Bookmarks["sgManager"];
+                string name4 = string.Empty;
+                var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
+                if (con != null)
+                {
+                    foreach (var item in con)
+                    {
+                        name4 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name4))
+                    {
+                        name4 = name4.Substring(0, name4.LastIndexOf(','));
+                    }
+                }
+                sgManager.Text = "施工经理：" + name4;
+
+                Bookmark qaManager = doc.Range.Bookmarks["qaManager"];
+                string name5 = string.Empty;
+                var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
+                if (qa != null)
+                {
+                    foreach (var item in qa)
+                    {
+                        name5 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name5))
+                    {
+                        name5 = name5.Substring(0, name5.LastIndexOf(','));
+                    }
+                }
+                qaManager.Text = "质量经理：" + name5;
+
+                Bookmark hse = doc.Range.Bookmarks["hseManager"];
+                string name6 = string.Empty;
+                var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
+                if (hseManager != null)
+                {
+                    foreach (var item in hseManager)
+                    {
+                        name6 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name6))
+                    {
+                        name6 = name6.Substring(0, name6.LastIndexOf(','));
+                    }
+                }
+                hse.Text = "HSE经理：" + name6;
+
+                Bookmark car = doc.Range.Bookmarks["carManager"];
+                string name7 = string.Empty;
+                var carManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车经理");
+                if (carManager != null)
+                {
+                    foreach (var item in carManager)
+                    {
+                        name7 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name7))
+                    {
+                        name7 = name7.Substring(0, name7.LastIndexOf(','));
+                    }
+                }
+                car.Text = "开车经理：" + name7;
+
+                Bookmark warehouse = doc.Range.Bookmarks["warehouseManager"];
+                string warehousemanName = string.Empty;
+                var warehousemanLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仓库管理员");
+                if (warehousemanLists != null)
+                {
+                    foreach (var item in warehousemanLists)
+                    {
+                        warehousemanName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(warehousemanName))
+                    {
+                        warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(','));
+                    }
+                }
+                warehouse.Text = "仓库管理员：" + warehousemanName;
+
+                Bookmark docManager = doc.Range.Bookmarks["docManager"];
+                string docName = string.Empty;
+                var docm = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
+                if (docm != null)
+                {
+                    foreach (var item in docm)
+                    {
+                        docName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(docName))
+                    {
+                        docName = docName.Substring(0, docName.LastIndexOf(','));
+                    }
+                }
+                docManager.Text = "文控工程师：" + docName;
+
+                Bookmark hseEngineer = doc.Range.Bookmarks["hseEngineer"];
+                string hseEngineerName = string.Empty;
+                var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
+                if (hseEngineerLists != null)
+                {
+                    foreach (var item in hseEngineerLists)
+                    {
+                        hseEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(hseEngineerName))
+                    {
+                        hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
+                    }
+                }
+                hseEngineer.Text = "HSE工程师：" + hseEngineerName;
+
+                Bookmark carEngineer = doc.Range.Bookmarks["carEngineer"];
+                string carEngineerName = string.Empty;
+                var carEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车工程师");
+                if (carEngineerLists != null)
+                {
+                    foreach (var item in carEngineerLists)
+                    {
+                        carEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(carEngineerName))
+                    {
+                        carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(','));
+                    }
+                }
+                carEngineer.Text = "开车工程师：" + carEngineerName;
+
+                Bookmark CVEngineer = doc.Range.Bookmarks["CVEngineer"];
+                string CVEngineerName = string.Empty;
+                var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
+                if (CVEngineerLists != null)
+                {
+                    foreach (var item in CVEngineerLists)
+                    {
+                        CVEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(CVEngineerName))
+                    {
+                        CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
+                    }
+                }
+                CVEngineer.Text = "土建工程师：" + CVEngineerName;
+
+                Bookmark FEEngineer = doc.Range.Bookmarks["FEEngineer"];
+                string FEEngineerName = string.Empty;
+                var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
+                if (FEEngineerLists != null)
+                {
+                    foreach (var item in FEEngineerLists)
+                    {
+                        FEEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(FEEngineerName))
+                    {
+                        FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
+                    }
+                }
+                FEEngineer.Text = "设备工程师：" + FEEngineerName;
+
+                Bookmark PDEngineer = doc.Range.Bookmarks["PDEngineer"];
+                string PDEngineerName = string.Empty;
+                var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
+                if (PDEngineerLists != null)
+                {
+                    foreach (var item in PDEngineerLists)
+                    {
+                        PDEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(PDEngineerName))
+                    {
+                        PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
+                    }
+                }
+                PDEngineer.Text = "管道工程师：" + PDEngineerName;
+
+                Bookmark EHEngineer = doc.Range.Bookmarks["EHEngineer"];
+                string EHEngineerName = string.Empty;
+                var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
+                if (EHEngineerLists != null)
+                {
+                    foreach (var item in EHEngineerLists)
+                    {
+                        EHEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EHEngineerName))
+                    {
+                        EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
+                    }
+                }
+                EHEngineer.Text = "电气工程师：" + EHEngineerName;
+
+                Bookmark EAEngineer = doc.Range.Bookmarks["EAEngineer"];
+                string EAEngineerName = string.Empty;
+                var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
+                if (EAEngineerLists != null)
+                {
+                    foreach (var item in EAEngineerLists)
+                    {
+                        EAEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EAEngineerName))
+                    {
+                        EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
+                    }
+                }
+                EAEngineer.Text = "仪表工程师：" + EAEngineerName;
+
+                doc.Save(newUrl);
             }
-
-            var unit = (from x in Funs.DB.Project_ProjectUnit
-                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
-                        where x.ProjectId == projectId
-                        //&& x.UnitType == BLL.Const.ProjectUnitType_2
-                        && x.UnitId == unitId
-                        select x).FirstOrDefault();
-            if (unit != null)
+            else
             {
-                if (unit.UnitType == BLL.Const.ProjectUnitType_1)
+                initTemplatePath = Const.CQMS_SubOrganizationalUrl;
+                uploadfilepath = rootPath + initTemplatePath;
+
+                newUrl = uploadfilepath.Replace("分包质量管理组织机构图", "分包质量管理组织机构图（" + pModel.ShortName + "）");
+                //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf");
+                if (File.Exists(newUrl))
                 {
-                    initTemplatePath = Const.CQMS_OrganizationalUrl;
-                    uploadfilepath = rootPath + initTemplatePath;
-
-                    newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图（" + pModel.ShortName + "）");
-                    //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf");
-                    if (File.Exists(newUrl))
-                    {
-                        File.Delete(newUrl);
-                    }
-
-                    File.Copy(uploadfilepath, newUrl);
-                    Document doc = new Aspose.Words.Document(uploadfilepath);
-
-
-                    Bookmark projectName = doc.Range.Bookmarks["ProjectName"];
-                    if (projectName != null)
-                    {
-                        projectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
-                    }
-
-                    Bookmark projectManager = doc.Range.Bookmarks["ProjectManager"];
-                    string pm = string.Empty;
-                    var lists1 = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
-                    if (lists1 != null)
-                    {
-                        foreach (var item in lists1)
-                        {
-                            pm += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(pm))
-                        {
-                            pm = pm.Substring(0, pm.LastIndexOf(','));
-                        }
-                    }
-                    projectManager.Text = "项目经理：" + pm;
-
-                    Bookmark sj = doc.Range.Bookmarks["sjManager"];
-                    string sjName = string.Empty;
-                    var sjLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理");
-                    if (sjLists != null)
-                    {
-                        foreach (var item in sjLists)
-                        {
-                            sjName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(sjName))
-                        {
-                            sjName = sjName.Substring(0, sjName.LastIndexOf(','));
-                        }
-                    }
-                    sj.Text = "设计经理：" + sjName;
-
-                    Bookmark cgManager = doc.Range.Bookmarks["cgManager"];
-                    string cgName = string.Empty;
-                    var cg = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "采购经理");
-                    if (cg != null)
-                    {
-                        foreach (var item in cg)
-                        {
-                            cgName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(cgName))
-                        {
-                            cgName = cgName.Substring(0, cgName.LastIndexOf(','));
-                        }
-                    }
-                    cgManager.Text = "采购经理：" + cgName;
-
-                    Bookmark sgManager = doc.Range.Bookmarks["sgManager"];
-                    string name4 = string.Empty;
-                    var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
-                    if (con != null)
-                    {
-                        foreach (var item in con)
-                        {
-                            name4 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name4))
-                        {
-                            name4 = name4.Substring(0, name4.LastIndexOf(','));
-                        }
-                    }
-                    sgManager.Text = "施工经理：" + name4;
-
-                    Bookmark qaManager = doc.Range.Bookmarks["qaManager"];
-                    string name5 = string.Empty;
-                    var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
-                    if (qa != null)
-                    {
-                        foreach (var item in qa)
-                        {
-                            name5 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name5))
-                        {
-                            name5 = name5.Substring(0, name5.LastIndexOf(','));
-                        }
-                    }
-                    qaManager.Text = "质量经理：" + name5;
-
-                    Bookmark hse = doc.Range.Bookmarks["hseManager"];
-                    string name6 = string.Empty;
-                    var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
-                    if (hseManager != null)
-                    {
-                        foreach (var item in hseManager)
-                        {
-                            name6 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name6))
-                        {
-                            name6 = name6.Substring(0, name6.LastIndexOf(','));
-                        }
-                    }
-                    hse.Text = "HSE经理：" + name6;
-
-                    Bookmark car = doc.Range.Bookmarks["carManager"];
-                    string name7 = string.Empty;
-                    var carManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车经理");
-                    if (carManager != null)
-                    {
-                        foreach (var item in carManager)
-                        {
-                            name7 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name7))
-                        {
-                            name7 = name7.Substring(0, name7.LastIndexOf(','));
-                        }
-                    }
-                    car.Text = "开车经理：" + name7;
-
-                    Bookmark warehouse = doc.Range.Bookmarks["warehouseManager"];
-                    string warehousemanName = string.Empty;
-                    var warehousemanLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仓库管理员");
-                    if (warehousemanLists != null)
-                    {
-                        foreach (var item in warehousemanLists)
-                        {
-                            warehousemanName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(warehousemanName))
-                        {
-                            warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(','));
-                        }
-                    }
-                    warehouse.Text = "仓库管理员：" + warehousemanName;
-
-                    Bookmark docManager = doc.Range.Bookmarks["docManager"];
-                    string docName = string.Empty;
-                    var docm = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
-                    if (docm != null)
-                    {
-                        foreach (var item in docm)
-                        {
-                            docName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(docName))
-                        {
-                            docName = docName.Substring(0, docName.LastIndexOf(','));
-                        }
-                    }
-                    docManager.Text = "文控工程师：" + docName;
-
-                    Bookmark hseEngineer = doc.Range.Bookmarks["hseEngineer"];
-                    string hseEngineerName = string.Empty;
-                    var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
-                    if (hseEngineerLists != null)
-                    {
-                        foreach (var item in hseEngineerLists)
-                        {
-                            hseEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(hseEngineerName))
-                        {
-                            hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    hseEngineer.Text = "HSE工程师：" + hseEngineerName;
-
-                    Bookmark carEngineer = doc.Range.Bookmarks["carEngineer"];
-                    string carEngineerName = string.Empty;
-                    var carEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车工程师");
-                    if (carEngineerLists != null)
-                    {
-                        foreach (var item in carEngineerLists)
-                        {
-                            carEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(carEngineerName))
-                        {
-                            carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    carEngineer.Text = "开车工程师：" + carEngineerName;
-
-                    Bookmark CVEngineer = doc.Range.Bookmarks["CVEngineer"];
-                    string CVEngineerName = string.Empty;
-                    var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
-                    if (CVEngineerLists != null)
-                    {
-                        foreach (var item in CVEngineerLists)
-                        {
-                            CVEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(CVEngineerName))
-                        {
-                            CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    CVEngineer.Text = "土建工程师：" + CVEngineerName;
-
-                    Bookmark FEEngineer = doc.Range.Bookmarks["FEEngineer"];
-                    string FEEngineerName = string.Empty;
-                    var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
-                    if (FEEngineerLists != null)
-                    {
-                        foreach (var item in FEEngineerLists)
-                        {
-                            FEEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(FEEngineerName))
-                        {
-                            FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    FEEngineer.Text = "设备工程师：" + FEEngineerName;
-
-                    Bookmark PDEngineer = doc.Range.Bookmarks["PDEngineer"];
-                    string PDEngineerName = string.Empty;
-                    var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
-                    if (PDEngineerLists != null)
-                    {
-                        foreach (var item in PDEngineerLists)
-                        {
-                            PDEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(PDEngineerName))
-                        {
-                            PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    PDEngineer.Text = "管道工程师：" + PDEngineerName;
-
-                    Bookmark EHEngineer = doc.Range.Bookmarks["EHEngineer"];
-                    string EHEngineerName = string.Empty;
-                    var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
-                    if (EHEngineerLists != null)
-                    {
-                        foreach (var item in EHEngineerLists)
-                        {
-                            EHEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(EHEngineerName))
-                        {
-                            EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    EHEngineer.Text = "电气工程师：" + EHEngineerName;
-
-                    Bookmark EAEngineer = doc.Range.Bookmarks["EAEngineer"];
-                    string EAEngineerName = string.Empty;
-                    var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
-                    if (EAEngineerLists != null)
-                    {
-                        foreach (var item in EAEngineerLists)
-                        {
-                            EAEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(EAEngineerName))
-                        {
-                            EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    EAEngineer.Text = "仪表工程师：" + EAEngineerName;
-
-                    doc.Save(newUrl);
+                    File.Delete(newUrl);
                 }
-                else if(unit.UnitType == BLL.Const.ProjectUnitType_2)
+
+                File.Copy(uploadfilepath, newUrl);
+                Document doc = new Aspose.Words.Document(uploadfilepath);
+
+                Bookmark projectName = doc.Range.Bookmarks["ProjectName"];
+                if (projectName != null)
                 {
-                    initTemplatePath = Const.CQMS_SubOrganizationalUrl;
-                    uploadfilepath = rootPath + initTemplatePath;
-
-                    newUrl = uploadfilepath.Replace("分包质量管理组织机构图", "分包质量管理组织机构图（" + pModel.ShortName + "）");
-                    //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf");
-                    if (File.Exists(newUrl))
-                    {
-                        File.Delete(newUrl);
-                    }
-
-                    File.Copy(uploadfilepath, newUrl);
-                    Document doc = new Aspose.Words.Document(uploadfilepath);
-
-                    Bookmark projectName = doc.Range.Bookmarks["ProjectName"];
-                    if (projectName != null)
-                    {
-                        projectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
-                    }
-
-                    Bookmark projectManager = doc.Range.Bookmarks["ProjectManager"];
-                    string pm = string.Empty;
-                    var lists1 = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
-                    if (lists1 != null)
-                    {
-                        foreach (var item in lists1)
-                        {
-                            pm += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(pm))
-                        {
-                            pm = pm.Substring(0, pm.LastIndexOf(','));
-                        }
-                    }
-                    projectManager.Text = "项目经理：" + pm;
-
-                    Bookmark sgManager = doc.Range.Bookmarks["sgManager"];
-                    string name4 = string.Empty;
-                    var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
-                    if (con != null)
-                    {
-                        foreach (var item in con)
-                        {
-                            name4 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name4))
-                        {
-                            name4 = name4.Substring(0, name4.LastIndexOf(','));
-                        }
-                    }
-                    sgManager.Text = "施工经理：" + name4;
-
-                    Bookmark qaManager = doc.Range.Bookmarks["qaManager"];
-                    string name5 = string.Empty;
-                    var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
-                    if (qa != null)
-                    {
-                        foreach (var item in qa)
-                        {
-                            name5 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name5))
-                        {
-                            name5 = name5.Substring(0, name5.LastIndexOf(','));
-                        }
-                    }
-                    qaManager.Text = "质量经理：" + name5;
-
-                    Bookmark hse = doc.Range.Bookmarks["hseManager"];
-                    string name6 = string.Empty;
-                    var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
-                    if (hseManager != null)
-                    {
-                        foreach (var item in hseManager)
-                        {
-                            name6 += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(name6))
-                        {
-                            name6 = name6.Substring(0, name6.LastIndexOf(','));
-                        }
-                    }
-                    hse.Text = "HSE经理：" + name6;
-
-                    Bookmark docManager = doc.Range.Bookmarks["docManager"];
-                    string docName = string.Empty;
-                    var docm = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
-                    if (docm != null)
-                    {
-                        foreach (var item in docm)
-                        {
-                            docName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(docName))
-                        {
-                            docName = docName.Substring(0, docName.LastIndexOf(','));
-                        }
-                    }
-                    docManager.Text = "文控工程师：" + docName;
-
-                    Bookmark hseEngineer = doc.Range.Bookmarks["hseEngineer"];
-                    string hseEngineerName = string.Empty;
-                    var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
-                    if (hseEngineerLists != null)
-                    {
-                        foreach (var item in hseEngineerLists)
-                        {
-                            hseEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(hseEngineerName))
-                        {
-                            hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    hseEngineer.Text = "HSE工程师：" + hseEngineerName;
-
-                    Bookmark CVEngineer = doc.Range.Bookmarks["CVEngineer"];
-                    string CVEngineerName = string.Empty;
-                    var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
-                    if (CVEngineerLists != null)
-                    {
-                        foreach (var item in CVEngineerLists)
-                        {
-                            CVEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(CVEngineerName))
-                        {
-                            CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    CVEngineer.Text = "土建工程师：" + CVEngineerName;
-
-                    Bookmark FEEngineer = doc.Range.Bookmarks["FEEngineer"];
-                    string FEEngineerName = string.Empty;
-                    var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
-                    if (FEEngineerLists != null)
-                    {
-                        foreach (var item in FEEngineerLists)
-                        {
-                            FEEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(FEEngineerName))
-                        {
-                            FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    FEEngineer.Text = "设备工程师：" + FEEngineerName;
-
-                    Bookmark PDEngineer = doc.Range.Bookmarks["PDEngineer"];
-                    string PDEngineerName = string.Empty;
-                    var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
-                    if (PDEngineerLists != null)
-                    {
-                        foreach (var item in PDEngineerLists)
-                        {
-                            PDEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(PDEngineerName))
-                        {
-                            PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    PDEngineer.Text = "管道工程师：" + PDEngineerName;
-
-                    Bookmark EHEngineer = doc.Range.Bookmarks["EHEngineer"];
-                    string EHEngineerName = string.Empty;
-                    var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
-                    if (EHEngineerLists != null)
-                    {
-                        foreach (var item in EHEngineerLists)
-                        {
-                            EHEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(EHEngineerName))
-                        {
-                            EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    EHEngineer.Text = "电气工程师：" + EHEngineerName;
-
-                    Bookmark EAEngineer = doc.Range.Bookmarks["EAEngineer"];
-                    string EAEngineerName = string.Empty;
-                    var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
-                    if (EAEngineerLists != null)
-                    {
-                        foreach (var item in EAEngineerLists)
-                        {
-                            EAEngineerName += item + ",";
-                        }
-                        if (!string.IsNullOrEmpty(EAEngineerName))
-                        {
-                            EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
-                        }
-                    }
-                    EAEngineer.Text = "仪表工程师：" + EAEngineerName;
-
-                    doc.Save(newUrl);
+                    projectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
                 }
-            } 
-            
+
+                Bookmark projectManager = doc.Range.Bookmarks["ProjectManager"];
+                string pm = string.Empty;
+                var lists1 = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理");
+                if (lists1 != null)
+                {
+                    foreach (var item in lists1)
+                    {
+                        pm += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(pm))
+                    {
+                        pm = pm.Substring(0, pm.LastIndexOf(','));
+                    }
+                }
+                projectManager.Text = "项目经理：" + pm;
+
+                Bookmark sgManager = doc.Range.Bookmarks["sgManager"];
+                string name4 = string.Empty;
+                var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理");
+                if (con != null)
+                {
+                    foreach (var item in con)
+                    {
+                        name4 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name4))
+                    {
+                        name4 = name4.Substring(0, name4.LastIndexOf(','));
+                    }
+                }
+                sgManager.Text = "施工经理：" + name4;
+
+                Bookmark qaManager = doc.Range.Bookmarks["qaManager"];
+                string name5 = string.Empty;
+                var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
+                if (qa != null)
+                {
+                    foreach (var item in qa)
+                    {
+                        name5 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name5))
+                    {
+                        name5 = name5.Substring(0, name5.LastIndexOf(','));
+                    }
+                }
+                qaManager.Text = "质量经理：" + name5;
+
+                Bookmark hse = doc.Range.Bookmarks["hseManager"];
+                string name6 = string.Empty;
+                var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
+                if (hseManager != null)
+                {
+                    foreach (var item in hseManager)
+                    {
+                        name6 += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(name6))
+                    {
+                        name6 = name6.Substring(0, name6.LastIndexOf(','));
+                    }
+                }
+                hse.Text = "HSE经理：" + name6;
+
+                Bookmark docManager = doc.Range.Bookmarks["docManager"];
+                string docName = string.Empty;
+                var docm = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师");
+                if (docm != null)
+                {
+                    foreach (var item in docm)
+                    {
+                        docName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(docName))
+                    {
+                        docName = docName.Substring(0, docName.LastIndexOf(','));
+                    }
+                }
+                docManager.Text = "文控工程师：" + docName;
+
+                Bookmark hseEngineer = doc.Range.Bookmarks["hseEngineer"];
+                string hseEngineerName = string.Empty;
+                var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师");
+                if (hseEngineerLists != null)
+                {
+                    foreach (var item in hseEngineerLists)
+                    {
+                        hseEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(hseEngineerName))
+                    {
+                        hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(','));
+                    }
+                }
+                hseEngineer.Text = "HSE工程师：" + hseEngineerName;
+
+                Bookmark CVEngineer = doc.Range.Bookmarks["CVEngineer"];
+                string CVEngineerName = string.Empty;
+                var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师");
+                if (CVEngineerLists != null)
+                {
+                    foreach (var item in CVEngineerLists)
+                    {
+                        CVEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(CVEngineerName))
+                    {
+                        CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(','));
+                    }
+                }
+                CVEngineer.Text = "土建工程师：" + CVEngineerName;
+
+                Bookmark FEEngineer = doc.Range.Bookmarks["FEEngineer"];
+                string FEEngineerName = string.Empty;
+                var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师");
+                if (FEEngineerLists != null)
+                {
+                    foreach (var item in FEEngineerLists)
+                    {
+                        FEEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(FEEngineerName))
+                    {
+                        FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(','));
+                    }
+                }
+                FEEngineer.Text = "设备工程师：" + FEEngineerName;
+
+                Bookmark PDEngineer = doc.Range.Bookmarks["PDEngineer"];
+                string PDEngineerName = string.Empty;
+                var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师");
+                if (PDEngineerLists != null)
+                {
+                    foreach (var item in PDEngineerLists)
+                    {
+                        PDEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(PDEngineerName))
+                    {
+                        PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(','));
+                    }
+                }
+                PDEngineer.Text = "管道工程师：" + PDEngineerName;
+
+                Bookmark EHEngineer = doc.Range.Bookmarks["EHEngineer"];
+                string EHEngineerName = string.Empty;
+                var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师");
+                if (EHEngineerLists != null)
+                {
+                    foreach (var item in EHEngineerLists)
+                    {
+                        EHEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EHEngineerName))
+                    {
+                        EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(','));
+                    }
+                }
+                EHEngineer.Text = "电气工程师：" + EHEngineerName;
+
+                Bookmark EAEngineer = doc.Range.Bookmarks["EAEngineer"];
+                string EAEngineerName = string.Empty;
+                var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师");
+                if (EAEngineerLists != null)
+                {
+                    foreach (var item in EAEngineerLists)
+                    {
+                        EAEngineerName += item + ",";
+                    }
+                    if (!string.IsNullOrEmpty(EAEngineerName))
+                    {
+                        EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(','));
+                    }
+                }
+                EAEngineer.Text = "仪表工程师：" + EAEngineerName;
+
+                doc.Save(newUrl);
+            }
             string fileName = Path.GetFileName(newUrl);
             FileInfo info = new FileInfo(newUrl);
             long fileSize = info.Length;
@@ -979,5 +982,18 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             Response.Close();
             File.Delete(newUrl);
         }
+        #endregion
+
+        #region DropDownList下拉选择事件
+        /// <summary>
+        /// 单位下拉选择
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            DataBind(this.drpUnitId.SelectedValue);
+        }
+        #endregion
     }
-}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs
index 14c9a168..e70590ab 100644
--- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs
@@ -31,13 +31,40 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         protected global::FineUIPro.PageManager PageManager1;
         
         /// <summary>
-        /// ContentPanel1 控件。
+        /// ContentPanel3 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
+        protected global::FineUIPro.ContentPanel ContentPanel3;
+        
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+        
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+        
+        /// <summary>
+        /// drpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitId;
         
         /// <summary>
         /// btnOut 控件。
@@ -48,6 +75,15 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
         
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+        
         /// <summary>
         /// divOrganizational 控件。
         /// </summary>
@@ -57,6 +93,15 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divOrganizational;
         
+        /// <summary>
+        /// table91 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable table91;
+        
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -64,7 +109,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label1;
+        protected global::FineUIPro.Label Label1;
         
         /// <summary>
         /// Label2 控件。
@@ -73,7 +118,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::FineUIPro.Label Label2;
         
         /// <summary>
         /// Label3 控件。
@@ -82,7 +127,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
+        protected global::FineUIPro.Label Label3;
         
         /// <summary>
         /// Label4 控件。
@@ -91,7 +136,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label4;
+        protected global::FineUIPro.Label Label4;
         
         /// <summary>
         /// Label5 控件。
@@ -100,7 +145,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label5;
+        protected global::FineUIPro.Label Label5;
         
         /// <summary>
         /// Label6 控件。
@@ -109,7 +154,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label6;
+        protected global::FineUIPro.Label Label6;
         
         /// <summary>
         /// Label7 控件。
@@ -118,7 +163,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label7;
+        protected global::FineUIPro.Label Label7;
         
         /// <summary>
         /// Label8 控件。
@@ -127,7 +172,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label8;
+        protected global::FineUIPro.Label Label8;
         
         /// <summary>
         /// Label9 控件。
@@ -136,7 +181,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label9;
+        protected global::FineUIPro.Label Label9;
         
         /// <summary>
         /// Label10 控件。
@@ -145,7 +190,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label10;
+        protected global::FineUIPro.Label Label10;
         
         /// <summary>
         /// Label11 控件。
@@ -154,7 +199,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label11;
+        protected global::FineUIPro.Label Label11;
         
         /// <summary>
         /// Label12 控件。
@@ -163,7 +208,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label12;
+        protected global::FineUIPro.Label Label12;
         
         /// <summary>
         /// Label13 控件。
@@ -172,7 +217,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label13;
+        protected global::FineUIPro.Label Label13;
         
         /// <summary>
         /// Label14 控件。
@@ -181,7 +226,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label14;
+        protected global::FineUIPro.Label Label14;
         
         /// <summary>
         /// Label15 控件。
@@ -190,7 +235,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label15;
+        protected global::FineUIPro.Label Label15;
         
         /// <summary>
         /// Label16 控件。
@@ -199,7 +244,16 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label16;
+        protected global::FineUIPro.Label Label16;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
         
         /// <summary>
         /// divSubOrganizational 控件。
@@ -210,6 +264,15 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSubOrganizational;
         
+        /// <summary>
+        /// table92 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable table92;
+        
         /// <summary>
         /// Label17 控件。
         /// </summary>
@@ -217,7 +280,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label17;
+        protected global::FineUIPro.Label Label17;
         
         /// <summary>
         /// Label18 控件。
@@ -226,7 +289,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label18;
+        protected global::FineUIPro.Label Label18;
         
         /// <summary>
         /// Label19 控件。
@@ -235,7 +298,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label19;
+        protected global::FineUIPro.Label Label19;
         
         /// <summary>
         /// Label20 控件。
@@ -244,7 +307,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label20;
+        protected global::FineUIPro.Label Label20;
         
         /// <summary>
         /// Label23 控件。
@@ -253,7 +316,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label23;
+        protected global::FineUIPro.Label Label23;
         
         /// <summary>
         /// Label24 控件。
@@ -262,7 +325,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label24;
+        protected global::FineUIPro.Label Label24;
         
         /// <summary>
         /// Label25 控件。
@@ -271,7 +334,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label25;
+        protected global::FineUIPro.Label Label25;
         
         /// <summary>
         /// Label26 控件。
@@ -280,7 +343,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label26;
+        protected global::FineUIPro.Label Label26;
         
         /// <summary>
         /// Label27 控件。
@@ -289,7 +352,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label27;
+        protected global::FineUIPro.Label Label27;
         
         /// <summary>
         /// Label21 控件。
@@ -298,7 +361,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label21;
+        protected global::FineUIPro.Label Label21;
         
         /// <summary>
         /// Label22 控件。
@@ -307,6 +370,6 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label22;
+        protected global::FineUIPro.Label Label22;
     }
 }
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 898f5f3d..33cf355f 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -573,6 +573,7 @@
     <Content Include="CQMS\QualityPlanning\ConExperienceSummaryDataIn.aspx" />
     <Content Include="CQMS\QualityPlanning\ConExperienceSummaryEdit.aspx" />
     <Content Include="CQMS\QualityPlanning\Organizational.aspx" />
+    <Content Include="CQMS\QualityPlanning\Organizational123.aspx" />
     <Content Include="CQMS\QualityPlanning\ProjectQualityPlan.aspx" />
     <Content Include="CQMS\QualityPlanning\ProjectQualityPlanDataIn.aspx" />
     <Content Include="CQMS\QualityPlanning\ProjectQualityPlanEdit.aspx" />
@@ -8407,6 +8408,13 @@
     <Compile Include="CQMS\QualityPlanning\Organizational.aspx.designer.cs">
       <DependentUpon>Organizational.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\QualityPlanning\Organizational123.aspx.cs">
+      <DependentUpon>Organizational123.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\Organizational123.aspx.designer.cs">
+      <DependentUpon>Organizational123.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\QualityPlanning\ProjectQualityPlan.aspx.cs">
       <DependentUpon>ProjectQualityPlan.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index a470cd33..9fc55c34 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,8 +12,8 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
-   <!--系统名称-->
+    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
     <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
index abcdda9e..95be2b75 100644
--- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
@@ -179,8 +179,9 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
             //周例会
             var list3 = Funs.DB.Meeting_WeekMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.WeekMeetingDate }).ToList();
             //月例会
-            var list4 = Funs.DB.Meeting_MonthMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.MonthMeetingDate }).ToList();
-
+            //var list4 = Funs.DB.Meeting_MonthMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.MonthMeetingDate }).ToList();
+            //安全领导小组会议
+            var list4 = Funs.DB.Meeting_SafetyLeaderGroupMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.SafetyLeaderGroupMeetingDate }).ToList();
             //作业票
             var list5 = Funs.DB.View_License_LicenseManager
                 .Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.CompileDate })
@@ -391,7 +392,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
                     }
                     allList.Add(model);
 
-                    //月例会
+                    //安全领导小组会议
                     model = new Inspection_Summary();
                     model.ProjectId = pid;
                     model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
@@ -965,7 +966,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
                     }
                     else if (column.ColumnID == "ThisProject" + (i + 1).ToString()) {
                         //指定哪些列再做二次加载
-                        if (MenuC=="安全巡检"|| MenuC == "周例会" || MenuC == "月例会" || MenuC == "作业票" || MenuC == "工程师日志" || MenuC == "HSE管理月报" 
+                        if (MenuC=="安全巡检"|| MenuC == "周例会" || MenuC == "安全领导小组会议" || MenuC == "作业票" || MenuC == "工程师日志" || MenuC == "HSE管理月报" 
                             || MenuC == "质量巡检"|| MenuC == "设备材料报验" || MenuC == "人员报验" || MenuC == "机具报验" 
                             || MenuC == "设计变更单管理" || MenuC == "施工方案管理"|| MenuC == "设计交底管理" || MenuC == "NCR" || MenuC == "质量周报" 
                             || MenuC == "质量月报" || MenuC == "一次共检合格数" || MenuC == "关键事项")
