From 4cd7676169609b5a2faaf713b4e21cba31621178 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 12 Feb 2026 15:17:33 +0800
Subject: [PATCH] =?UTF-8?q?20260212=20=E7=AE=A1=E9=81=93=E7=84=8A=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=A4=B4=E6=8A=A5=E9=AA=8C=E6=A3=80=E6=9F=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JGZL/管道焊接接头报检检查记录.frx         |  4 +-
 .../JGZL/WeldInspectionCheckRecord.aspx       | 50 +------------------
 .../JGZL/WeldInspectionCheckRecord.aspx.cs    | 34 +++++++++++--
 ...WeldInspectionCheckRecord.aspx.designer.cs |  4 +-
 4 files changed, 36 insertions(+), 56 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx
index a1f826d..3035ca6 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx
+++ b/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/23/2024 15:00:41" ReportInfo.Modified="02/12/2026 14:43:10" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="02/12/2026 15:06:29" 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+/QFfeyydwAeYSmkiYJ4XHSYyQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF8iFggyztUVKXud013G7YoQ==">
       <TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
index d76101e..e8c9abe 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
@@ -44,7 +44,8 @@
                                     <f:ListItem Value="2" Text="角焊缝" />
                                     <f:ListItem Value="3" Text="支管连接焊缝" />
                                 </f:DropDownList>
-                                <f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="drpIsoId_SelectedIndexChanged" Width="220px"></f:DatePicker>
+                                <f:DropDownList ID="drpWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpWeldingDate_SelectedIndexChanged"></f:DropDownList>
+                                <%--<f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="drpIsoId_SelectedIndexChanged" Width="220px"></f:DatePicker>--%>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnPrint" Text="管道焊接接头报检/检查记录打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
@@ -53,53 +54,6 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <%--<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
-                            DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
-                            SortDirection="ASC">
-                            <Columns>
-                                <f:TemplateField HeaderText="序号" HeaderTextAlign="Center" Width="60px">
-                                    <ItemTemplate>
-                                        <asp:Label ID="labNumber" runat="server" Text=' <%# Container.DataItemIndex + 1%>'></asp:Label>
-                                        <asp:HiddenField runat="server" ID="hidProjectId" Value='<%#Eval("ProjectId") %>'></asp:HiddenField>
-                                        <asp:HiddenField runat="server" ID="hidNDTR_ID" Value='<%#Eval("NDTR_ID") %>'></asp:HiddenField>
-                                        <asp:HiddenField runat="server" ID="hidJOTY_Group" Value='<%#Eval("JOTY_Group") %>'></asp:HiddenField>
-                                        <asp:HiddenField runat="server" ID="hidJOT_WeldDate" Value='<%#Eval("JOT_WeldDate") %>'></asp:HiddenField>
-                                        <asp:HiddenField runat="server" ID="hidProjectName" Value='<%#Eval("ProjectName") %>'></asp:HiddenField>
-                                        <asp:HiddenField runat="server" ID="hidISO_ID" Value='<%#Eval("ISO_ID") %>'></asp:HiddenField>
-                                    </ItemTemplate>
-                                </f:TemplateField>
-                                <f:RenderField HeaderText="管线号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="320px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="批号" ColumnID="BatchCode" DataField="BatchCode" SortField="BatchCode"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="焊接日期" ColumnID="JOT_WeldDate" DataField="JOT_WeldDate"
-                                    SortField="JOT_WeldDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="150px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" SortField="NDTR_Name"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
-                                </f:RenderField>
-                                <f:RenderField HeaderText="焊缝类型" ColumnID="JointType" DataField="JointType" SortField="JointType"
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
-                                </f:RenderField>
-                            </Columns>
-                            <PageItems>
-                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                                </f:ToolbarSeparator>
-                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                                </f:ToolbarText>
-                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                                    <f:ListItem Text="10" Value="10" />
-                                    <f:ListItem Text="15" Value="15" />
-                                    <f:ListItem Text="20" Value="20" />
-                                    <f:ListItem Text="25" Value="25" />
-                                </f:DropDownList>
-                            </PageItems>
-                        </f:Grid>--%>
-
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道对接焊接接头报检/检查记录" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="JOT_ID,New_ID" AllowCellEditing="true" EnableColumnLines="true"
                             ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="JOT_WeldDate,ISO_IsoNo,JOT_JointNo"
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs
index 02cc96d..9af1989 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs
@@ -9,6 +9,8 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.IO;
 using FineUIPro.Web.common.BaseInfo;
+using System.Collections;
+using NPOI.SS.Formula.Functions;
 
 namespace FineUIPro.Web.JGZL
 {
@@ -45,6 +47,8 @@ namespace FineUIPro.Web.JGZL
                 this.drpIsoId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpIsoId);
                 this.drpIsoId.SelectedIndex = 0;
+
+                Funs.FineUIPleaseSelect(this.drpWeldingDate);
             }
         }
         #endregion
@@ -135,9 +139,9 @@ namespace FineUIPro.Web.JGZL
             {
                 listStr.Add(new SqlParameter("@JOTY_Group", null));
             }
-            if (!string.IsNullOrEmpty(this.txtWeldingDate.Text))
+            if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue) && this.drpWeldingDate.SelectedValue != BLL.Const._Null)
             {
-                listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text));
+                listStr.Add(new SqlParameter("@WeldingDate", this.drpWeldingDate.SelectedValue));
             }
             else
             {
@@ -260,9 +264,9 @@ namespace FineUIPro.Web.JGZL
                 {
                     listStr.Add(new SqlParameter("@JOTY_Group", null));
                 }
-                if (!string.IsNullOrEmpty(this.txtWeldingDate.Text))
+                if (this.drpWeldingDate.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue))
                 {
-                    listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text));
+                    listStr.Add(new SqlParameter("@WeldingDate", this.drpWeldingDate.SelectedValue));
                 }
                 else
                 {
@@ -365,6 +369,28 @@ namespace FineUIPro.Web.JGZL
         #endregion
 
         protected void drpIsoId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
+            {
+                BindGrid();
+                this.drpWeldingDate.Items.Clear();
+                List<string> lists = new List<string>();
+                for (int i = 0; i < this.Grid1.Rows.Count; i++)
+                {
+                    lists.Add(string.Format("{0:yyyy-MM-dd}", this.Grid1.Rows[i].Values[4]));
+                }
+                lists = lists.Distinct().ToList();
+
+                this.drpWeldingDate.DataTextField = "Text";
+                this.drpWeldingDate.DataValueField = "Value";
+                this.drpWeldingDate.DataSource = lists;
+                this.drpWeldingDate.DataBind();
+                Funs.FineUIPleaseSelect(this.drpWeldingDate);
+                this.drpWeldingDate.SelectedIndex = 0;
+            }
+        }
+
+        protected void drpWeldingDate_SelectedIndexChanged(object sender, EventArgs e)
         {
             BindGrid();
         }
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs
index 58320be..27b47d3 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs
@@ -114,13 +114,13 @@ namespace FineUIPro.Web.JGZL
         protected global::FineUIPro.DropDownList drpJointType;
 
         /// <summary>
-        /// txtWeldingDate 控件。
+        /// drpWeldingDate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtWeldingDate;
+        protected global::FineUIPro.DropDownList drpWeldingDate;
 
         /// <summary>
         /// ToolbarFill1 控件。