合并最新
This commit is contained in:
@@ -32,6 +32,10 @@
|
||||
<f:Toolbar ID="Toolbar2" runat="server">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpCheckUnit" runat="server" Label="检测单位" LabelWidth="80px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged"></f:DropDownList>
|
||||
|
||||
<f:TextBox ID="txtTrust" runat="server" Label="委托单号" LabelWidth="80px" LabelAlign="Right" EmptyText="输入查询条件" AutoPostBack="true"
|
||||
OnTextChanged="Tree_TextChanged" >
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
@@ -59,7 +63,11 @@
|
||||
</f:Button>
|
||||
<f:Button ID="btnSave" Text="保存" ToolTip="保存检测单" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnablePostBack="true" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
|
||||
<f:DropDownList ID="drpPrintType" runat="server" Label="打印报表" LabelAlign="Right" Width="350px">
|
||||
|
||||
</f:DropDownList>
|
||||
<f:Button ID="Button2" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
|
||||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
@@ -107,7 +115,7 @@
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="RT检测单录入" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="JOT_ID" AllowCellEditing="true"
|
||||
EnableColumnLines="true" ClicksToEdit="1" DataIDField="JOT_ID"
|
||||
EnableColumnLines="true" ClicksToEdit="1" DataIDField="JOT_ID" AllowSorting="true" OnSort="Grid1_Sort"
|
||||
SortField="JOT_JointNo" EnableTextSelection="True">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar4" runat="server" Position="Top">
|
||||
@@ -167,6 +175,23 @@
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="探伤结果" ColumnID="CHT_CheckResult" DataField="CHT_CheckResult" SortField="CHT_CheckResult"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:DropDownList ID="drpCHT_CheckResult" runat="server">
|
||||
<f:ListItem Value="合格" Text="合格" />
|
||||
<f:ListItem Value="不合格" Text="不合格" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="缺陷定义" ColumnID="Defects_Definition" DataField="Defects_Definition" SortField="Defects_Definition"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:DropDownList ID="DropDownList1" runat="server">
|
||||
<f:ListItem Value="气孔" Text="气孔" />
|
||||
<f:ListItem Value="未熔合" Text="未熔合" />
|
||||
<f:ListItem Value="条形缺陷" Text="条形缺陷" />
|
||||
<f:ListItem Value="其他" Text="其他" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="胶片规格" ColumnID="FilmSpecifications" DataField="FilmSpecifications" SortField="FilmSpecifications"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
@@ -206,7 +231,7 @@
|
||||
</Listeners>
|
||||
</f:Grid>
|
||||
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="非RT检测单录入" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="JOT_ID" AllowCellEditing="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="JOT_ID" AllowCellEditing="true" AllowSorting="true" OnSort="Grid1_Sort"
|
||||
EnableColumnLines="true" ClicksToEdit="1" DataIDField="JOT_ID"
|
||||
SortField="JOT_JointNo" EnableTextSelection="True" Hidden="true">
|
||||
<Toolbars>
|
||||
@@ -249,18 +274,50 @@
|
||||
<f:RenderField HeaderText="焊口数" ColumnID="JointCount" DataField="JointCount" SortField="JointCount"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="缺陷位置" ColumnID="CHT_RepairLocation" DataField="CHT_RepairLocation" SortField="CHT_RepairLocation"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
|
||||
<Editor>
|
||||
<f:TextBox ID="TextBox1" runat="server"></f:TextBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="缺陷长度" ColumnID="DefectLength" DataField="DefectLength" SortField="DefectLength"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:NumberBox ID="txtDefectLength" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="探伤结果*" ColumnID="CHT_CheckResult" DataField="CHT_CheckResult" SortField="CHT_CheckResult"
|
||||
<f:RenderField HeaderText="缺陷深度" ColumnID="DefectDepth" DataField="DefectDepth" SortField="DefectDepth"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:TextBox ID="txtCheckResult2" runat="server"></f:TextBox>
|
||||
<f:NumberBox ID="txtDefectDepth" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="缺陷高度" ColumnID="DefectHeight" DataField="DefectHeight" SortField="DefectHeight"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:NumberBox ID="txtDefectHeight" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="探伤结果*" ColumnID="CHT_CheckResult" DataField="CHT_CheckResult" SortField="CHT_CheckResult"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:DropDownList ID="drpCHT_CheckResult1" runat="server">
|
||||
<f:ListItem Value="合格" Text="合格" />
|
||||
<f:ListItem Value="不合格" Text="不合格" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="缺陷定义" ColumnID="Defects_Definition" DataField="Defects_Definition" SortField="Defects_Definition"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:DropDownList ID="drpDefects_Definition" runat="server">
|
||||
<f:ListItem Value="气孔" Text="气孔" />
|
||||
<f:ListItem Value="未熔合" Text="未熔合" />
|
||||
<f:ListItem Value="条形缺陷" Text="条形缺陷" />
|
||||
<f:ListItem Value="其他" Text="其他" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="延长米cm" ColumnID="ExtendingRice" DataField="ExtendingRice" SortField="ExtendingRice"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
</f:RenderField>
|
||||
@@ -293,7 +350,7 @@
|
||||
</f:Window>
|
||||
<f:Window ID="Window3" Title="打印" Hidden="true" EnableIFrame="true"
|
||||
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
|
||||
IsModal="true" Width="1200px" Height="650px">
|
||||
IsModal="true" Width="1010px" Height="660px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
|
||||
|
||||
Reference in New Issue
Block a user