20260209 工业管道安装质量证明书

HJGL_DS/FineUIPro.Web/JGZL/EWeldRHRecord.aspx

@@ -0,0 +1,114 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EWeldRHRecord.aspx.cs" Inherits="FineUIPro.Web.JGZL.EWeldRHRecord" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>焊材库温湿度记录</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊材库温湿度记录" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TemperatureAndHumidityId" AllowCellEditing="true" ClicksToEdit="2"
+                    DataIDField="TemperatureAndHumidityId" AllowSorting="true" SortField="RecordDate" SortDirection="DESC"
+                    OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
+                    OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="90px" Width="265px" LabelAlign="Right"
+                                            EnableEdit="true">
+                                        </f:DropDownList>
+                                <f:DatePicker ID="txtStartDate" runat="server" Label="记录日期" EmptyText="开始时间" Width="220px" LabelAlign="Right"></f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="-"></f:Label>
+                                <f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker>
+                                <f:DropDownList ID="drpUnitStore" runat="server" Label="单位仓库" LabelAlign="Right" EnableGroup="true">
+                        </f:DropDownList>
+                                <f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnSelect" Text="选择" ToolTip="选择焊材库温湿度记录" Icon="Pencil" runat="server" Hidden="true" OnClick="btnSelect_Click">
+                                </f:Button>
+                                <f:Button ID="btnPrint" Text="打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="RecordDate" DataField="RecordDate" FieldType="Date" RendererArgument="yyyy-MM-dd HH:mm"
+                            HeaderText="记录时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="Temperature" DataField="Temperature" FieldType="String"
+                            HeaderText="温度℃" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="Humidity" DataField="Humidity" FieldType="String"
+                            HeaderText="湿度%" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="RecordMan" DataField="RecordMan" FieldType="String"
+                            HeaderText="记录人" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
+                            HeaderText="单位仓库" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="焊材库温湿度记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1200px" Height="650px">
+        </f:Window>
+        <f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
+            Height="640px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <%--<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑" Icon="Pencil">
+            </f:MenuButton>--%>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

HJGL_DS/FineUIPro.Web/JGZL/EWeldRHRecord.aspx.designer.cs

@@ -0,0 +1,215 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+    public partial class EWeldRHRecord
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProjectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectId;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate;
+
+        /// <summary>
+        /// drpUnitStore 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitStore;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSelect 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSelect;
+
+        /// <summary>
+        /// btnPrint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnPrint;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.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>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="220px" Title="压力管道安装质量证明书" ShowBorder="true" Layout="VBox"
+                    EnableCollapse="true" Width="220px" Title="工业管道安装质量证明书" ShowBorder="true" Layout="VBox"
                     ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
@@ -25,28 +25,28 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="压力管道安装质量证明书" OnNodeCommand="tvControlItem_NodeCommand"
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装质量证明书" OnNodeCommand="tvControlItem_NodeCommand"
                             runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
                             AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
                         </f:Tree>
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="压力管道安装质量证明书"
-                    TitleToolTip="压力管道安装质量证明书" AutoScroll="true">
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装质量证明书"
+                    TitleToolTip="工业管道安装质量证明书" AutoScroll="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>
-                                <f:Button ID="btnPrint" Text="压力管道安装质量证明书打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                <f:Button ID="btnPrint" Text="工业管道安装质量证明书打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="压力管道安装质量证明书" EnableCollapse="true"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工业管道安装质量证明书" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="CertificateId" AllowCellEditing="true"
                             EnableColumnLines="true" ClicksToEdit="1" DataIDField="CertificateId" AllowSorting="true"
                             SortField="CertificateCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
