20260212 支管连接焊接接头、角焊接头组对焊接检查记录

HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs

@@ -1339,5 +1339,19 @@ namespace BLL
         {
             return (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == iso_id select x).Count();
         }
+
+        /// <summary>
+        /// 根据项目Id获取支管连接焊缝和角焊缝
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.HJGL_PW_JointInfo> GetJointInfoByProjectId(string projectId)
+        {
+            return (from x in Funs.DB.HJGL_PW_JointInfo
+                    join y in Funs.DB.HJGL_BS_JointType on x.JOTY_ID equals y.JOTY_ID
+                    where x.ProjectId == projectId
+                    && (y.JOTY_Name.Contains("支管连接焊缝") || y.JOTY_Name.Contains("角焊缝"))
+                    select x).ToList();
+        }
     }
 }

HJGL_DS/BLL/JGZL/TeamWeldingInspectionItemService.cs

@@ -32,6 +32,17 @@ namespace BLL
             return (from x in Funs.DB.JGZL_TeamWeldingInspectionItem where x.TeamWeldingInspectionId == teamWeldingInspectionId select x).ToList();
         }
 
+        /// <summary>
+        /// 根据管线号、焊口号获取支管连接焊接接头、角焊接头组对焊接检查记录
+        /// </summary>
+        /// <param name="isoNo"></param>
+        /// <param name="jotNo"></param>
+        /// <returns></returns>
+        public static Model.JGZL_TeamWeldingInspectionItem GetTeamWeldingInspectionItemByIsoNoAndJointNo(string isoNo,string jotNo)
+        {
+            return Funs.DB.JGZL_TeamWeldingInspectionItem.FirstOrDefault(e => e.PipelineNo == isoNo && e.WeldingJointNo == jotNo);
+        }
+
         /// <summary>
         /// 添加
         /// </summary>

HJGL_DS/BLL/JGZL/TeamWeldingInspectionService.cs

@@ -23,6 +23,16 @@ namespace BLL
             return Funs.DB.JGZL_TeamWeldingInspection.FirstOrDefault(e => e.TeamWeldingInspectionId == teamWeldingInspectionId);
         }
 
+        /// <summary>
+        /// 根据项目Id获取支管连接焊接接头、角焊接头组对焊接检查记录主表
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static Model.JGZL_TeamWeldingInspection GetTeamWeldingInspectionByProjectId(string projectId)
+        {
+            return Funs.DB.JGZL_TeamWeldingInspection.FirstOrDefault(e => e.ProjectId == projectId);
+        }
+
         /// <summary>
         /// 添加
         /// </summary>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/07/2026 11:35:17" ReportInfo.Modified="02/12/2026 14:44:01" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/07/2026 11:35:17" ReportInfo.Modified="02/12/2026 22:25:06" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFAfFMxSj3AeiHAz03GrK9Aw==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFx3bd3T6Sb/EHw7Al2HDS3Q==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="CheckDate" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口检测委托单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 14:22:21" ReportInfo.Modified="02/04/2026 14:43:03" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 14:22:21" ReportInfo.Modified="02/12/2026 22:20:45" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFSNC6k3/Jky1tLKNl3mNErg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFsoKsInwAGXf7JXNSZ89jqA==">
       <TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData">
         <Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="CheckUnit" DataType="System.String" PropName="image_series"/>
@@ -68,27 +68,27 @@ namespace FastReport
       </TableDataSource>
     </MsSqlDataConnection>
   </Dictionary>
