1、索引项目中，删除英文，保留中文；
2、尾项管理中，筛选条件调整； 3、尾项管理中，支持点击图片预览； 4、增加尾项统计表中的完成比例； 5、更新管道表的表格（增加焊接信息、试压包状态、电伴热和保温/冷信息）； 6、更新移交统计表（补充管道试压包其他信息统计）； 7、删除索引项目中的地管和消防2个项目；
This commit is contained in:
liuhui11
@@ -15,7 +15,7 @@
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="SystemNo" AllowCellEditing="true" EnableColumnLines="true"
|
||||
ClicksToEdit="2" DataIDField="SystemNo" AllowSorting="true"
|
||||
ClicksToEdit="2" DataIDField="SystemNo" AllowSorting="true"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableTextSelection="true" AllowColumnLocking="true">
|
||||
<Toolbars>
|
||||
@@ -28,21 +28,21 @@
|
||||
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
|
||||
</f:Button>
|
||||
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:Button>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
|
||||
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
|
||||
EnableLock="true" Locked="true">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
|
||||
<%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
|
||||
HeaderTextAlign="Center" MinWidth="50px">
|
||||
</f:RenderField>--%>
|
||||
|
||||
@@ -53,17 +53,30 @@
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
|
||||
HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
|
||||
HeaderText="Plan JWD<br/>计划联合检查" TextAlign="Center"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
|
||||
HeaderText="MC Plan<br/>MC 计划" TextAlign="Center"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
|
||||
|
||||
<f:GroupField HeaderText="Welding<br/>管道焊接信息" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="TotalFactor" DataField="TotalFactor"
|
||||
HeaderText="总达因数" TextAlign="Center" />
|
||||
|
||||
<f:GroupField HeaderText="Piping<br/>管道测试包" TextAlign="Center" MinWidth="200px">
|
||||
<f:RenderField MinWidth="50px" ColumnID="CompleteFactor" DataField="CompleteFactor"
|
||||
HeaderText="完成达因数" TextAlign="Center" />
|
||||
|
||||
<f:RenderField MinWidth="80px" ColumnID="CompleteProportion" DataField="CompleteProportion"
|
||||
HeaderText="完成率(%)" TextAlign="Center" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Piping<br/>管道试压包" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="PipingCount" DataField="PipingCount"
|
||||
HeaderText="总数" TextAlign="Center" />
|
||||
@@ -75,6 +88,19 @@
|
||||
HeaderText="完成率(%)" TextAlign="Center" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Reinstate<br/>管道冲洗吹扫&复位信息" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="ReinstateCount" DataField="ReinstateCount"
|
||||
HeaderText="总数" TextAlign="Center" />
|
||||
|
||||
<f:RenderField MinWidth="50px" ColumnID="ReinstateScount" DataField="ReinstateScount"
|
||||
HeaderText="完成数" TextAlign="Center" />
|
||||
|
||||
<f:RenderField MinWidth="80px" ColumnID="ReinstatePercent" DataField="ReinstatePercent"
|
||||
HeaderText="完成率(%)" TextAlign="Center" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Equipment<br/>设备测试包" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
@@ -115,7 +141,7 @@
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center" MinWidth="200px">
|
||||
<f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="TcsCount" DataField="TcsCount"
|
||||
HeaderText="总数" TextAlign="Center" />
|
||||
@@ -154,7 +180,7 @@
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" MinWidth="200px">
|
||||
<%--<f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="TpCount" DataField="TpCount"
|
||||
HeaderText="总数" TextAlign="Center" />
|
||||
@@ -165,23 +191,31 @@
|
||||
<f:RenderField MinWidth="80px" ColumnID="TpPercent" DataField="TpPercent"
|
||||
HeaderText="完成率(%)" TextAlign="Center" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
</f:GroupField>--%>
|
||||
|
||||
<f:TemplateField ColumnID="Count4" minWidth="120px" HeaderText="Total<br/>completion<br/>percentage<br/>总完成率（%）" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<f:TemplateField ColumnID="Count4" MinWidth="120px" HeaderText="Total<br/>completion<br/>percentage<br/>总完成率（%）" HeaderTextAlign="Center" TextAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SystemNo")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
|
||||
<f:RenderField MinWidth="140px" ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing"
|
||||
HeaderText="electric heat<br/> tracing<br/>电伴热 " TextAlign="Center"
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="140px" ColumnID="SubmitPackage" DataField="SubmitPackage"
|
||||
<f:RenderField MinWidth="140px" ColumnID="Insulation" DataField="Insulation"
|
||||
HeaderText="Insulation<br/>保温/冷 " TextAlign="Center"
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="140px" ColumnID="SubmitPackage" DataField="SubmitPackage"
|
||||
HeaderText="Submit Package<br/>系统包提交 " TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
|
||||
<f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
|
||||
HeaderText="Actual PWD<br/>实际预联合检查" TextAlign="Center"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
|
||||
<f:GroupField HeaderText="PWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
|
||||
<%--<f:GroupField HeaderText="PWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="pwdACount" DataField="pwdACount"
|
||||
HeaderText="A" TextAlign="Center" />
|
||||
@@ -192,7 +226,7 @@
|
||||
<f:RenderField MinWidth="50px" ColumnID="pwdCCount" DataField="pwdCCount"
|
||||
HeaderText="C" TextAlign="Center" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
</f:GroupField>--%>
|
||||
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="ActualJWD" DataField="ActualJWD"
|
||||
@@ -200,7 +234,7 @@
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
|
||||
|
||||
<f:GroupField HeaderText="FWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
|
||||
<%--<f:GroupField HeaderText="FWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField MinWidth="50px" ColumnID="fwdACount" DataField="fwdACount"
|
||||
HeaderText="A" TextAlign="Center" />
|
||||
@@ -211,7 +245,7 @@
|
||||
<f:RenderField MinWidth="50px" ColumnID="fwdCCount" DataField="fwdCCount"
|
||||
HeaderText="C" TextAlign="Center" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
</f:GroupField>--%>
|
||||
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="ActualMC" DataField="ActualMC"
|
||||
@@ -219,32 +253,32 @@
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
|
||||
<f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
|
||||
HeaderText="Commissioning<br/>试运行 " TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
|
||||
<f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
|
||||
HeaderText="IA签署 " TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
|
||||
<f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
|
||||
HeaderText="TCCC签署" TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
|
||||
<f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
|
||||
HeaderText="System Status<br/>系统状态 " TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="160px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
|
||||
<f:RenderField MinWidth="160px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
|
||||
HeaderText="Turnover Description" TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
<f:RenderField MinWidth="120px" ColumnID="Remark" DataField="Remark"
|
||||
HeaderText="Remark<br/>备注" TextAlign="Center"
|
||||
FieldType="String"/>
|
||||
FieldType="String" />
|
||||
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
</Listeners>
|
||||
<PageItems>
|
||||
@@ -261,11 +295,11 @@
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="修改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
<f:Window ID="Window1" Title="修改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
|
||||
Height="600px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<Items>
|
||||
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
|
||||
</f:MenuButton>
|
||||
|
||||
Reference in New Issue
Block a user