周报 月报

This commit is contained in:
李超 2025-09-30 10:04:56 +08:00
parent d7a11fdce3
commit f38e76b6c7
5 changed files with 2953 additions and 293 deletions

View File

@ -51,6 +51,7 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" /> <f:PageManager ID="PageManager1" runat="server" />
<f:ContentPanel ID="ContentPanel1" IsFluid="true" CssClass="blockpanel" runat="server" BodyPadding="10px" <f:ContentPanel ID="ContentPanel1" IsFluid="true" CssClass="blockpanel" runat="server" BodyPadding="10px"
ShowBorder="true" ShowHeader="false" Title="内容面板"> ShowBorder="true" ShowHeader="false" Title="内容面板">
@ -71,7 +72,7 @@
<f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click"> <f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
</f:Button> </f:Button>
<f:Button ID="btnClose" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click"> <f:Button ID="btnClose" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
</f:Button> </f:Button>
</td> </td>
</tr> </tr>
</table> </table>
@ -2095,7 +2096,7 @@
</Items> </Items>
</f:Panel> </f:Panel>
<Toolbars> <Toolbars >
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:HiddenField ID="hdCheckControlCode" runat="server"></f:HiddenField> <f:HiddenField ID="hdCheckControlCode" runat="server"></f:HiddenField>
@ -2120,6 +2121,8 @@
<asp:ValidationSummary ID="ValidationSummary1" Style="z-index: 101; position: absolute; top: 8px; right: 824px;" <asp:ValidationSummary ID="ValidationSummary1" Style="z-index: 101; position: absolute; top: 8px; right: 824px;"
runat="server" ValidationGroup="Save" HeaderText="请注意!" runat="server" ValidationGroup="Save" HeaderText="请注意!"
ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary> ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
<input runat="server" type="hidden" id="hidReportId" /> <input runat="server" type="hidden" id="hidReportId" />
<input runat="server" type="hidden" name="_VIEWSTATE"/> <input runat="server" type="hidden" name="_VIEWSTATE"/>
</form> </form>

View File

@ -5697,7 +5697,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
} }
report.CreateDate = DateTime.Now; report.CreateDate = DateTime.Now;
report.CreateMan = CurrUser.UserId; report.CreateMan = CurrUser.UserId;
bool save = false;
if (AddOrUpdate == "add")
{
save = true;
WeekAndMonthReportNewService.Insert(report);
}
else
{
save = true;
WeekAndMonthReportNewService.Update(report);
}
#region #region
//本月质量目标管理情况 //本月质量目标管理情况
//CqmsTargetService.Delete(ReportId); //CqmsTargetService.Delete(ReportId);
@ -5718,11 +5728,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); //BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
#endregion #endregion
#region #region
//保存本月质量目标管理情况 //保存本月质量目标管理情况
saveTarget(); saveTarget();
//保存文本框
saveTxtContent();
//保存3.1一般施工方案审批情况 //保存3.1一般施工方案审批情况
saveYbsgfa(); saveYbsgfa();
@ -5780,21 +5798,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
////保存23.施工照片 ////保存23.施工照片
//saveImages(); //saveImages();
//保存文本框
saveTxtContent();
#endregion #endregion
bool save = false;
if (AddOrUpdate == "add")
{
save = true;
WeekAndMonthReportNewService.Insert(report);
}
else
{
save = true;
WeekAndMonthReportNewService.Update(report);
}
if (save) if (save)
{ {
ShowNotify("保存成功!", MessageBoxIcon.Success); ShowNotify("保存成功!", MessageBoxIcon.Success);
@ -5828,19 +5836,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//} //}
detailLists.Add(newDetail); detailLists.Add(newDetail);
} }
if (detailLists.Count > 0) try
{ {
try var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId);
db.Report_CqmsTarget.DeleteAllOnSubmit(result);
if (detailLists.Count > 0)
{ {
CqmsTargetService.Delete(ReportId);//本月质量目标管理情况 //CqmsTargetService.Delete(ReportId);//本月质量目标管理情况
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists); db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
} }
db.SubmitChanges();
} }
catch (Exception)
{
return;
}
} }
#endregion #endregion
@ -6216,7 +6227,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion #endregion
try try
{ {
TextBoxContentService.Delete(ReportId); var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList();
db.Report_TextBoxContent.DeleteAllOnSubmit(result);
//TextBoxContentService.Delete(ReportId);
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList); db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
db.SubmitChanges(); db.SubmitChanges();

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.WeekReportEdit" %> <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.WeekReportEdit" Async="true" %>
<!DOCTYPE html> <!DOCTYPE html>

File diff suppressed because it is too large Load Diff