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

项目质量月报新

This commit is contained in:
潘鸿锋 2024-04-08 10:13:37 +08:00
parent be6da14339
commit 281ea157e1
8 changed files with 292 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
View File

@ -629,7 +629,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合

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

@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑施工质量周报(新)</title>
<title>编辑项目质量月报(新)</title>
<base target="_self" />
<script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
@ -57,7 +57,7 @@
<tr>
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image15" runat="server" />
&nbsp;编辑施工质量月报
&nbsp;编辑项目质量月报
</td>
<td align="right" valign="middle" style="width: 50%; height: 30px;">
<%-- <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" OnClientClick="demo"
@ -96,7 +96,7 @@
</tr>
<tr>
<td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
<asp:Label ID="lblTital" runat="server" Text="施 工 质 量 月 报"></asp:Label>
<asp:Label ID="lblTital" runat="server" Text="项 目 质 量 月 报"></asp:Label>
</td>
</tr>
</table>
@ -787,6 +787,12 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="hidWsjcgl" Hidden="true" Text="无数据"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>

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

@ -493,6 +493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
u.UnitId,
u.UnitName,
c.ExpertReviewMan,
c.IsReview,
c.CompileDate
};
@ -506,7 +507,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.UnitOrMajor = item.UnitName;
model.Quantity1 = monethCount.Count();
model.Quantity2 = AllList.Count();
model.Quantity3 = AllList.Where(x => x.ExpertReviewMan != "").ToList().Count();
model.Quantity3 = AllList.Where(x => x.IsReview == true).ToList().Count();
model.ReportId = ReportId;
//如果是修改，查询表中数据
if (objType == "1")
@ -643,6 +644,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new
{
@ -726,6 +728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new
{
@ -813,7 +816,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId orderby x.SortIndex select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合
@ -1254,18 +1258,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(model);
}
}
if (list.Count == 0)
{
Grid10.Hidden = true;
hidWsjcgl.Hidden = false;
}
else {
Grid10.DataSource = list;
Grid10.DataBind();
Grid10.DataSource = list;
Grid10.DataBind();
//合计
//合计
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
//合计
//合计
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
Grid10.SummaryData = summary;
Grid10.SummaryData = summary;
}
}
#endregion
@ -2635,6 +2645,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
{
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;

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

File diff suppressed because it is too large Load Diff

6
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
View File

@ -35,9 +35,9 @@
<TreeNode id="e58366b4-70a5-41d1-a26f-0ab4a234004c" Text="现场焊接无损检测情况" NavigateUrl="CQMS/ManageReport/HJGLStatisc.aspx"></TreeNode>
<TreeNode id="0c65cad2-2279-48fc-b78c-82bfbe01f037" Text="NCR统计" NavigateUrl="CQMS/ManageReport/NCRStatisc.aspx"></TreeNode>
<TreeNode id="227d640a-9494-41ce-95bf-748dd59e986f" Text="设计变更单统计" NavigateUrl="CQMS/ManageReport/DesignChangeStatisc.aspx"></TreeNode>
<TreeNode id="51ee983f-085e-4f02-b819-cab049d9cc26" Text="施工质量周报" NavigateUrl="CQMS/ManageReport/WeekReport.aspx"></TreeNode>
<TreeNode id="8048c87a-c2b6-4a0d-bca9-f4f2dca42e5b" Text="施工质量月报" NavigateUrl="CQMS/ManageReport/MonthReport.aspx"></TreeNode>
<TreeNode id="4164BF9B-DA7C-4287-AC11-D1EB6A664F57" Text="施工质量月报(新)" NavigateUrl="CQMS/ManageReportNew/MonthReport.aspx"></TreeNode>
<TreeNode id="51ee983f-085e-4f02-b819-cab049d9cc26" Text="项目质量周报" NavigateUrl="CQMS/ManageReport/WeekReport.aspx"></TreeNode>
<TreeNode id="8048c87a-c2b6-4a0d-bca9-f4f2dca42e5b" Text="项目质量月报" NavigateUrl="CQMS/ManageReport/MonthReport.aspx"></TreeNode>
<TreeNode id="4164BF9B-DA7C-4287-AC11-D1EB6A664F57" Text="项目质量月报（新）" NavigateUrl="CQMS/ManageReportNew/MonthReport.aspx"></TreeNode>
<TreeNode id="1443C901-A9C3-4CCC-B858-55512DE8C5CA" Text="质量管理工作总结报告" NavigateUrl="CQMS/ManageReport/QualityWorkSummaryReport.aspx"></TreeNode>
<TreeNode id="267064F1-88F7-4468-998A-49A1A2F25BB8" Text="季度工程项目质量信息表" NavigateUrl="CQMS/ManageReport/QuarterlyProjectQuality.aspx"></TreeNode>
</TreeNode>

10
SGGL/FineUIPro.Web/common/Menu_TestRun.xml
View File

@ -46,12 +46,12 @@
<TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
<TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
<TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
<TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
<TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
<TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@ -69,9 +69,11 @@
<TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
<TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
<TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
<TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
<TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>

18
SGGL/FineUIPro.Web/common/Menu_Transfer.xml
View File

@ -1,3 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
</TreeNode>
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
</TreeNode>
</Tree>

2
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -83,4 +83,6 @@
</TreeNode>
<TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
<TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
</TreeNode>
</Tree>