-  <ReportPage Name="Page1" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,623.7,135.25,1.65,47.9,431.45,66.8,57.35,76.25,19.55,525.95,29,25.22,42.23,85.7,552.47,211.5,278.3,527.25,87.35,335.65,411.9,498.25,581.47,623.72,89.78,283.51,354.39,193.73">
-    <PageHeaderBand Name="PageHeader1" Width="623.7" Height="274.9" Guides="0,274.9,113.1,24.8,77.95,9.45,28.35,53.15,35.15,147.35,34.25,181.6,215.85,250.1">
-      <TableObject Name="Table1" Width="623.7" Height="274.9">
-        <TableColumn Name="Column1" Width="85.7"/>
-        <TableColumn Name="Column2" Width="1.65"/>
-        <TableColumn Name="Column3" Width="47.9"/>
-        <TableColumn Name="Column4" Width="76.25"/>
-        <TableColumn Name="Column5" Width="66.8"/>
-        <TableColumn Name="Column6" Width="57.35"/>
-        <TableColumn Name="Column7" Width="76.25"/>
-        <TableColumn Name="Column8" Width="19.55"/>
-        <TableColumn Name="Column9" Width="66.8"/>
-        <TableColumn Name="Column10" Width="29"/>
-        <TableColumn Name="Column13" Width="25.22"/>
-        <TableColumn Name="Column11" Width="29"/>
-        <TableColumn Name="Column12" Width="42.23"/>
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16" Guides="0,646.36,140.26,1.24,50.61,431.11,69.51,60.06,78.96,22.26,525.61,31.71,27.93,41.16,44.94,88.41,560.26,200.32,269.83,532.33,89.65,329.89,408.85,500.62,601.42,646.39,95.45,294.85,371.4,199.4">
+    <PageHeaderBand Name="PageHeader1" Width="646.38" Height="284.35" Guides="0,284.35,113.1,24.8,77.95,9.45,28.35,53.15,35.15,156.8,43.7,191.05,34.25,225.3,259.55">
+      <TableObject Name="Table1" Width="646.36" Height="284.35">
+        <TableColumn Name="Column1" Width="88.41"/>
+        <TableColumn Name="Column2" Width="1.24"/>
+        <TableColumn Name="Column3" Width="50.61"/>
+        <TableColumn Name="Column4" Width="60.06"/>
+        <TableColumn Name="Column5" Width="69.51"/>
+        <TableColumn Name="Column6" Width="60.06"/>
+        <TableColumn Name="Column7" Width="78.96"/>
+        <TableColumn Name="Column8" Width="22.26"/>
+        <TableColumn Name="Column9" Width="69.51"/>
+        <TableColumn Name="Column10" Width="31.71"/>
+        <TableColumn Name="Column13" Width="27.93"/>
+        <TableColumn Name="Column11" Width="41.16"/>
+        <TableColumn Name="Column12" Width="44.94"/>
         <TableRow Name="Row1" Height="24.8">
-          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3543—G414" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3" RowSpan="3"/>
+          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3543—G414" HorzAlign="Center" VertAlign="Center" Font="黑体, 10.5pt" ColSpan="3" RowSpan="3"/>
           <TableCell Name="Cell2" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell3" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell4" Border.Lines="All" Text="管道焊口检测委托单" HorzAlign="Center" VertAlign="Center" Font="华文中宋, 16pt, style=Bold" ColSpan="5" RowSpan="3"/>
+          <TableCell Name="Cell4" Border.Lines="All" Text="管道焊口检测委托单" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold" ColSpan="5" RowSpan="3"/>
           <TableCell Name="Cell5" Border.Lines="All" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell26" Border.Lines="All" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell27" Border.Lines="All" Font="宋体, 10.5pt"/>
@@ -131,7 +131,7 @@ namespace FastReport
           <TableCell Name="Cell45" Border.Lines="Right, Bottom" Text="管道安装" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
           <TableCell Name="Cell46" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
-        <TableRow Name="Row4" Height="34.25">
+        <TableRow Name="Row4" Height="43.7">
           <TableCell Name="Cell16" Border.Lines="All" Text="检测单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell17" Border.Lines="All" Text="[MainData.CheckUnit]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell18" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@@ -208,21 +208,21 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="278.9" Width="623.7" Height="34.25" Guides="0,34.25">
