From d9df147da2744531b84260b0b1479749ecf10083 Mon Sep 17 00:00:00 2001
From: wangqing <945983254@qq.com>
Date: Fri, 24 May 2024 00:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/WBS/Control/DivisionSubProjects.aspx | 22 ++++++++++---------
 .../WBS/Control/DivisionSubProjectsEdit.aspx  |  8 +++----
 .../Control/DivisionSubProjectsEdit.aspx.cs   |  2 +-
 .../CQMS/WBS/Control/PointCropping.aspx       |  4 ++--
 4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
index 49f95002..b4aa1f10 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
     <style type="text/css">
         .f-grid-cell[data-yc=yc] {
@@ -14,14 +14,13 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" 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" AutoScroll="true" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="true" Title="分部分项工程划分"
+                <f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="true" Title="分部分项工程"
                     runat="server" EnableCollapse="true" DataKeyNames="DivisionId,ParentId,DivisionLevel,Status" EnableTree="true"
-                    TreeColumn="BranchEngineeringCode" DataIDField="DivisionId" AllowPaging="true" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
-                    AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand"
-                    EnableMultiSelect="false" EnableCheckBoxSelect="true" ExpandAllTreeNodes="true">
+                    TreeColumn="BranchEngineeringCode" DataIDField="DivisionId" AllowPaging="false" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
+                    AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand" ExpandAllTreeNodes="true" EnableMultiSelect="false">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" runat="server">
                             <Items>
@@ -35,7 +34,8 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:RenderField ColumnID="BranchEngineeringCode" ExpandUnusedSpace="true" Width="80px" DataField="BranchEngineeringCode" HeaderText="分部工程编号">
+                        <f:RowNumberField />
+                        <f:RenderField ColumnID="BranchEngineeringCode" ExpandUnusedSpace="true" Width="100px" DataField="BranchEngineeringCode" HeaderText="分部工程编号">
                         </f:RenderField>
                         <f:RenderField ColumnID="BranchEngineeringName" ExpandUnusedSpace="true" Width="150px" DataField="BranchEngineeringName" HeaderText="分部工程名称">
                         </f:RenderField>
@@ -43,16 +43,18 @@
                         </f:RenderField>
                         <f:RenderField ColumnID="ProEngineeringName" ExpandUnusedSpace="true" Width="150px" DataField="ProEngineeringName" HeaderText="分项工程名称">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ProEngineeringCode" ExpandUnusedSpace="true" Width="80px" DataField="ProEngineeringCode" HeaderText="分项工程编号">
+                        <f:RenderField ColumnID="ProEngineeringCode" ExpandUnusedSpace="true" Width="100px" DataField="ProEngineeringCode" HeaderText="分项工程编号">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ProEngineeringNum" ExpandUnusedSpace="true" Width="80px" DataField="ProEngineeringNum" HeaderText="分部分项码">
+                        <f:RenderField ColumnID="ProEngineeringNum" ExpandUnusedSpace="true" Width="100px" DataField="ProEngineeringNum" HeaderText="分部分项码">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DivisionLevel" ExpandUnusedSpace="true" Width="100px" DataField="DivisionLevel" HeaderText="级别">
                         </f:RenderField>
                         <f:RenderField Width="50px" ColumnID="Sort" DataField="Sort" HeaderText="排序">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="OperateTime" DataField="OperateTime" HeaderText="操作日期" FieldType="Date"
                             Renderer="Date" RendererArgument="yyyy-MM-dd">
                         </f:RenderField>
-                        <f:LinkButtonField Width="100px" ConfirmText="删除当前选中数据和所有子节点数据？" ConfirmTarget="Top"
+                        <f:LinkButtonField Width="100px" ConfirmText="删除当前选中数据和所有子节点数据？" ColumnID="Delete" ToolTip="删除" HeaderText="删除" ConfirmTarget="Top"
                             CommandName="Delete" Icon="Delete" />
                     </Columns>
                     <Listeners>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
index d5ebf679..9bdae739 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
@@ -34,21 +34,21 @@
 
                                     <f:FormRow runat="server" ID="one" Hidden="true">
                                         <Items>
-                                           <f:TextBox ID="txtBranchEngineeringCode" runat="server" Label="分部工程编号" LabelAlign="Right" Required="true" LabelWidth="200px">
+                                           <f:TextBox ID="txtBranchEngineeringCode" runat="server" Label="分部工程编号" LabelAlign="Right" LabelWidth="200px">
                                             </f:TextBox>
-                                             <f:TextBox ID="txtBranchEngineeringName" runat="server" Label="分部工程名称" LabelAlign="Right" Required="true" LabelWidth="200px">
+                                             <f:TextBox ID="txtBranchEngineeringName" runat="server" Label="分部工程名称" LabelAlign="Right" LabelWidth="200px">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow runat="server" ID="two" Hidden="true">
                                         <Items>
-                                            <f:TextBox ID="txtSubBranchEngineeringName" runat="server" Label="子分部工程名称" LabelAlign="Right" Required="true" LabelWidth="200px">
+                                            <f:TextBox ID="txtSubBranchEngineeringName" runat="server" Label="子分部工程名称" LabelAlign="Right" LabelWidth="200px">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtProEngineeringCode" runat="server" Label="分项工程编号" LabelAlign="Right" Required="true" LabelWidth="200px">
+                                            <f:TextBox ID="txtProEngineeringCode" runat="server" Label="分项工程编号" LabelAlign="Right" LabelWidth="200px">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx.cs
index c8786ff2..a71009da 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx.cs
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
                     txtProEngineeringCode.Text = itemModel.ProEngineeringCode;
                     txtProEngineeringName.Text = itemModel.ProEngineeringName;
                     txtProEngineeringNum.Text = itemModel.ProEngineeringNum;
-                    txtRemark.Text = itemModel.Remark;
+                    txtRemark.Text = itemModel.Remark;                    
                 }
             }
         }
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx
index e454fe50..f6b99504 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx
@@ -47,9 +47,9 @@
                         </f:RenderField>
                         <f:RenderField ColumnID="ControlCode" Width="100px" DataField="ControlCode" HeaderText="编码">
                         </f:RenderField>
-                        <f:LinkButtonField Width="100px" ConfirmText="删除当前选中数据和所有子节点数据？" ColumnID="Delete" ToolTip="删除" ConfirmTarget="Top"
+                        <f:LinkButtonField Width="100px" CommandName="fileView" ToolTip="附件" ConfirmTarget="Top" Icon="TableCell" HeaderText="附件" />
+                        <f:LinkButtonField Width="100px" ConfirmText="删除当前选中数据和所有子节点数据？" ColumnID="Delete" ToolTip="删除" HeaderText="删除" ConfirmTarget="Top"
                             CommandName="Delete" Icon="Delete" />
-                        <f:LinkButtonField Width="100px" CommandName="fileView" ToolTip="附件" ConfirmTarget="Top" Icon="TableCell" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
