gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20251030 焊口综合信息增加报表打印

Browse Source
This commit is contained in:
毕文静
2025-10-30 14:06:40 +08:00
parent 345c376343
commit abaf104093
9 changed files with 1102 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
+7 -7
View File
@@ -724,14 +724,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(tb.Rows[i]["WED_Name2"].ToString()))
WED_Name += " " + tb.Rows[i]["WED_Name1"].ToString();
tb.Rows[i]["WED_Name"] = WED_Name;
if (!string.IsNullOrEmpty(tb.Rows[i]["JOT_WeldDate"].ToString()))
{
DateTimeFormat dateTimeFormat = new DateTimeFormat("yyyy-MM-DD HH:mm:ss.000");
DateTime dateTime = DateTime.Parse(tb.Rows[i]["JOT_WeldDate"].ToString());
//if (!string.IsNullOrEmpty(tb.Rows[i]["JOT_WeldDate"].ToString()))
//{
// DateTimeFormat dateTimeFormat = new DateTimeFormat("yyyy-MM-DD HH:mm:ss.000");
// DateTime dateTime = DateTime.Parse(tb.Rows[i]["JOT_WeldDate"].ToString());
tb.Rows[i]["JOT_WeldDate_Month"] = dateTime.Month + "";
tb.Rows[i]["JOT_WeldDate_Day"] = dateTime.Day + "";
}
// tb.Rows[i]["JOT_WeldDate_Month"] = dateTime.Month + "";
// tb.Rows[i]["JOT_WeldDate_Day"] = dateTime.Day + "";
//}
if (!string.IsNullOrEmpty(tb.Rows[i]["WeldSilk"].ToString()) && !string.IsNullOrEmpty(tb.Rows[i]["WeldMat"].ToString()))
{
SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx
+1 -1
View File
@@ -37,7 +37,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:DropDownList ID="printType" runat="server" Label="打印报表" LabelAlign="Right" LabelWidth="100px" Hidden="true">
<f:DropDownList ID="printType" runat="server" Label="打印报表" LabelAlign="Right" LabelWidth="100px">
<f:ListItem Value="0" Text="管道焊接工作记录" Selected="true" />
<f:ListItem Value="1" Text="管道焊接工艺检查记录" />
<f:ListItem Value="2" Text="设备焊接工作记录" />
SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs
+400 -561
View File
File diff suppressed because it is too large Load Diff