feat(HJGL): 焊接任务打印功能支持多模板选择
- 为组件打印新增60x162标签模板选项 - 为焊口打印新增80x42标签模板选项 - API接口返回数据增加焊口位置和焊点坐标字段 - 优化打印模板选择逻辑，支持A4和标签模板切换
This commit is contained in:
@@ -8,9 +8,9 @@
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
<meta name="sourcefiles" content="~/HJGL/WeldingManage/GetWdldingDailyItem.ashx" />
|
||||
<style type="text/css">
|
||||
.Green {
|
||||
.Green {
|
||||
background-color: Green;
|
||||
color:white;
|
||||
color: white;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
@@ -71,36 +71,49 @@
|
||||
<f:HiddenField runat="server" ID="hdTaskWeldJoint"></f:HiddenField>
|
||||
<f:Button runat="server" ID="CreatWeldableWeldJoint" Icon="ChartPie" Text="生成可焊焊工" OnClick="CreatWeldableWeldJoint_Click"></f:Button>
|
||||
<f:RadioButtonList runat="server" ID="rbIsAudit" LabelAlign="Right" AutoColumnWidth="true" Label="状态" LabelWidth="80px" Width="420px" AutoPostBack="true" OnSelectedIndexChanged="rbIsAudit_SelectedIndexChanged">
|
||||
<f:RadioItem Selected="true" Text="全部" Value="2" />
|
||||
<f:RadioItem Text="未生成可焊焊工" Value="0" />
|
||||
<f:RadioItem Text="已生成可焊焊工" Value="1" />
|
||||
</f:RadioButtonList>
|
||||
<f:RadioItem Selected="true" Text="全部" Value="2" />
|
||||
<f:RadioItem Text="未生成可焊焊工" Value="0" />
|
||||
<f:RadioItem Text="已生成可焊焊工" Value="1" />
|
||||
</f:RadioButtonList>
|
||||
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click" Hidden="True">
|
||||
</f:Button>
|
||||
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px" Hidden="True">
|
||||
</f:DropDownList>
|
||||
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click" Hidden="True"></f:Button>
|
||||
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件" LabelAlign="Right"></f:TextBox>
|
||||
|
||||
|
||||
<f:Button runat="server" ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Text="查询" OnClick="btnSearch_Click">
|
||||
</f:Button>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
|
||||
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" >
|
||||
</f:Button>
|
||||
<f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick">
|
||||
</f:Button>
|
||||
<f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"
|
||||
DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true">
|
||||
</f:DatePicker>
|
||||
<%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
|
||||
<%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
|
||||
</f:Button>--%>
|
||||
<f:Button ID="btnGenOutPlanMaster" Text="生成出库申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click" >
|
||||
<f:Button ID="btnGenOutPlanMaster" Text="生成出库申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click" Hidden="True">
|
||||
</f:Button>
|
||||
|
||||
<f:Button ID="btnPrintJoint" Text="打印焊口贴纸" Icon="Printer" runat="server"
|
||||
OnClick="btnPrintJoint_Click">
|
||||
|
||||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
|
||||
<f:DropDownList ID="ddlPrintTemplate" Label="预制组件打印模板" LabelWidth="140px" Width="270px" runat="server">
|
||||
<f:ListItem Text="60MM*162MM" Value="60x162" Selected="true" />
|
||||
<f:ListItem Text="A4" Value="A4" />
|
||||
</f:DropDownList>
|
||||
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
|
||||
<f:DropDownList ID="ddlPrintJointTemplate" Label="焊口打印模板" LabelWidth="120px" Width="240px" runat="server">
|
||||
<f:ListItem Text="80MM*42MM" Value="80x42" Selected="true" />
|
||||
<f:ListItem Text="A4" Value="A4" />
|
||||
</f:DropDownList>
|
||||
<f:Button ID="btnPrintJoint" Text="打印焊口贴纸" Icon="Printer" runat="server"
|
||||
OnClick="btnPrintJoint_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
@@ -148,15 +161,15 @@
|
||||
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
|
||||
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="70px">
|
||||
</f:RenderField>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
|
||||
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="70px">
|
||||
</f:RenderField>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="公称直径" ColumnID="DNDia" Hidden="true"
|
||||
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="70px">
|
||||
</f:RenderField>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" Hidden="true"
|
||||
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
@@ -195,7 +208,7 @@
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" Hidden="True"
|
||||
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" Hidden="True"
|
||||
DataField="BackingWelderCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
|
||||
<Editor>
|
||||
@@ -242,11 +255,11 @@
|
||||
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
|
||||
IsModal="true" Width="1300px" Height="650px" OnClose="Window1_Close">
|
||||
</f:Window>
|
||||
|
||||
<f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
|
||||
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
|
||||
IsModal="true" Width="1010px" Height="660px">
|
||||
</f:Window>
|
||||
|
||||
<f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
|
||||
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
|
||||
IsModal="true" Width="1010px" Height="660px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuAdd" EnablePostBack="true" runat="server" Text="新增" Hidden="true" Icon="Add" OnClick="btnMenuAdd_Click">
|
||||
</f:MenuButton>
|
||||
|
||||
Reference in New Issue
Block a user