2023-04-28 天辰质量报验移植

SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx

@@ -30,9 +30,6 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -43,7 +40,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitName2" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
+                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
                             HeaderTextAlign="Center" Width="320px">
                         </f:RenderField>
                         <f:RenderField ColumnID="EstimateNumber" DataField="EstimateNumber" FieldType="String" HeaderText="预计压力管道条数" TextAlign="Center"
@@ -64,6 +61,13 @@
                         <f:RenderField ColumnID="IssuedReportNumber" DataField="IssuedReportNumber" FieldType="String" HeaderText="已初具监检报告条数" TextAlign="Center"
                             HeaderTextAlign="Center" Width="180px">
                         </f:RenderField>
+                               <f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                                   <f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" 
+                        Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="PressurePipeId" DataIFrameUrlFormatString="./PressurePipeApprove.aspx?Id={0}"/>     
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
                             <ItemTemplate>
                                 <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
@@ -90,7 +94,11 @@
         </f:Panel>
         <f:Window ID="Window1" Title="压力管道管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="900px" Height="300px">
+            Width="900px" Height="320px">
+        </f:Window>
+           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>