-      <TableObject Name="Table2" Width="623.7" Height="34.25" ManualBuildEvent="Table2_ManualBuild">
-        <TableColumn Name="Column14" Width="85.7"/>
-        <TableColumn Name="Column15" Width="1.65"/>
-        <TableColumn Name="Column16" Width="47.9"/>
-        <TableColumn Name="Column17" Width="76.25"/>
-        <TableColumn Name="Column18" Width="66.8"/>
-        <TableColumn Name="Column19" Width="57.35"/>
-        <TableColumn Name="Column20" Width="76.25"/>
-        <TableColumn Name="Column21" Width="19.55"/>
-        <TableColumn Name="Column22" Width="66.8"/>
-        <TableColumn Name="Column23" Width="29"/>
-        <TableColumn Name="Column24" Width="25.22"/>
-        <TableColumn Name="Column25" Width="29"/>
-        <TableColumn Name="Column26" Width="42.23"/>
+    <DataBand Name="Data1" Top="288.35" Width="646.38" Height="34.25" Guides="0,34.25">
+      <TableObject Name="Table2" Width="646.36" Height="34.25" ManualBuildEvent="Table2_ManualBuild">
+        <TableColumn Name="Column14" Width="88.41"/>
+        <TableColumn Name="Column15" Width="1.24"/>
+        <TableColumn Name="Column16" Width="50.61"/>
+        <TableColumn Name="Column17" Width="60.06"/>
+        <TableColumn Name="Column18" Width="69.51"/>
+        <TableColumn Name="Column19" Width="60.06"/>
+        <TableColumn Name="Column20" Width="78.96"/>
+        <TableColumn Name="Column21" Width="22.26"/>
+        <TableColumn Name="Column22" Width="69.51"/>
+        <TableColumn Name="Column23" Width="31.71"/>
+        <TableColumn Name="Column24" Width="27.93"/>
+        <TableColumn Name="Column25" Width="41.16"/>
+        <TableColumn Name="Column26" Width="44.94"/>
         <TableRow Name="Row9" Height="34.25">
           <TableCell Name="Cell196" Border.Lines="All" Text="[Data.BatchCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
           <TableCell Name="Cell197" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
@@ -240,22 +240,22 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </DataBand>
-    <ColumnFooterBand Name="ColumnFooter1" Top="355.4" Width="623.7">
-      <ChildBand Name="Child1" Top="317.15" Width="623.7" Height="34.25" Guides="0,34.25" FillUnusedSpace="true">
-        <TableObject Name="Table3" Width="623.7" Height="34.25">
-          <TableColumn Name="Column27" Width="85.7"/>
-          <TableColumn Name="Column28" Width="1.65"/>
-          <TableColumn Name="Column29" Width="47.9"/>
-          <TableColumn Name="Column30" Width="76.25"/>
-          <TableColumn Name="Column31" Width="66.8"/>
-          <TableColumn Name="Column32" Width="57.35"/>
-          <TableColumn Name="Column33" Width="76.25"/>
-          <TableColumn Name="Column34" Width="19.55"/>
-          <TableColumn Name="Column35" Width="66.8"/>
-          <TableColumn Name="Column36" Width="29"/>
-          <TableColumn Name="Column37" Width="25.22"/>
-          <TableColumn Name="Column38" Width="29"/>
-          <TableColumn Name="Column39" Width="42.23"/>
+    <ColumnFooterBand Name="ColumnFooter1" Top="364.85" Width="646.38">
+      <ChildBand Name="Child1" Top="326.6" Width="646.38" Height="34.25" Guides="0,34.25" FillUnusedSpace="true">
+        <TableObject Name="Table3" Width="646.36" Height="34.25">
+          <TableColumn Name="Column27" Width="88.41"/>
+          <TableColumn Name="Column28" Width="1.24"/>
+          <TableColumn Name="Column29" Width="50.61"/>
+          <TableColumn Name="Column30" Width="60.06"/>
+          <TableColumn Name="Column31" Width="69.51"/>
+          <TableColumn Name="Column32" Width="60.06"/>
+          <TableColumn Name="Column33" Width="78.96"/>
+          <TableColumn Name="Column34" Width="22.26"/>
+          <TableColumn Name="Column35" Width="69.51"/>
+          <TableColumn Name="Column36" Width="31.71"/>
+          <TableColumn Name="Column37" Width="27.93"/>
+          <TableColumn Name="Column38" Width="41.16"/>
+          <TableColumn Name="Column39" Width="44.94"/>
           <TableRow Name="Row10" Height="34.25">
             <TableCell Name="Cell209" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
             <TableCell Name="Cell210" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@@ -274,21 +274,21 @@ namespace FastReport
         </TableObject>
       </ChildBand>
     </ColumnFooterBand>