@@ -68,7 +68,7 @@
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="220px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="交工单元编号" ColumnID="DeliveryUnitCode" DataField="DeliveryUnitCode" SortField="DeliveryUnitCode"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="220px">
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="120px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="安装开工日期" ColumnID="InstallStartDate" DataField="InstallStartDate" SortField="InstallStartDate"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
@@ -80,20 +80,32 @@
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="120px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="管道长度" ColumnID="PipelineLength" DataField="PipelineLength" SortField="PipelineLength"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="100px">
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="150px">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="压力管道设计许可证编号" ColumnID="DesignLicenseCode" DataField="DesignLicenseCode" SortField="DesignLicenseCode"
+                                <f:RenderField HeaderText="设计单位" ColumnID="DesignUnit" DataField="DesignUnit" SortField="DesignUnit"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="150px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="无损检测机构" ColumnID="LosslessTestingAgency" DataField="LosslessTestingAgency" SortField="LosslessTestingAgency"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="150px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="监检机构" ColumnID="InstallationInspection" DataField="InstallationInspection" SortField="InstallationInspection"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="150px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="建设单位（使用单位）" ColumnID="ConstructionUnit" DataField="ConstructionUnit" SortField="ConstructionUnit"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="150px">
+                                </f:RenderField>
+                                <%--<f:RenderField HeaderText="压力管道设计许可证编号" ColumnID="DesignLicenseCode" DataField="DesignLicenseCode" SortField="DesignLicenseCode"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="160px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="资质证书编号" ColumnID="QualificationCertificateCode" DataField="QualificationCertificateCode" SortField="QualificationCertificateCode"
+                                </f:RenderField>--%>
+                                <%--<f:RenderField HeaderText="资质证书编号" ColumnID="QualificationCertificateCode" DataField="QualificationCertificateCode" SortField="QualificationCertificateCode"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="160px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="无损检测机构核准证编号" ColumnID="InstitutionalApprovalCertificate" DataField="InstitutionalApprovalCertificate" SortField="InstitutionalApprovalCertificate"
+                                </f:RenderField>--%>
+                                <%--<f:RenderField HeaderText="无损检测机构核准证编号" ColumnID="InstitutionalApprovalCertificate" DataField="InstitutionalApprovalCertificate" SortField="InstitutionalApprovalCertificate"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="160px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="特种设备安装许可证编号" ColumnID="SpecialEquipmentProductionLicenseCode" DataField="SpecialEquipmentProductionLicenseCode" SortField="SpecialEquipmentProductionLicenseCode"
+                                </f:RenderField>--%>
+                                <%--<f:RenderField HeaderText="特种设备安装许可证编号" ColumnID="SpecialEquipmentProductionLicenseCode" DataField="SpecialEquipmentProductionLicenseCode" SortField="SpecialEquipmentProductionLicenseCode"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" MinWidth="140px">
-                                </f:RenderField>
+                                </f:RenderField>--%>
                             </Columns>
                             <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -116,11 +128,11 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="压力管道安装质量证明书" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="工业管道安装质量证明书" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="900px" Height="600px">
         </f:Window>
-        <f:Window ID="WindowPrint" Title="打印压力管道安装质量证明书" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="WindowPrint" Title="打印工业管道安装质量证明书" Hidden="true" EnableIFrame="true" EnableMaximize="false"
             Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
             Height="600px">
         </f:Window>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificateEdit.aspx

@@ -26,8 +26,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtCertificateCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
-                        <f:TextBox ID="txtSpecialEquipmentProductionLicenseCode" runat="server" Label="特种设备安装许可证编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:TextBox ID="txtCertificateCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>                        
                     </Items>
                 </f:FormRow>
                 <%--<f:FormRow>
@@ -50,37 +49,41 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtPipelineLevel" runat="server" Label="管道级别" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtPipelineLength" runat="server" Label="管道长度" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:DropDownList ID="drpPipelineLevel" runat="server" Label="管道级别" LabelAlign="Right" LabelWidth="170px" EnableEdit="true"></f:DropDownList>
+                        <f:DropDownList ID="drpPipelineLength" runat="server" Label="管道长度" LabelAlign="Right" LabelWidth="170px" EnableEdit="true"></f:DropDownList>
+                        <%--<f:TextBox ID="txtPipelineLevel" runat="server" Label="管道级别" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>--%>
+                        <%--<f:TextBox ID="txtPipelineLength" runat="server" Label="管道长度" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>--%>
                     </Items>
                 </f:FormRow>
-                <f:FormRow>
+                <%--<f:FormRow>
                     <Items>
                         <f:TextBox ID="txtDesignLicenseCode" runat="server" Label="压力管道设计许可证编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                         <f:TextBox ID="txtQualificationCertificateCode" runat="server" Label="资质证书编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
-                </f:FormRow>
+                </f:FormRow>--%>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtInstitutionalApprovalCertificate" runat="server" Label="无损检测机构核准证编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <%--<f:TextBox ID="txtInstitutionalApprovalCertificate" runat="server" Label="无损检测机构核准证编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>--%>
                         <f:TextBox ID="txtDesignUnit" runat="server" Label="设计单位" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                          <f:TextBox ID="txtLosslessTestingAgency" runat="server" Label="无损检测机构" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
-                <f:FormRow>
+                <%--<f:FormRow>
                     <Items>
                         <f:TextBox ID="txtSupervisoryAndInspectionAgency" runat="server" Label="监理单位" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtLosslessTestingAgency" runat="server" Label="无损检测单位" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                      
