feat(hjgl): 完善焊接日报审核与页面展示

统一 PC 端与接口的待审核查询、状态筛选和分页逻辑，补充日报查询参数及焊接信息展示，并调整试压包和焊口列表页面。
2026-08-20 10:47:12 +08:00
parent 679e9f6cec
commit 42787c1520
11 changed files with 212 additions and 113 deletions
@@ -298,8 +298,8 @@
                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
                                                            Width="90px">
                                                        </f:RenderField>
-                                                        <f:RenderField HeaderText="焊点坐标" ColumnID="WeldJointPoint" DataField="WeldJointPoint"
-                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                                                        <f:RenderField HeaderText="是否热处理" ColumnID="IsHotProessStr" DataField="IsHotProessStr"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
                                                            Width="90px">
                                                        </f:RenderField>
                                                    </Columns>
@@ -238,6 +238,12 @@
                                                <f:DatePicker ID="txtPendingWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right"
                                                    LabelWidth="90px" Width="220px" AutoPostBack="true" OnTextChanged="PendingFilter_TextChanged" AutoShowClearIcon="true">
                                                </f:DatePicker>
+                                                <f:DropDownList ID="drpPendingAuditState" runat="server" Label="状态" LabelAlign="Right" AutoSelectFirstItem="true"
+                                                    LabelWidth="50px" Width="180px" AutoPostBack="true" OnSelectedIndexChanged="PendingFilter_TextChanged">
+                                                    <f:ListItem Text="全部" Value="-1" Selected="true" />
+                                                    <f:ListItem Text="待班组审核" Value="0" />
+                                                    <f:ListItem Text="待专工审核" Value="1" />
+                                                </f:DropDownList>
                                                <f:TextBox ID="txtPendingPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件"
                                                    LabelAlign="Right" AutoPostBack="true" OnTextChanged="PendingFilter_TextChanged">
                                                </f:TextBox>
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                        tn1.Text = q.UnitWorkName;
                        tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
                        tn1.CommandName = "UnitWork";
+                        tn1.EnableClickEvent = true;
                        rootNode1.Nodes.Add(tn1);
                        BindNodes(tn1);
                    }
@@ -103,6 +104,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                        tn2.Text = q.UnitWorkName;
                        tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
                        tn2.CommandName = "UnitWork";
+                        tn2.EnableClickEvent = true;
                        rootNode2.Nodes.Add(tn2);
                        BindNodes(tn2);
                    }
@@ -151,6 +153,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
            if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
            {
                this.BindGrid();
+                GridPending.PageIndex = 0;
                this.BindPendingGrid();
                var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
                if (daily != null)
@@ -289,18 +292,26 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                weldingDate = parsedDate.Date;
            }

-            // 待审核列表与接口共用同一套查询和字段映射，避免PC端SQL与接口逐渐分叉。
-            var pendingItems = BLL.WeldingDailyService.GetWeldingDailyTempDetailList(
-                this.CurrUser.LoginProjectId,
-                unitWork == null ? null : unitWork.UnitWorkId,
-                weldingDate,
-                txtPendingPipelineCode.Text.Trim(),
-                txtPendingWelderCode.Text.Trim());
-            DataTable tb = this.LINQToDataTable(pendingItems);
-            GridPending.RecordCount = tb.Rows.Count;
-            tb = GetFilteredTable(GridPending.FilteredData, tb);
-            var table = this.GetPagedDataTable(GridPending, tb);
-            GridPending.DataSource = table;
+            int auditState;
+            int? auditStateCondition = int.TryParse(drpPendingAuditState.SelectedValue, out auditState)
+                && auditState >= 0 ? (int?)auditState : null;
+            var input = new Model.WeldingDailyTempDetailInput
+            {
+                ProjectId = this.CurrUser.LoginProjectId,
+                UnitWorkId = unitWork == null ? null : unitWork.UnitWorkId,
+                WeldingDate = weldingDate,
+                PipelineCode = txtPendingPipelineCode.Text.Trim(),
+                WelderCode = txtPendingWelderCode.Text.Trim(),
+                AuditState = auditStateCondition,
+                PageIndex = GridPending.PageIndex,
+                PageSize = GridPending.PageSize
+            };
+
+            // 查询条件和分页条件统一下推到业务层，页面只绑定当前页数据。
+            int totalCount;
+            var pendingItems = BLL.WeldingDailyService.GetWeldingDailyTempDetailList(input, out totalCount);
+            GridPending.RecordCount = totalCount;
+            GridPending.DataSource = pendingItems;
            GridPending.DataBind();
        }
        #endregion
@@ -662,6 +673,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        /// </summary>
        protected void PendingFilter_TextChanged(object sender, EventArgs e)
        {
+            GridPending.PageIndex = 0;
            BindPendingGrid();
        }
        #endregion
@@ -302,6 +302,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        /// </remarks>
        protected global::FineUIPro.DatePicker txtPendingWeldingDate;

+        /// <summary>
+        /// drpPendingAuditState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPendingAuditState;
+
        /// <summary>
        /// txtPendingPipelineCode 控件。
        /// </summary>