-    <PageFooterBand Name="PageFooter1" Top="359.4" Width="623.7" Height="75.61" Guides="0,75.61,42.53,33.08">
-      <TableObject Name="Table4" Width="623.72" Height="75.61" Border.Lines="Left, Bottom">
-        <TableColumn Name="Column40" Width="89.78"/>
-        <TableColumn Name="Column41" Width="193.73"/>
-        <TableColumn Name="Column42" Width="70.88"/>
-        <TableColumn Name="Column43" Width="269.33"/>
+    <PageFooterBand Name="PageFooter1" Top="368.85" Width="646.38" Height="75.61" Guides="0,75.61,42.53,33.08">
+      <TableObject Name="Table4" Width="646.39" Height="75.61" Border.Lines="Left, Bottom">
+        <TableColumn Name="Column40" Width="95.45"/>
+        <TableColumn Name="Column41" Width="199.4"/>
+        <TableColumn Name="Column42" Width="76.55"/>
+        <TableColumn Name="Column43" Width="274.99"/>
         <TableRow Name="Row11" Height="42.53">
-          <TableCell Name="Cell222" Border.Lines="Left, Top, Bottom" Text="委托单位：" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
-          <TableCell Name="Cell223" Border.Lines="Right, Top, Bottom" Text="浙江鼎盛石化工程有限公司" VertAlign="Center" Font="楷体, 10.5pt" RowSpan="2"/>
-          <TableCell Name="Cell224" Border.Lines="Left, Top" Text="委托人：" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell225" Border.Lines="Right, Top" Text="[MainData.TrustManName]" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell222" Border.Lines="Left" Text="委托单位：" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell223" Border.Lines="Right" Text="浙江鼎盛石化工程有限公司" VertAlign="Center" Font="楷体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell224" Border.Lines="Left" Text="委托人：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell225" Border.Lines="Right" Text="[MainData.TrustManName]" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row12" Height="33.08">
-          <TableCell Name="Cell227" Border.Lines="All"/>
-          <TableCell Name="Cell228" Border.Lines="All"/>
+          <TableCell Name="Cell227" Border.Lines="Left, Right"/>
+          <TableCell Name="Cell228" Border.Lines="Left, Right"/>
           <TableCell Name="Cell229" Border.Lines="Left, Bottom" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell230" Border.Lines="Right, Bottom" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>

HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx

@@ -37,9 +37,11 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
+                                <f:TextBox ID="txtIsoNoS" runat="server" Label="管道编号" EmptyText="输入查询条件" LabelAlign="Right" AutoPostBack="true" OnTextChanged="txtIsoNoS_TextChanged"></f:TextBox>
                                 <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="btnSave" Text="保存" ToolTip="保存" Icon="SystemSave" runat="server" OnClick="btnSave_Click"></f:Button>
                                 <f:Button ID="btnPrint" Text="支管连接焊接接头、角焊接头组对焊接检查记录打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                             </Items>
@@ -49,15 +51,15 @@
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="支管连接焊接接头、角焊接头组对焊接检查记录" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="TeamWeldingInspectionItemId" AllowCellEditing="true"
                             EnableColumnLines="true" ClicksToEdit="1" DataIDField="TeamWeldingInspectionItemId" AllowSorting="true"
-                            SortField="CheckDate,ISO_IsoNo,JOT_JointNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
-                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                            EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            SortField="CheckDate,PipelineNo,WeldingJointNo" SortDirection="ASC"  OnPreDataBound="Grid1_PreDataBound"
+                            EnableTextSelection="True" AutoScroll="true">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
                                     <Items>
-                                        <f:DropDownList ID="drpUsingUnitTeam" runat="server" Label="使用单位/班组" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpUsingUnitTeam_SelectedIndexChanged"></f:DropDownList>
-                                        <f:DropDownList ID="drpInstallationArea" runat="server" Label="装置名称/施工区域" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="drpUsingUnitTeam_SelectedIndexChanged"></f:DropDownList>
-                                        <f:DatePicker ID="txtCheckDate" runat="server" Label="检查时间" LabelAlign="Right" Width="220px" AutoPostBack="true" OnTextChanged="drpUsingUnitTeam_SelectedIndexChanged"></f:DatePicker>
+                                        <f:TextBox ID="txtUsingUnitTeam" runat="server" Label="使用单位/班组" LabelAlign="Right"></f:TextBox>
+                                        <f:TextBox ID="txtInstallationArea" runat="server" Label="装置名称施工区域" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
+                                        <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" LabelAlign="Right"></f:TextBox>
+                                        <f:TextBox ID="txtProjectCode" runat="server" Label="施工号" LabelAlign="Right"></f:TextBox>
                                         <f:ToolbarFill ID="ToolbarFill2" runat="server">
                                         </f:ToolbarFill>
                                     </Items>
