From 0899055e49fc6303eb1f366373d807d761fe0830 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 11 Aug 2025 11:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=8E=A7=E5=88=B6=E7=82=B9?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E6=9F=9C=E7=95=8C=E9=9D=A2=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B=20=E7=8E=B0=E5=9C=BA=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E7=82=B9=E8=A3=81=E5=89=AA=E5=92=8C=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=9F=9C=E6=98=BE=E7=A4=BA=E9=AA=8C=E6=94=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/WBS/ProjectControlPoint.aspx            |  3 +++
 .../CQMS/WBS/ProjectControlPoint.aspx.cs         | 16 ++++++++++------
 .../CQMS/WBS/ProjectControlPointFile.aspx        | 13 +++++++++++--
 .../CQMS/WBS/ProjectControlPointFile.aspx.cs     | 14 +++++++++-----
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
index 04b7fa9f..851496d2 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
@@ -86,6 +86,9 @@
                                 <f:RenderField Width="100px" ColumnID="RecordAndCode" DataField="RecordAndCode" FieldType="String"
                                     HeaderText="记录格式文本号" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CheckAcceptType" DataField="CheckAcceptType" FieldType="String"
+                                    HeaderText="验收类型" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
                                 <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" TextAlign="Center" Icon="ArrowDown" CommandName="download" />
                                 <f:RenderField Width="40px" ColumnID="Class" DataField="Class" FieldType="String"
                                     HeaderText="控制等级" HeaderTextAlign="Center" TextAlign="Center">
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
index 24175af9..b54e197b 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
@@ -65,11 +65,12 @@ namespace FineUIPro.Web.CQMS.WBS
                 this.Grid1.Columns[3].Hidden = true;
                 this.Grid1.Columns[4].Hidden = true;
                 this.Grid1.Columns[5].Hidden = false;
-                this.Grid1.Columns[7].Hidden = false;
+                this.Grid1.Columns[6].Hidden = false;
                 this.Grid1.Columns[8].Hidden = false;
                 this.Grid1.Columns[9].Hidden = false;
                 this.Grid1.Columns[10].Hidden = false;
                 this.Grid1.Columns[11].Hidden = false;
+                this.Grid1.Columns[12].Hidden = false;
             }
         }
         #endregion
@@ -452,25 +453,27 @@ namespace FineUIPro.Web.CQMS.WBS
                 this.Grid1.Columns[3].Hidden = true;
                 this.Grid1.Columns[4].Hidden = true;
                 this.Grid1.Columns[5].Hidden = false;
-                this.Grid1.Columns[7].Hidden = false;
+                this.Grid1.Columns[6].Hidden = false;
                 this.Grid1.Columns[8].Hidden = false;
                 this.Grid1.Columns[9].Hidden = false;
                 this.Grid1.Columns[10].Hidden = false;
                 this.Grid1.Columns[11].Hidden = false;
                 this.Grid1.Columns[12].Hidden = false;
+                this.Grid1.Columns[13].Hidden = false;
             }
             else
             {
                 this.Grid1.Columns[2].Hidden = false;
                 this.Grid1.Columns[3].Hidden = false;
                 this.Grid1.Columns[4].Hidden = false;
-                this.Grid1.Columns[5].Hidden = true;
-                this.Grid1.Columns[7].Hidden = true;
+                this.Grid1.Columns[5].Hidden = false;
+                this.Grid1.Columns[6].Hidden = true;
                 this.Grid1.Columns[8].Hidden = true;
                 this.Grid1.Columns[9].Hidden = true;
                 this.Grid1.Columns[10].Hidden = true;
                 this.Grid1.Columns[11].Hidden = true;
                 this.Grid1.Columns[12].Hidden = true;
+                this.Grid1.Columns[13].Hidden = true;
             }
             BindGrid();
         }
@@ -845,8 +848,9 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL"
-                     + @" FROM WBS_BreakdownProject ";
+            string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL
+,(CASE WHEN CheckAcceptType='1' THEN '关键工序验收' WHEN CheckAcceptType='2' THEN '特殊过程验收' WHEN CheckAcceptType='3' THEN '隐蔽工程验收' WHEN CheckAcceptType='4' THEN '单位工程验收' WHEN CheckAcceptType='5' THEN '分部工程验收' WHEN CheckAcceptType='6' THEN '分项工程验收' ELSE '' END) AS CheckAcceptType
+FROM WBS_BreakdownProject ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " where DivisionProjectId = @DivisionProjectId and ProjectId=@ProjectId";
             listStr.Add(new SqlParameter("@DivisionProjectId", this.trWBS.SelectedNodeID));
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
index 51a61a1e..9801e065 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
@@ -44,13 +44,19 @@
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
                     Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
                     <Items>
