合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -50,13 +50,12 @@
<Items>
<f:HiddenField runat="server" ID="hdJOTID"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownList ID="drpPrintType" runat="server" Label="打印报表" LabelAlign="Right" Width="350px"></f:DropDownList>
<f:Button ID="Button1" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
<f:Button ID="btnAudit" Text="审核" ToolTip="审核" Icon="PageEdit" runat="server" OnClick="btnAudit_Click">
</f:Button>
<f:Button ID="btnCancelAudit" Text="取消审核" ToolTip="取消审核" Icon="NoteEdit" runat="server" OnClick="btnCancelAudit_Click" Hidden="true">
</f:Button>
<f:DropDownList ID="drpPrintType" runat="server" Label="打印报表" LabelAlign="Right" Width="350px"></f:DropDownList>
<f:Button ID="Button1" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -189,6 +188,9 @@
</f:RenderField>
<f:RenderField HeaderText="探伤结果" ColumnID="CHT_CheckResult" DataField="CHT_CheckResult" SortField="CHT_CheckResult"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="缺陷定义" ColumnID="Defects_Definition" DataField="Defects_Definition" SortField="Defects_Definition"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="延长米cm" ColumnID="ExtendingRice" DataField="ExtendingRice" SortField="ExtendingRice"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
@@ -211,7 +213,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="1010" Height="660px">
</f:Window>
</form>
<script type="text/javascript">