+                    </Items>
+                </f:FormRow>--%>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtInstallationInspection" runat="server" Label="监检机构" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtConstructionUnit" runat="server" Label="建设单位（使用单位）" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtInstallationInspection" runat="server" Label="安装监检单位" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtConstructionUnit" runat="server" Label="使用单位" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="170px" MaxLength="500"></f:TextArea>
+                        <f:TextBox ID="txtSpecialEquipmentProductionLicenseCode" runat="server" Label="特种设备安装许可证编号" LabelAlign="Right" LabelWidth="170px" MaxLength="50" ></f:TextBox>
+                        <%--<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="170px" MaxLength="500"></f:TextArea>--%>
                     </Items>
                 </f:FormRow>
             </Rows>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificateEdit.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using Model;
 using System;
 
 namespace FineUIPro.Web.JGZL
@@ -49,6 +50,17 @@ namespace FineUIPro.Web.JGZL
             {
                 this.ProjectId = Request.Params["projectId"];
                 this.CertificateId = Request.Params["certificateId"];
+                //管道等级
+                this.drpPipelineLevel.DataTextField = "ISC_IsoName";
+                this.drpPipelineLevel.DataValueField = "ISC_IsoName";
+                this.drpPipelineLevel.DataSource = BLL.HJGL_PW_IsoInfoService.GetPipelineLevelList(this.ProjectId);
+                this.drpPipelineLevel.DataBind();
+                //管道长度
+                this.drpPipelineLength.DataTextField = "PipeLineLength";
+                this.drpPipelineLength.DataValueField = "PipeLineLength";
+                this.drpPipelineLength.DataSource = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.ProjectId);
+                this.drpPipelineLength.DataBind();
+
                 if (!string.IsNullOrEmpty(this.CertificateId))
                 {
                     var report = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateById(this.CertificateId);
@@ -62,19 +74,33 @@ namespace FineUIPro.Web.JGZL
                         this.txtDeliveryUnitCode.Text = report.DeliveryUnitCode;
                         this.txtInstallStartDate.Text = report.InstallStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.InstallStartDate) : "";
                         this.txtInstallEndDate.Text = report.InstallEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.InstallEndDate) : "";
-                        this.txtPipelineLevel.Text = report.PipelineLevel;
-                        this.txtPipelineLength.Text = report.PipelineLength;
-                        this.txtDesignLicenseCode.Text = report.DesignLicenseCode;
-                        this.txtQualificationCertificateCode.Text = report.QualificationCertificateCode;
-                        this.txtInstitutionalApprovalCertificate.Text = report.InstitutionalApprovalCertificate;
+                        if (!string.IsNullOrEmpty(report.PipelineLevel))
+                        {
+                            this.drpPipelineLevel.SelectedValue = report.PipelineLevel;
+                        }
+                        if (!string.IsNullOrEmpty(report.PipelineLength))
+                        {
+                            this.drpPipelineLength.SelectedValue = report.PipelineLength;
+                        }
+                        //this.txtPipelineLevel.Text = report.PipelineLevel;
+                        //this.txtPipelineLength.Text = report.PipelineLength;
+                        //this.txtDesignLicenseCode.Text = report.DesignLicenseCode;
+                        //this.txtQualificationCertificateCode.Text = report.QualificationCertificateCode;
+                        //this.txtInstitutionalApprovalCertificate.Text = report.InstitutionalApprovalCertificate;
                         this.txtDesignUnit.Text = report.DesignUnit;
-                        this.txtSupervisoryAndInspectionAgency.Text = report.SupervisoryAndInspectionAgency;
+                        //this.txtSupervisoryAndInspectionAgency.Text = report.SupervisoryAndInspectionAgency;
                         this.txtLosslessTestingAgency.Text = report.LosslessTestingAgency;
                         this.txtInstallationInspection.Text = report.InstallationInspection;
                         this.txtConstructionUnit.Text = report.ConstructionUnit;
-                        this.txtRemark.Text = report.Remark;
+                        //this.txtRemark.Text = report.Remark;
                     }
                 }
+                else
+                {
+                    this.txtInstallationInspection.Text = "浙江省特种设备研究院";
+                    this.txtConstructionUnit.Text = "浙江石油化工有限公司";
+                    this.txtSpecialEquipmentProductionLicenseCode.Text = "TS3833339-2028";
+                }
             }
         }
         #endregion
@@ -98,16 +124,24 @@ namespace FineUIPro.Web.JGZL
                 newReport.DeliveryUnitCode = this.txtDeliveryUnitCode.Text.Trim();
                 newReport.InstallStartDate = Funs.GetNewDateTime(this.txtInstallStartDate.Text.Trim());
                 newReport.InstallEndDate = Funs.GetNewDateTime(this.txtInstallEndDate.Text.Trim());