@@ -66,26 +68,125 @@
                             <Columns>
                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                     TextAlign="Center" />
-                                <f:RenderField HeaderText="使用单位/班组" ColumnID="UsingUnitTeam" DataField="UsingUnitTeam" SortField="UsingUnitTeam"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px" ExpandUnusedSpace="true">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="装置名称/施工区域" ColumnID="InstallationArea" DataField="InstallationArea" SortField="InstallationArea"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px" ExpandUnusedSpace="true">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="管道编号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px" ExpandUnusedSpace="true">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="焊口编号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" SortField="JOT_JointNo"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px" ExpandUnusedSpace="true">
-                                </f:RenderField>
                                 <f:RenderField HeaderText="检查时间" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:DatePicker ID="txtCheckDate" runat="server"></f:DatePicker>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="材质" ColumnID="Material" DataField="Material" SortField="Material"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                    <Editor>
+                                        <f:TextBox ID="txtMaterial" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="管道编号" ColumnID="PipelineNo" DataField="PipelineNo" SortField="PipelineNo"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                                    <Editor>
+                                        <f:TextBox ID="txtPipelineNo" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="焊口编号" ColumnID="WeldingJointNo" DataField="WeldingJointNo" SortField="WeldingJointNo"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                    <Editor>
+                                        <f:TextBox ID="txtWeldingJointNo" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="安装形式" ColumnID="InstallationMethod" DataField="InstallationMethod" SortField="InstallationMethod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                    <Editor>
+                                        <f:DropDownList ID="drpInstallationMethod" runat="server">
+                                            <f:ListItem Value="安放式" Text="安放式"/>
+                                            <f:ListItem Value="插入式" Text="插入式" />
+                                        </f:DropDownList>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="所用焊丝牌号" ColumnID="WeldingWire" DataField="WeldingWire" SortField="WeldingWire"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtWeldingWire" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="所用焊条牌号" ColumnID="WeldingRod" DataField="WeldingRod" SortField="WeldingRod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtWeldingRod" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="组队间隙mm" ColumnID="TeamGap" DataField="TeamGap" SortField="TeamGap"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                    <Editor>
+                                        <f:TextBox ID="txtTeamGap" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:GroupField HeaderText="组队确认" HeaderTextAlign="Center" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="管工" ColumnID="TeamPlumber" DataField="TeamPlumber" SortField="TeamPlumber"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtTeamPlumber" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="焊工" ColumnID="TeamWelder" DataField="TeamWelder" SortField="TeamWelder"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtTeamWelder" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="质检员" ColumnID="TeamInspector" DataField="TeamInspector" SortField="TeamInspector"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtTeamInspector" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="GTAW" HeaderTextAlign="Center" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="焊工" ColumnID="GTAWWelder" DataField="GTAWWelder" SortField="GTAWWelder"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtGTAWWelder" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="质检员" ColumnID="GTAWInspector" DataField="GTAWInspector" SortField="GTAWInspector"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtGTAWInspector" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="SMAW" HeaderTextAlign="Center" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="焊工" ColumnID="SMAWWelder" DataField="SMAWWelder" SortField="SMAWWelder"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtSMAWWelder" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="焊缝VT" HeaderTextAlign="Center" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="质检员" ColumnID="VTInspector" DataField="VTInspector" SortField="VTInspector"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                            <Editor>
+                                                <f:TextBox ID="txtVTInspector" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:LinkButtonField ColumnID="Delete3" Width="60px" EnablePostBack="false" Icon="Delete"
+                                    HeaderTextAlign="Center" HeaderText="删除" />
+                                <f:RenderField HeaderText="主键" ColumnID="TeamWeldingInspectionItemId" DataField="TeamWeldingInspectionItemId" SortField="TeamWeldingInspectionItemId"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px" Hidden="true">
                                 </f:RenderField>
                             </Columns>
