diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs index 277d6704..b856553a 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs @@ -1,12 +1,9 @@ using FineUIPro; -using Microsoft.SqlServer.Dts.Runtime; -using NPOI.SS.Formula.Functions; +using Model; using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; -using Model; namespace BLL { diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs index b9968bd2..454c7c8c 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs @@ -1,11 +1,9 @@ using FineUIPro; -using Microsoft.SqlServer.Dts.Runtime; using Model; using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; namespace BLL 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/Web.config b/SGGL/FineUIPro.Web/Web.config index d2dd3a0f..835d46fc 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -1,4 +1,4 @@ - + -
+
- + - + - - - - - + + + + + - - - - + + + + - + - + - - - + + + - + - + - + - - + + - + - + - - - + + + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - - - - + + + + - + - + - - + + - - + + @@ -179,24 +179,24 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 9c0dbbb1..aea3bf36 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -50,9 +50,8 @@ bin\WebAPI.xml - - False - bin\Aspose.Words.dll + + ..\packages\Aspose.Words.24.12.0\lib\net461\Aspose.Words.dll diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index c9ab4ef5..c2dcc265 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/SGGL/WebAPI/packages.config b/SGGL/WebAPI/packages.config index 332fd67f..ba1098f4 100644 --- a/SGGL/WebAPI/packages.config +++ b/SGGL/WebAPI/packages.config @@ -1,6 +1,7 @@  +