-                newReport.PipelineLevel = this.txtPipelineLevel.Text.Trim();
-                newReport.PipelineLength = this.txtPipelineLength.Text.Trim();
+                if(!string.IsNullOrEmpty(drpPipelineLevel.SelectedValue))
+                {
+                    newReport.PipelineLevel = this.drpPipelineLevel.SelectedValue;
+                }
+                if (!string.IsNullOrEmpty(drpPipelineLength.SelectedValue))
+                {
+                    newReport.PipelineLength = this.drpPipelineLength.SelectedValue;
+                }
+                //newReport.PipelineLevel = this.txtPipelineLevel.Text.Trim();
+                //newReport.PipelineLength = this.txtPipelineLength.Text.Trim();
                 newReport.DesignUnit = this.txtDesignUnit.Text.Trim();
                 newReport.LosslessTestingAgency = this.txtLosslessTestingAgency.Text.Trim();
-                newReport.SupervisoryAndInspectionAgency = this.txtSupervisoryAndInspectionAgency.Text.Trim();
+                //newReport.SupervisoryAndInspectionAgency = this.txtSupervisoryAndInspectionAgency.Text.Trim();
                 newReport.ConstructionUnit = this.txtConstructionUnit.Text.Trim();
-                newReport.Remark = this.txtRemark.Text.Trim();
-                newReport.DesignLicenseCode = this.txtDesignLicenseCode.Text.Trim();
-                newReport.QualificationCertificateCode = this.txtQualificationCertificateCode.Text.Trim();
-                newReport.InstitutionalApprovalCertificate = this.txtInstitutionalApprovalCertificate.Text.Trim();
+                //newReport.Remark = this.txtRemark.Text.Trim();
+                //newReport.DesignLicenseCode = this.txtDesignLicenseCode.Text.Trim();
+                //newReport.QualificationCertificateCode = this.txtQualificationCertificateCode.Text.Trim();
+                //newReport.InstitutionalApprovalCertificate = this.txtInstitutionalApprovalCertificate.Text.Trim();
                 newReport.InstallationInspection = this.txtInstallationInspection.Text.Trim();
 
                 if (!string.IsNullOrEmpty(this.CertificateId))

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificateEdit.aspx.designer.cs

@@ -77,15 +77,6 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtCertificateCode;
 
-        /// <summary>
-        /// txtSpecialEquipmentProductionLicenseCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtSpecialEquipmentProductionLicenseCode;
-
         /// <summary>
         /// txtDeliveryUnit 控件。
         /// </summary>
@@ -123,49 +114,22 @@ namespace FineUIPro.Web.JGZL
         protected global::FineUIPro.DatePicker txtInstallEndDate;
 
         /// <summary>
-        /// txtPipelineLevel 控件。
+        /// drpPipelineLevel 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtPipelineLevel;
+        protected global::FineUIPro.DropDownList drpPipelineLevel;
 
         /// <summary>
-        /// txtPipelineLength 控件。
+        /// drpPipelineLength 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtPipelineLength;
-
-        /// <summary>
-        /// txtDesignLicenseCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDesignLicenseCode;
-
-        /// <summary>
-        /// txtQualificationCertificateCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtQualificationCertificateCode;
-
-        /// <summary>
-        /// txtInstitutionalApprovalCertificate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtInstitutionalApprovalCertificate;
+        protected global::FineUIPro.DropDownList drpPipelineLength;
 
         /// <summary>
         /// txtDesignUnit 控件。
@@ -176,15 +140,6 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtDesignUnit;
 
-        /// <summary>
-        /// txtSupervisoryAndInspectionAgency 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtSupervisoryAndInspectionAgency;
-
         /// <summary>
         /// txtLosslessTestingAgency 控件。
         /// </summary>
@@ -195,7 +150,7 @@ namespace FineUIPro.Web.JGZL
         protected global::FineUIPro.TextBox txtLosslessTestingAgency;
 
         /// <summary>
-        /// txtInstallationInspection  控件。
+        /// txtInstallationInspection 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
@@ -213,12 +168,12 @@ namespace FineUIPro.Web.JGZL
         protected global::FineUIPro.TextBox txtConstructionUnit;
 
         /// <summary>
-        /// txtRemark 控件。
+        /// txtSpecialEquipmentProductionLicenseCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
+        protected global::FineUIPro.TextBox txtSpecialEquipmentProductionLicenseCode;
     }
 }

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.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>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="220px" Title="压力管道安装汇总表" ShowBorder="true" Layout="VBox"
+                    EnableCollapse="true" Width="220px" Title="工业管道安装汇总表" ShowBorder="true" Layout="VBox"
                     ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
@@ -25,28 +25,28 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="压力管道安装汇总表" OnNodeCommand="tvControlItem_NodeCommand"
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装汇总表" OnNodeCommand="tvControlItem_NodeCommand"
                             runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
                             AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
                         </f:Tree>
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="压力管道安装汇总表"
-                    TitleToolTip="压力管道安装汇总表" AutoScroll="true">
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装汇总表"
+                    TitleToolTip="工业管道安装汇总表" AutoScroll="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>
-                                <f:Button ID="btnPrint" Text="压力管道安装汇总表打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                <f:Button ID="btnPrint" Text="工业管道安装汇总表打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="压力管道安装汇总表" EnableCollapse="true"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工业管道安装汇总表" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="SummaryId" AllowCellEditing="true"
                             EnableColumnLines="true" ClicksToEdit="1" DataIDField="SummaryId" AllowSorting="true"
                             SortField="CertificateCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
@@ -55,7 +55,7 @@
                             <Columns>
                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                     TextAlign="Center" />
-                                <f:RenderField HeaderText="证明书编号" ColumnID="CertificateCode" DataField="CertificateCode" SortField="CertificateCode"
+                                <f:RenderField HeaderText="质量证明书编号" ColumnID="CertificateCode" DataField="CertificateCode" SortField="CertificateCode"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="交工单元名称" ColumnID="DeliveryUnit" DataField="DeliveryUnit" SortField="DeliveryUnit"
@@ -157,11 +157,11 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="压力管道安装汇总表" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="工业管道安装汇总表" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="960px" Height="680px">
         </f:Window>
-        <f:Window ID="WindowPrint" Title="打印压力管道安装汇总表" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="WindowPrint" Title="打印工业管道安装汇总表" Hidden="true" EnableIFrame="true" EnableMaximize="false"
             Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
             Height="600px">
         </f:Window>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs

@@ -229,6 +229,9 @@ namespace FineUIPro.Web.JGZL
                 dt.Columns.Add("CleaningMethod");
                 dt.Columns.Add("CorrosionControlMethod");
                 dt.Columns.Add("InsulationMethod");
+                dt.Columns.Add("PipelineStartPoint");
+                dt.Columns.Add("PipelineEndPoint");
+                dt.Columns.Add("Remark");
 
                 DataRow[] rows = tb.DefaultView.ToTable().Select();
                 int i = 0;
@@ -259,6 +262,9 @@ namespace FineUIPro.Web.JGZL
                     newRow["CleaningMethod"] = row["CleaningMethod"].ToString();
                     newRow["CorrosionControlMethod"] = row["CorrosionControlMethod"].ToString();
                     newRow["InsulationMethod"] = row["InsulationMethod"].ToString();
+                    newRow["PipelineStartPoint"] = row["PipelineStartPoint"].ToString();
+                    newRow["PipelineEndPoint"] = row["PipelineEndPoint"].ToString();
+                    newRow["Remark"] = row["Remark"].ToString();
                     dt.Rows.Add(newRow);
                     i++;
                 }

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummaryEdit.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>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -26,7 +26,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList runat="server" ID="drpCertificateCode" Label="证明书编号" LabelWidth="170px" EmptyText="-请选择-" AutoPostBack="true" OnSelectedIndexChanged="drpCertificateCode_SelectedIndexChanged" ShowRedStar="true" AutoSelectFirstItem="false" EnableEdit="true"></f:DropDownList>
+                        <f:DropDownList runat="server" ID="drpCertificateCode" Label="质量证明书编号" LabelWidth="170px" EmptyText="-请选择-" AutoPostBack="true" OnSelectedIndexChanged="drpCertificateCode_SelectedIndexChanged" ShowRedStar="true" AutoSelectFirstItem="false" EnableEdit="true"></f:DropDownList>
                         <%--<f:TextBox ID="txtDrawingNumber" runat="server" Label="施工图号" LabelAlign="Right" LabelWidth="170px" MaxLength="20" Required="true" ShowRedStar="true"></f:TextBox>--%>
                     </Items>
                 </f:FormRow>
@@ -38,17 +38,17 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpPipelineCode" runat="server" Label="单线号" LabelAlign="Right" LabelWidth="170px" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpPipelineCode_SelectedIndexChanged"></f:DropDownList>
+                        <f:DropDownList ID="drpPipelineCode" runat="server" Label="管道编号" LabelAlign="Right" LabelWidth="170px" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpPipelineCode_SelectedIndexChanged"></f:DropDownList>
                         <%--<f:TextBox ID="txtPipelineCode" runat="server" Label="单线号" LabelAlign="Right" LabelWidth="170px" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>--%>
                         <f:TextBox ID="txtPipelineLevel" runat="server" Label="管道级别" LabelAlign="Right" LabelWidth="170px" MaxLength="50" ></f:TextBox>
                     </Items>
                 </f:FormRow>
