Compare commits
No commits in common. "2cba5bad4b4a5b535a499c85c62fc31ec72d76ae" and "4c239d99c806e1da563165c9caa933e241672568" have entirely different histories.
2cba5bad4b
...
4c239d99c8
|
|
@ -51,7 +51,6 @@
|
|||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" runat="server" />
|
||||
|
||||
<f:ContentPanel ID="ContentPanel1" IsFluid="true" CssClass="blockpanel" runat="server" BodyPadding="10px"
|
||||
ShowBorder="true" ShowHeader="false" Title="内容面板">
|
||||
|
||||
|
|
@ -72,7 +71,7 @@
|
|||
<f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnClose" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
|
||||
</f:Button>
|
||||
</f:Button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -2096,7 +2095,7 @@
|
|||
</Items>
|
||||
</f:Panel>
|
||||
|
||||
<Toolbars >
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<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;"
|
||||
runat="server" ValidationGroup="Save" HeaderText="请注意！"
|
||||
ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
|
||||
|
||||
|
||||
<input runat="server" type="hidden" id="hidReportId" />
|
||||
<input runat="server" type="hidden" name="_VIEWSTATE"/>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -5697,17 +5697,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
}
|
||||
report.CreateDate = DateTime.Now;
|
||||
report.CreateMan = CurrUser.UserId;
|
||||
bool save = false;
|
||||
if (AddOrUpdate == "add")
|
||||
{
|
||||
save = true;
|
||||
WeekAndMonthReportNewService.Insert(report);
|
||||
}
|
||||
else
|
||||
{
|
||||
save = true;
|
||||
WeekAndMonthReportNewService.Update(report);
|
||||
}
|
||||
|
||||
#region 删除所有子表
|
||||
//本月质量目标管理情况
|
||||
//CqmsTargetService.Delete(ReportId);
|
||||
|
|
@ -5730,17 +5720,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
#endregion
|
||||
|
||||
#region 保存所有子表
|
||||
|
||||
|
||||
|
||||
|
||||
//保存本月质量目标管理情况
|
||||
saveTarget();
|
||||
|
||||
//保存文本框
|
||||
saveTxtContent();
|
||||
|
||||
|
||||
//保存3.1一般施工方案审批情况
|
||||
saveYbsgfa();
|
||||
|
||||
|
|
@ -5798,11 +5780,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
////保存23.施工照片
|
||||
//saveImages();
|
||||
|
||||
|
||||
|
||||
//保存文本框
|
||||
saveTxtContent();
|
||||
#endregion
|
||||
|
||||
|
||||
bool save = false;
|
||||
if (AddOrUpdate == "add")
|
||||
{
|
||||
save = true;
|
||||
WeekAndMonthReportNewService.Insert(report);
|
||||
}
|
||||
else
|
||||
{
|
||||
save = true;
|
||||
WeekAndMonthReportNewService.Update(report);
|
||||
}
|
||||
if (save)
|
||||
{
|
||||
ShowNotify("保存成功！", MessageBoxIcon.Success);
|
||||
|
|
@ -5836,22 +5828,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//}
|
||||
detailLists.Add(newDetail);
|
||||
}
|
||||
try
|
||||
if (detailLists.Count > 0)
|
||||
{
|
||||
var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId);
|
||||
db.Report_CqmsTarget.DeleteAllOnSubmit(result);
|
||||
if (detailLists.Count > 0)
|
||||
try
|
||||
{
|
||||
//CqmsTargetService.Delete(ReportId);//本月质量目标管理情况
|
||||
CqmsTargetService.Delete(ReportId);//本月质量目标管理情况
|
||||
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
db.SubmitChanges();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -6227,9 +6216,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
#endregion
|
||||
try
|
||||
{
|
||||
var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList();
|
||||
db.Report_TextBoxContent.DeleteAllOnSubmit(result);
|
||||
//TextBoxContentService.Delete(ReportId);
|
||||
TextBoxContentService.Delete(ReportId);
|
||||
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
|
||||
db.SubmitChanges();
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,10 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
namespace FineUIPro.Web.CQMS.ManageReportNew {
|
||||
|
||||
|
||||
public partial class MonthReportEdit
|
||||
{
|
||||
public partial class MonthReportEdit {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue