diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 9a04a61c..5bbd5c0a 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4811,7 +4811,7 @@ namespace BLL /// /// 关键事项模板文件原始虚拟路径 /// - public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项.xlsx"; + public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项跟踪一览表.xlsx"; #endregion #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index b21e65c2..2b098ccf 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -2867,7 +2867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } SaveMethod(); - ShowNotify("保存成功!", MessageBoxIcon.Success); + //ShowNotify("保存成功!", MessageBoxIcon.Success); //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); //Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId); @@ -3147,14 +3147,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew saveTxtContent(); #endregion + bool save = false; if (AddOrUpdate == "add") { + save = true; WeekAndMonthReportNewService.Insert(report); } else { + save = true; WeekAndMonthReportNewService.Update(report); } + if (save) + { + ShowNotify("保存成功!", MessageBoxIcon.Success); + } } #region 保存本月质量目标管理情况 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx deleted file mode 100644 index 2eb95b5a..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项跟踪一览表.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项跟踪一览表.xlsx new file mode 100644 index 00000000..c0a9a83a Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项跟踪一览表.xlsx differ diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index e853eead..fb70fd73 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -1206,10 +1206,8 @@ namespace FineUIPro.Web.common return await Task.Run(() => { string weekGridHtml = string.Empty; - //获取当前时间所在周信息 + //获取当前时间上一个周计划信息 var lastWeek = WeekPlanService.GetLastWeekPlan(this.CurrUser.LoginProjectId); - ////根据当前时间获取上一个周计划信息 - //var lastWeekItem = WeekItemService.GetWeekItemByDateNow(this.CurrUser.LoginProjectId); if (lastWeek != null) { Model.SGGLDB db = Funs.DB;