-                <%--<f:FormRow>
+                <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtPipelineStartPoint" runat="server" Label="起点" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                         <f:TextBox ID="txtPipelineEndPoint" runat="server" Label="终点" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
-                </f:FormRow>--%>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtDesignPressure" runat="server" Label="设计压力（MPa）" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
@@ -57,50 +57,52 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtOperatingTemperature" runat="server" Label="操作温度(℃)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtMedium" runat="server" Label="输送介质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <%--<f:TextBox ID="txtOperatingTemperature" runat="server" Label="操作温度(℃)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>--%>
+                        <f:TextBox ID="txtMedium" runat="server" Label="介质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtMaterial" runat="server" Label="材质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtMaterial" runat="server" Label="管道材质牌号及标准" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtSpecifications" runat="server" Label="管道规格" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                    <Items>                        
+                        <f:TextBox ID="txtSpecifications" runat="server" Label="规格(mm)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                         <f:TextBox ID="txtLength" runat="server" Label="长度(m)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtLength" runat="server" Label="管道长度(m)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                    <Items>                       
                         <f:TextBox ID="txtLayingMethod" runat="server" Label="铺设方式" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                         <f:TextBox ID="txtWeldsNum" runat="server" Label="焊口数量" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>                       
+                        <f:TextBox ID="txtLosslessRatio" runat="server" Label="无损检测方法/比例(%)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtRemarks" runat="server" Label="耐压试验方法" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtWeldsNum" runat="server" Label="焊口数量" LabelAlign="Right" LabelWidth="170px" MaxLength="50" Readonly="true"></f:TextBox>
-                        <f:TextBox ID="txtLosslessRatio" runat="server" Label="检测方法/比例(%)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtVoltageResistantTestMedium" runat="server" Label="耐压试验介质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtVoltageResistantTestPressure" runat="server" Label="耐压试验压力(MPa)" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtVoltageResistantTestMedium" runat="server" Label="压力试验介质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtVoltageResistantTestPressure" runat="server" Label="压力试验压力（MPa）" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <%--<f:DatePicker ID="txtVoltageResistantTestDate" runat="server" Label="压力试验日期" LabelAlign="Right" LabelWidth="170px"></f:DatePicker>--%>
+                        <f:TextBox ID="txtLeakageTestMedium" runat="server" Label="泄漏试验介质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtLeakageTestPressure" runat="server" Label="泄露试验压力（MPa）" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
-                <f:FormRow>
+                <%--<f:FormRow>
                     <Items>
-                        <f:DatePicker ID="txtVoltageResistantTestDate" runat="server" Label="压力试验日期" LabelAlign="Right" LabelWidth="170px"></f:DatePicker>
-                        <f:TextBox ID="txtLeakageTestMedium" runat="server" Label="泄漏性试验介质" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtLeakageTestPressure" runat="server" Label="泄露性试验压力（MPa）" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        
                         <f:DatePicker ID="txtLeakageTestDate" runat="server" Label="泄露性试验日期" LabelAlign="Right" LabelWidth="170px"></f:DatePicker>
                     </Items>
-                </f:FormRow>
+                </f:FormRow>--%>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtCleaningMethod" runat="server" Label="吹洗方法" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
-                        <f:TextBox ID="txtCorrosionControlMethod" runat="server" Label="防腐方式" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtCleaningMethod" runat="server" Label="吹扫、清洗方法" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtCorrosionControlMethod" runat="server" Label="腐蚀控制方式" LabelAlign="Right" LabelWidth="170px" MaxLength="50"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
@@ -109,11 +111,11 @@
                         <f:Label ID="Label1" runat="server"></f:Label>
                     </Items>
                 </f:FormRow>
-                <f:FormRow>
+                <%--<f:FormRow>
                     <Items>
                         <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="170px" MaxLength="500"></f:TextArea>
                     </Items>
-                </f:FormRow>
+                </f:FormRow>--%>
             </Rows>
         </f:Form>
     </form>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummaryEdit.aspx.cs

@@ -106,11 +106,11 @@ namespace FineUIPro.Web.JGZL
                             this.drpPipelineCode.SelectedValue = report.PipelineCode;
                         }
                         this.txtPipelineLevel.Text = report.PipelineLevel;
-                        //this.txtPipelineStartPoint.Text = report.PipelineStartPoint;
-                        //this.txtPipelineEndPoint.Text = report.PipelineEndPoint;
+                        this.txtPipelineStartPoint.Text = report.PipelineStartPoint;
+                        this.txtPipelineEndPoint.Text = report.PipelineEndPoint;
                         this.txtDesignPressure.Text = report.DesignPressure;
                         this.txtDesignTemperature.Text = report.DesignTemperature;
