parent
05e9432c5b
commit
7724d823a7
|
@ -4811,7 +4811,7 @@ namespace BLL
|
|||
/// <summary>
|
||||
/// 关键事项模板文件原始虚拟路径
|
||||
/// </summary>
|
||||
public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项.xlsx";
|
||||
public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项跟踪一览表.xlsx";
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
|
|
@ -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 保存本月质量目标管理情况
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue