From 5c045bd9110415534bf6eed106ab4db8b7490f20 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 25 Dec 2024 10:07:39 +0800
Subject: [PATCH] =?UTF-8?q?20241225=20=E8=B4=A8=E9=87=8F=E5=91=A8=E6=8A=A5?=
=?UTF-8?q?=E6=9C=88=E6=8A=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/BLL.csproj | 2 +-
SGGL/BLL/app.config | 2 +-
.../CQMS/ManageReportNew/MonthReportEdit.aspx | 18 +-
.../ManageReportNew/MonthReportEdit.aspx.cs | 24 ++-
.../CQMS/ManageReportNew/WeekReportEdit.aspx | 18 +-
.../ManageReportNew/WeekReportEdit.aspx.cs | 28 ++-
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 7 +-
SGGL/FineUIPro.Web/Web.config | 166 +++++++++---------
SGGL/FineUIPro.Web/packages.config | 2 +-
SGGL/Model/Model.csproj | 2 +-
SGGL/SgManager.AI/SgManager.AI.csproj | 2 +-
SGGL/WebAPI/WebAPI.csproj | 2 +-
12 files changed, 155 insertions(+), 118 deletions(-)
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 7a73dcf4..f696263a 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -10,7 +10,7 @@
Properties
BLL
BLL
- v4.6.2
+ v4.6.1
512
diff --git a/SGGL/BLL/app.config b/SGGL/BLL/app.config
index 11911cae..39f6fcea 100644
--- a/SGGL/BLL/app.config
+++ b/SGGL/BLL/app.config
@@ -61,4 +61,4 @@
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
index e44e6139..ae969cac 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
@@ -163,7 +163,7 @@
-
+
@@ -248,7 +248,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -265,7 +265,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -282,7 +282,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -675,7 +675,7 @@
-
+
@@ -861,7 +861,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1856,7 +1856,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1873,7 +1873,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1891,7 +1891,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index d451cdfa..b380ad97 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -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
///
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
///
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
///
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();
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
index 2aa7e32d..47dd984f 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
@@ -162,7 +162,7 @@
-
+
@@ -247,7 +247,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -264,7 +264,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -281,7 +281,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -674,7 +674,7 @@
-
+
@@ -860,7 +860,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1855,7 +1855,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1872,7 +1872,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1890,7 +1890,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index d97a9800..37905120 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -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
///
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
///
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
///
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 保存方法
+ ///
+ /// 保存方法
+ ///
+ 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();
+ }
+
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 11c97548..bf756aae 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12,7 +12,7 @@
Properties
FineUIPro.Web
FineUIPro.Web
- v4.6.2
+ v4.6.1
true
@@ -104,8 +104,7 @@
..\FineUIPro\Reference BLL\Microsoft.QualityTools.Testing.Fakes.dll
- False
- bin\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
..\packages\NPOI.2.5.5\lib\net45\NPOI.dll
@@ -19321,7 +19320,7 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -178,26 +178,26 @@
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/packages.config b/SGGL/FineUIPro.Web/packages.config
index 912667ad..0feab1ae 100644
--- a/SGGL/FineUIPro.Web/packages.config
+++ b/SGGL/FineUIPro.Web/packages.config
@@ -3,7 +3,7 @@
-
+
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index 0fdf0a15..f3b771d4 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -10,7 +10,7 @@
Properties
Model
Model
- v4.6.2
+ v4.6.1
512
diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj
index 1e1bc32e..8d107452 100644
--- a/SGGL/SgManager.AI/SgManager.AI.csproj
+++ b/SGGL/SgManager.AI/SgManager.AI.csproj
@@ -9,7 +9,7 @@
Properties
SgManager.AI
SgManager.AI
- v4.6.2
+ v4.6.1
512
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 84dec93a..59d8fc2f 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -14,7 +14,7 @@
Properties
WebAPI
WebAPI
- v4.6.2
+ v4.6.1
false
true