-                        this.txtOperatingTemperature.Text = report.OperatingTemperature;
+                        //this.txtOperatingTemperature.Text = report.OperatingTemperature;
                         this.txtMedium.Text = report.Medium;
                         this.txtMaterial.Text = report.Material;
                         this.txtSpecifications.Text = report.Specifications;
@@ -121,14 +121,14 @@ namespace FineUIPro.Web.JGZL
                         //this.txtVoltageResistantTestMethod.Text = report.VoltageResistantTestMethod;
                         this.txtVoltageResistantTestMedium.Text = report.VoltageResistantTestMedium;
                         this.txtVoltageResistantTestPressure.Text = report.VoltageResistantTestPressure;
-                        this.txtVoltageResistantTestDate.Text = report.VoltageResistantTestDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.VoltageResistantTestDate) : "";
+                        //this.txtVoltageResistantTestDate.Text = report.VoltageResistantTestDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.VoltageResistantTestDate) : "";
                         this.txtLeakageTestMedium.Text = report.LeakageTestMedium;
                         this.txtLeakageTestPressure.Text = report.LeakageTestPressure;
-                        this.txtLeakageTestDate.Text = report.LeakageTestDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.LeakageTestDate) : "";
+                        //this.txtLeakageTestDate.Text = report.LeakageTestDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.LeakageTestDate) : "";
                         this.txtCleaningMethod.Text = report.CleaningMethod;
                         this.txtCorrosionControlMethod.Text = report.CorrosionControlMethod;
                         this.txtInsulationMethod.Text = report.InsulationMethod;
-                        this.txtRemark.Text = report.Remark;
+                        this.txtRemarks.Text = report.Remark;
                     }
                 }
             }
@@ -183,11 +183,11 @@ namespace FineUIPro.Web.JGZL
                 newReport.CertificateId = this.drpCertificateCode.SelectedValue;
                 newReport.PipelineCode = this.drpPipelineCode.SelectedValue;
                 newReport.PipelineLevel = this.txtPipelineLevel.Text.Trim();
-                //newReport.PipelineStartPoint = this.txtPipelineStartPoint.Text.Trim();
-                //newReport.PipelineEndPoint = this.txtPipelineEndPoint.Text.Trim();
+                newReport.PipelineStartPoint = this.txtPipelineStartPoint.Text.Trim();
+                newReport.PipelineEndPoint = this.txtPipelineEndPoint.Text.Trim();
                 newReport.DesignPressure = this.txtDesignPressure.Text.Trim();
                 newReport.DesignTemperature = this.txtDesignTemperature.Text.Trim();
-                newReport.OperatingTemperature = this.txtOperatingTemperature.Text.Trim();
+                //newReport.OperatingTemperature = this.txtOperatingTemperature.Text.Trim();
                 newReport.Medium = this.txtMedium.Text.Trim();
                 newReport.Material = this.txtMaterial.Text.Trim();
                 newReport.Specifications = this.txtSpecifications.Text.Trim();
@@ -198,14 +198,14 @@ namespace FineUIPro.Web.JGZL
                 //newReport.VoltageResistantTestMethod = this.txtVoltageResistantTestMethod.Text.Trim();
                 newReport.VoltageResistantTestMedium = this.txtVoltageResistantTestMedium.Text.Trim();
                 newReport.VoltageResistantTestPressure = this.txtVoltageResistantTestPressure.Text.Trim();
-                newReport.VoltageResistantTestDate = Funs.GetNewDateTime(this.txtVoltageResistantTestDate.Text);
+                //newReport.VoltageResistantTestDate = Funs.GetNewDateTime(this.txtVoltageResistantTestDate.Text);
                 newReport.LeakageTestMedium = this.txtLeakageTestMedium.Text.Trim();
                 newReport.LeakageTestPressure = this.txtLeakageTestPressure.Text.Trim();
-                newReport.LeakageTestDate = Funs.GetNewDateTime(this.txtLeakageTestDate.Text);
+                //newReport.LeakageTestDate = Funs.GetNewDateTime(this.txtLeakageTestDate.Text);
                 newReport.CleaningMethod = this.txtCleaningMethod.Text.Trim();
                 newReport.CorrosionControlMethod = this.txtCorrosionControlMethod.Text.Trim();
                 newReport.InsulationMethod = this.txtInsulationMethod.Text.Trim();
