1、索引项目中,删除英文,保留中文;

2、尾项管理中,筛选条件调整;
3、尾项管理中,支持点击图片预览;
4、增加尾项统计表中的完成比例;
5、更新管道表的表格(增加焊接信息、试压包状态、电伴热和保温/冷信息);
6、更新移交统计表(补充管道试压包其他信息统计);
7、删除索引项目中的地管和消防2个项目;
This commit is contained in:
liuhui11
2024-10-31 19:11:00 +08:00
parent 27df9766f7
commit ea734b0874
23 changed files with 1623 additions and 329 deletions
+51 -15
View File
@@ -27,17 +27,17 @@
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true"/>
<f:ListItem Value="Not Start" Text="Not Start"/>
<f:ListItem Value="In progress" Text="In progress"/>
<f:ListItem Value="Completed" Text="Completed"/>
<f:ListItem Value="" Text="All" Selected="true" />
<f:ListItem Value="Not Start" Text="Not Start" />
<f:ListItem Value="In progress" Text="In progress" />
<f:ListItem Value="Completed" Text="Completed" />
</f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
<f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
</f:Button>
<f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -49,21 +49,21 @@
<f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="Test Package No" TextAlign="Center"
HeaderTextAlign="Center" minWidth="220px">
HeaderTextAlign="Center" MinWidth="220px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="330px">
</f:RenderField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="330px">
</f:RenderField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System No" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
@@ -96,7 +96,7 @@
</Columns>
</f:GroupField>--%>
<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
<%--<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="Ready for Test" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
@@ -110,9 +110,9 @@
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
</f:GroupField>--%>
<f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
<%--<f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="Blowingflushing" DataField="Blowingflushing" FieldType="String" HeaderText="Blowing /flushing &<br/> Dry out" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
@@ -126,9 +126,45 @@
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
</Columns>
</f:GroupField>--%>
<f:GroupField ID="g6" HeaderText="焊接信息" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="TotalFactor" DataField="TotalFactor" FieldType="String" HeaderText="总达因数" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="CompleteFactor" DataField="CompleteFactor" FieldType="String" HeaderText="完成达因数" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="CompleteProportion" DataField="CompleteProportion" FieldType="String" HeaderText="完成比例" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
<f:GroupField ID="g7" HeaderText="试压包状态" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PressureTestCompleted" DataField="PressureTestCompleted" FieldType="String" HeaderText="试压完成" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="RinseAndBlowClean" DataField="RinseAndBlowClean" FieldType="String" HeaderText="冲洗吹扫" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Reduction" DataField="Reduction" FieldType="String" HeaderText="复位" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing" FieldType="String" HeaderText="电伴热" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Insulation" DataField="Insulation" FieldType="String" HeaderText="保温/冷" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
@@ -164,7 +200,7 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据?"