-                            <Listeners>
+                            <%--<Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                            </Listeners>
-                            <PageItems>
+                            </Listeners>--%>
+                            <%--<PageItems>
                                 <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                                 </f:ToolbarSeparator>
                                 <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
@@ -97,36 +198,36 @@
                                     <f:ListItem Text="20" Value="20" />
                                     <f:ListItem Text="25" Value="25" />
                                 </f:DropDownList>
-                            </PageItems>
+                            </PageItems>--%>
                         </f:Grid>
                     </Items>
                 </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="1100px" Height="620px">
-        </f:Window>
+        </f:Window>--%>
         <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>
-        <f:Menu ID="Menu1" runat="server">
+        <%--<f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
                 runat="server" Text="编辑" Icon="TableEdit">
             </f:MenuButton>
             <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
                 ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
             </f:MenuButton>
-        </f:Menu>
+        </f:Menu>--%>
     </form>
-    <script type="text/javascript">
+    <%--<script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
         // 返回false，来阻止浏览器右键菜单
         function onRowContextMenu(event, rowId) {
             F(menuID).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
-    </script>
+    </script>--%>
 </body>
 </html>

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

@@ -95,6 +95,15 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
 
+        /// <summary>
+        /// txtIsoNoS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsoNoS;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.JGZL
         /// </remarks>
         protected global::FineUIPro.Button btnAdd;
 
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -141,31 +159,40 @@ namespace FineUIPro.Web.JGZL
         protected global::FineUIPro.Toolbar Toolbar3;
 
         /// <summary>
-        /// drpUsingUnitTeam 控件。
+        /// txtUsingUnitTeam 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUsingUnitTeam;
+        protected global::FineUIPro.TextBox txtUsingUnitTeam;
 
         /// <summary>
-        /// drpInstallationArea 控件。
+        /// txtInstallationArea 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpInstallationArea;
+        protected global::FineUIPro.TextBox txtInstallationArea;
 
         /// <summary>
-        /// txtCheckDate 控件。
+        /// txtProjectName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtCheckDate;
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// txtProjectCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectCode;
 
         /// <summary>
         /// ToolbarFill2 控件。
@@ -177,40 +204,139 @@ namespace FineUIPro.Web.JGZL
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
 
         /// <summary>
-        /// ToolbarSeparator1 控件。
+        /// txtCheckDate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        protected global::FineUIPro.DatePicker txtCheckDate;
 
         /// <summary>
-        /// ToolbarText1 控件。
+        /// txtMaterial 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ToolbarText ToolbarText1;
+        protected global::FineUIPro.TextBox txtMaterial;
 
         /// <summary>
-        /// ddlPageSize 控件。
+        /// txtPipelineNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPageSize;
+        protected global::FineUIPro.TextBox txtPipelineNo;
 
         /// <summary>
-        /// Window1 控件。
+        /// txtWeldingJointNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Window Window1;
+        protected global::FineUIPro.TextBox txtWeldingJointNo;
+
+        /// <summary>
+        /// drpInstallationMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpInstallationMethod;
+
+        /// <summary>
+        /// txtWeldingWire 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldingWire;
+
+        /// <summary>
+        /// txtWeldingRod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldingRod;
+
+        /// <summary>
+        /// txtTeamGap 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTeamGap;
+
+        /// <summary>
+        /// txtTeamPlumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTeamPlumber;
+
+        /// <summary>
+        /// txtTeamWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTeamWelder;
+
+        /// <summary>
+        /// txtTeamInspector 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTeamInspector;
+
+        /// <summary>
+        /// txtGTAWWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtGTAWWelder;
+
+        /// <summary>
+        /// txtGTAWInspector 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtGTAWInspector;
+
+        /// <summary>
+        /// txtSMAWWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSMAWWelder;
+
+        /// <summary>
+        /// txtVTInspector 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtVTInspector;
 
         /// <summary>
         /// WindowPrint 控件。
@@ -220,32 +346,5 @@ namespace FineUIPro.Web.JGZL
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowPrint;
-
-        /// <summary>
-        /// Menu1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Menu Menu1;
-
-        /// <summary>
-        /// btnMenuEdit 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuEdit;
-
-        /// <summary>
-        /// btnMenuDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDelete;
     }
 }