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

Compare commits

base: lpf/CNCEC_SUBQHSE_WUHUAN:1fed4dc3fa23ebda70b64ed7f3560b28c46fa832
Branches Tags
lpf/CNCEC_SUBQHSE_WUHUAN:master
...
compare: lpf/CNCEC_SUBQHSE_WUHUAN:935007154efb5c9a09c4a3fd1d16d2e6ed4c2a80
Branches Tags
lpf/CNCEC_SUBQHSE_WUHUAN:master

4 Commits
1fed4dc3fa ... 935007154e

Author SHA1 Message Date
panhf 935007154e Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-04-08 10:56:42 +08:00
panhf 54c4dc6b4f 修改项目质量月报 2024-04-08 10:56:31 +08:00
panhf 41c5dad9f6 1 2024-04-08 10:29:00 +08:00
panhf 281ea157e1 项目质量月报新 2024-04-08 10:13:37 +08:00
13 changed files with 267 additions and 233 deletions
Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
+1 -1
View File
@@ -51,7 +51,7 @@
</f:Grid> </f:Grid>
</Items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="编辑施工质量月报" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="编辑项目质量月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="620px"> Width="1300px" Height="620px">
</f:Window> </f:Window>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+3 -1
View File
@@ -629,7 +629,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
} }
} }
int i = 1; 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) foreach (var item in cNProfessionals)
{ {
//专业下所有集合 //专业下所有集合
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+9 -3
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑施工质量周报(新)</title> <title>编辑项目质量月报(新)</title>
<base target="_self" /> <base target="_self" />
<script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script> <script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
@@ -57,7 +57,7 @@
<tr> <tr>
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold"> <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" /> <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image15" runat="server" />
&nbsp;编辑施工质量月报 &nbsp;编辑项目质量月报
</td> </td>
<td align="right" valign="middle" style="width: 50%; height: 30px;"> <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" <%-- <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" OnClientClick="demo"
@@ -96,7 +96,7 @@
</tr> </tr>
<tr> <tr>
<td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold"> <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> </td>
</tr> </tr>
</table> </table>
@@ -787,6 +787,12 @@
</f:Grid> </f:Grid>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="hidWsjcgl" Hidden="true" Text="无数据"></f:Label>
</Items>
</f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
</Items> </Items>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+27 -12
View File
@@ -493,6 +493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
u.UnitId, u.UnitId,
u.UnitName, u.UnitName,
c.ExpertReviewMan, c.ExpertReviewMan,
c.IsReview,
c.CompileDate c.CompileDate
}; };
@@ -506,7 +507,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.UnitOrMajor = item.UnitName; model.UnitOrMajor = item.UnitName;
model.Quantity1 = monethCount.Count(); model.Quantity1 = monethCount.Count();
model.Quantity2 = AllList.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; model.ReportId = ReportId;
//如果是修改，查询表中数据 //如果是修改，查询表中数据
if (objType == "1") if (objType == "1")
@@ -643,6 +644,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业 //加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex orderby x.SortIndex
select new select new
{ {
@@ -726,6 +728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业 //加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex orderby x.SortIndex
select new select new
{ {
@@ -813,7 +816,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
} }
} }
int i = 1; 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) foreach (var item in cNProfessionals)
{ {
//专业下所有集合 //专业下所有集合
@@ -1254,18 +1258,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(model); 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());
//合计 Grid10.SummaryData = summary;
//合计 }
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
Grid10.SummaryData = summary;
} }
#endregion #endregion
@@ -2635,6 +2645,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param> /// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e) 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(); Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId; report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId; report.ProjectId = this.CurrUser.LoginProjectId;
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs
Generated
+13 -2
View File
@@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.ManageReportNew { namespace FineUIPro.Web.CQMS.ManageReportNew
{
public partial class MonthReportEdit { public partial class MonthReportEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -714,6 +716,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew {
/// </remarks> /// </remarks>
protected global::FineUIPro.Grid Grid10; protected global::FineUIPro.Grid Grid10;
/// <summary>
/// hidWsjcgl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label hidWsjcgl;
/// <summary> /// <summary>
/// Panel20 控件。 /// Panel20 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011039575019).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011042564287).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011045503043).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011056108040).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011057317078).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011100589539).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报(202404011109132272).doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+3 -3
View File
@@ -35,9 +35,9 @@
<TreeNode id="e58366b4-70a5-41d1-a26f-0ab4a234004c" Text="现场焊接无损检测情况" NavigateUrl="CQMS/ManageReport/HJGLStatisc.aspx"></TreeNode> <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="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="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="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="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="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="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 id="267064F1-88F7-4468-998A-49A1A2F25BB8" Text="季度工程项目质量信息表" NavigateUrl="CQMS/ManageReport/QuarterlyProjectQuality.aspx"></TreeNode>
</TreeNode> </TreeNode>