-                newReport.Remark = this.txtRemark.Text.Trim();
+                newReport.Remark = this.txtRemarks.Text.Trim();
 
                 if (!string.IsNullOrEmpty(this.SummaryId))
                 {

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummaryEdit.aspx.designer.cs

@@ -113,6 +113,24 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineLevel;
 
+        /// <summary>
+        /// txtPipelineStartPoint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineStartPoint;
+
+        /// <summary>
+        /// txtPipelineEndPoint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineEndPoint;
+
         /// <summary>
         /// txtDesignPressure 控件。
         /// </summary>
@@ -131,15 +149,6 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtDesignTemperature;
 
-        /// <summary>
-        /// txtOperatingTemperature 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtOperatingTemperature;
-
         /// <summary>
         /// txtMedium 控件。
         /// </summary>
@@ -203,6 +212,15 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtLosslessRatio;
 
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemarks;
+
         /// <summary>
         /// txtVoltageResistantTestMedium 控件。
         /// </summary>
@@ -221,15 +239,6 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtVoltageResistantTestPressure;
 
-        /// <summary>
-        /// txtVoltageResistantTestDate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtVoltageResistantTestDate;
-
         /// <summary>
         /// txtLeakageTestMedium 控件。
         /// </summary>
@@ -248,15 +257,6 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.TextBox txtLeakageTestPressure;
 
-        /// <summary>
-        /// txtLeakageTestDate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtLeakageTestDate;
-
         /// <summary>
         /// txtCleaningMethod 控件。
         /// </summary>
@@ -292,14 +292,5 @@ namespace FineUIPro.Web.JGZL
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtRemark 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
     }
 }

HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs

@@ -30,13 +30,29 @@ namespace FineUIPro.Web.JGZL
                 this.drpProjectId.DataValueField = "ProjectId";
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
-                Funs.FineUIPleaseSelect(this.drpProjectId);  
-                Funs.FineUIPleaseSelect(this.drpUsingUnitTeam);
-                Funs.FineUIPleaseSelect(this.drpInstallationArea);
+                Funs.FineUIPleaseSelect(this.drpProjectId);
 
                 this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
                 this.InitTreeMenu();//加载树
                 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+
+
+                this.drpUsingUnitTeam.DataTextField = "UsingUnitTeam";
+                this.drpUsingUnitTeam.DataValueField = "UsingUnitTeam";
+                this.drpUsingUnitTeam.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection
+                                                    where x.ProjectId == this.drpProjectId.SelectedValue
+                                                    select x.UsingUnitTeam).Distinct().ToList();
+                this.drpUsingUnitTeam.DataBind();
+                Funs.FineUIPleaseSelect(this.drpUsingUnitTeam);
+
+                this.drpInstallationArea.DataTextField = "InstallationArea";
+                this.drpInstallationArea.DataValueField = "InstallationArea";
+                this.drpInstallationArea.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection
+                                                       where x.ProjectId == this.drpProjectId.SelectedValue
+                                                       select x.InstallationArea).Distinct().ToList();
+                this.drpInstallationArea.DataBind();
+                Funs.FineUIPleaseSelect(this.drpInstallationArea);
+
                 this.BindGrid();
             }
         }
@@ -96,8 +112,8 @@ namespace FineUIPro.Web.JGZL
                 this.drpUsingUnitTeam.SelectedIndex = 0;
 
                 this.drpInstallationArea.Items.Clear();
-                this.drpInstallationArea.DataTextField = "";
-                this.drpInstallationArea.DataValueField = "";
+                this.drpInstallationArea.DataTextField = "InstallationArea";
+                this.drpInstallationArea.DataValueField = "InstallationArea";
                 this.drpInstallationArea.DataSource= (from x in Funs.DB.JGZL_TeamWeldingInspection
                                                       where x.ProjectId == this.tvControlItem.SelectedNodeID
                                                       select x.InstallationArea).Distinct().ToList();
@@ -529,6 +545,24 @@ namespace FineUIPro.Web.JGZL
         {
             this.InitTreeMenu();//加载树
             this.BindGrid();
+            this.drpUsingUnitTeam.Items.Clear();
+            this.drpUsingUnitTeam.DataTextField = "UsingUnitTeam";
+            this.drpUsingUnitTeam.DataValueField = "UsingUnitTeam";
+            this.drpUsingUnitTeam.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection
+                                                where x.ProjectId == this.tvControlItem.SelectedNodeID
+                                                select x.UsingUnitTeam).Distinct().ToList();
+            this.drpUsingUnitTeam.DataBind();
+            Funs.FineUIPleaseSelect(this.drpUsingUnitTeam);
+            this.drpUsingUnitTeam.SelectedIndex = 0;
+
+            this.drpInstallationArea.Items.Clear();
+            this.drpInstallationArea.DataTextField = "InstallationArea";
+            this.drpInstallationArea.DataValueField = "InstallationArea";
+            this.drpInstallationArea.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection
+                                                   where x.ProjectId == this.tvControlItem.SelectedNodeID
+                                                   select x.InstallationArea).Distinct().ToList();
+            this.drpInstallationArea.DataBind();
+            Funs.FineUIPleaseSelect(this.drpInstallationArea);
         }
         #endregion