lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20241225 质量周报月报修改

Browse Source
This commit is contained in:
毕文静
2024-12-25 10:07:39 +08:00
parent 281fbb3b25
commit 5c045bd911
12 changed files with 155 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+9 -9
View File
@@ -163,7 +163,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid1_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -248,7 +248,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -265,7 +265,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -282,7 +282,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -675,7 +675,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid9_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -861,7 +861,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -1856,7 +1856,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -1873,7 +1873,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -1891,7 +1891,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+20 -4
View File
@@ -437,6 +437,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
SaveMethod();
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@@ -1072,6 +1074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@@ -2521,6 +2524,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@@ -2575,6 +2579,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@@ -2643,6 +2648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@@ -2677,6 +2683,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@@ -2818,6 +2825,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
private void SaveMethod()
{
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
@@ -2923,7 +2938,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
saveConstructionProblems();
//保存19.下月质量控制重点
saveNextQualityControl();
//保存23.施工照片
saveImages();
@@ -2939,9 +2953,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
WeekAndMonthReportNewService.Update(report);
}
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存本月质量目标管理情况
@@ -4006,5 +4017,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#endregion
protected void Text_TextChanged(object sender, EventArgs e)
{
SaveMethod();
}
}
}
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+9 -9
View File
@@ -162,7 +162,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid1_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -247,7 +247,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -264,7 +264,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -281,7 +281,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -674,7 +674,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid9_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -860,7 +860,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本周报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -1855,7 +1855,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -1872,7 +1872,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@@ -1890,7 +1890,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+25 -3
View File
@@ -378,6 +378,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
SaveMethod();
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@@ -1003,6 +1004,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@@ -2457,6 +2459,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@@ -2511,6 +2514,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@@ -2579,6 +2583,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@@ -2613,6 +2618,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@@ -2754,6 +2760,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存方法
/// <summary>
/// 保存方法
/// </summary>
private void SaveMethod()
{
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
@@ -2875,10 +2892,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
WeekAndMonthReportNewService.Update(report);
}
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
#region 保存本月质量目标管理情况
void saveTarget()
@@ -3939,8 +3954,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
db.Report_TextBoxContent.InsertAllOnSubmit(ImageLists);
db.SubmitChanges();
}
#endregion
#endregion
protected void Text_TextChanged(object sender, EventArgs e)
{
SaveMethod();
}
}
}