lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:2cba5bad4b4a5b535a499c85c62fc31ec72d76ae
Branches Tags
lpf:master
..
compare: lpf:4c239d99c806e1da563165c9caa933e241672568
Branches Tags
lpf:master

No commits in common. "2cba5bad4b4a5b535a499c85c62fc31ec72d76ae" and "4c239d99c806e1da563165c9caa933e241672568" have entirely different histories.
2cba5bad4b ... 4c239d99c8

5 changed files with 293 additions and 2953 deletions
Show Stats Expand all files Collapse all files

7
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
View File

@ -51,7 +51,6 @@
<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="内容面板">
@ -72,7 +71,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>
@ -2096,7 +2095,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>
@ -2121,8 +2120,6 @@
<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>

61
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -5697,17 +5697,7 @@ 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);
@ -5728,19 +5718,11 @@ 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();
@ -5798,11 +5780,21 @@ 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);
@ -5836,22 +5828,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//} //}
detailLists.Add(newDetail); detailLists.Add(newDetail);
} }
try if (detailLists.Count > 0)
{ {
var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId); try
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
@ -6227,9 +6216,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion #endregion
try try
{ {
var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList(); TextBoxContentService.Delete(ReportId);
db.Report_TextBoxContent.DeleteAllOnSubmit(result);
//TextBoxContentService.Delete(ReportId);
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList); db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
db.SubmitChanges(); db.SubmitChanges();

436
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
View File

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

2740
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

File diff suppressed because it is too large Load Diff