-                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                        <%-- <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowSorting="true" EnableColumnLines="true"
                             SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" KeepCurrentSelection="true"
                             ForceFit="true" OnRowCommand="Grid1_RowCommand"
                             ShowSelectedCell="true" DataIDField="BreakdownProjectId" AllowPaging="true" IsDatabasePaging="true"
-                            PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
+                            PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">--%>
 
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" Title="现场控制点裁剪" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowCellEditing="true" EnableColumnLines="true"
+                            ClicksToEdit="1" DataIDField="BreakdownProjectId" AllowSorting="true" SortField="BreakdownCode"
+                            SortDirection="ASC" ForceFit="true" OnRowCommand="Grid1_RowCommand"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true"  OnRowDoubleClick="Grid1_RowDoubleClick"  EnableTextSelection="true">
                             <Columns>
                                 <f:RenderField Width="70px" ColumnID="BreakdownCode" DataField="BreakdownCode" FieldType="String"
                                     HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
@@ -73,6 +79,9 @@
                                 <f:RenderField Width="100px" ColumnID="RecordAndCode" DataField="RecordAndCode" FieldType="String"
                                     HeaderText="记录格式文本号" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CheckAcceptType" DataField="CheckAcceptType" FieldType="String"
+                                    HeaderText="验收类型" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
                                 <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" TextAlign="Center" Icon="ArrowDown" CommandName="download" />
                                 <f:RenderField Width="40px" ColumnID="Class" DataField="Class" FieldType="String"
                                     HeaderText="控制等级" HeaderTextAlign="Center" TextAlign="Center">
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
index 73319341..f1413fd0 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
@@ -58,11 +58,12 @@ namespace FineUIPro.Web.CQMS.WBS
                 this.Grid1.Columns[3].Hidden = true;
                 this.Grid1.Columns[4].Hidden = true;
                 this.Grid1.Columns[5].Hidden = false;
-                this.Grid1.Columns[7].Hidden = false;
+                this.Grid1.Columns[6].Hidden = false;
                 this.Grid1.Columns[8].Hidden = false;
                 this.Grid1.Columns[9].Hidden = false;
                 this.Grid1.Columns[10].Hidden = false;
                 this.Grid1.Columns[11].Hidden = false;
+                this.Grid1.Columns[12].Hidden = false;
             }
         }
         #endregion
@@ -351,12 +352,13 @@ namespace FineUIPro.Web.CQMS.WBS
                 this.Grid1.Columns[3].Hidden = true;
                 this.Grid1.Columns[4].Hidden = true;
                 this.Grid1.Columns[5].Hidden = false;
-                this.Grid1.Columns[7].Hidden = false;
+                this.Grid1.Columns[6].Hidden = false;
                 this.Grid1.Columns[8].Hidden = false;
                 this.Grid1.Columns[9].Hidden = false;
                 this.Grid1.Columns[10].Hidden = false;
                 this.Grid1.Columns[11].Hidden = false;
                 this.Grid1.Columns[12].Hidden = false;
+                this.Grid1.Columns[13].Hidden = false;
             }
             else
             {
@@ -364,12 +366,13 @@ namespace FineUIPro.Web.CQMS.WBS
                 this.Grid1.Columns[3].Hidden = false;
                 this.Grid1.Columns[4].Hidden = false;
                 this.Grid1.Columns[5].Hidden = true;
-                this.Grid1.Columns[7].Hidden = true;
+                this.Grid1.Columns[6].Hidden = true;
                 this.Grid1.Columns[8].Hidden = true;
                 this.Grid1.Columns[9].Hidden = true;
                 this.Grid1.Columns[10].Hidden = true;
                 this.Grid1.Columns[11].Hidden = true;
                 this.Grid1.Columns[12].Hidden = true;
+                this.Grid1.Columns[13].Hidden = true;
             }
             BindGrid();
         }
@@ -516,8 +519,9 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL 
-                       FROM WBS_BreakdownProject ";
+            string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL
+,(CASE WHEN CheckAcceptType='1' THEN '关键工序验收' WHEN CheckAcceptType='2' THEN '特殊过程验收' WHEN CheckAcceptType='3' THEN '隐蔽工程验收' WHEN CheckAcceptType='4' THEN '单位工程验收' WHEN CheckAcceptType='5' THEN '分部工程验收' WHEN CheckAcceptType='6' THEN '分项工程验收' ELSE '' END) AS CheckAcceptType
+FROM WBS_BreakdownProject ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " where IsSelected = 1 and DivisionProjectId = @DivisionProjectId and ProjectId=@ProjectId";
             listStr.Add(new SqlParameter("@DivisionProjectId", this.trWBS.SelectedNodeID));