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

20250225

Browse Source
This commit is contained in:
毕文静
2025-02-25 20:35:34 +08:00
parent bb30002799
commit 1791e3b02f
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+10 -11
View File
@@ -262,14 +262,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
lodAllGrid("0");
}
Grid10.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
gvTj.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvSb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvGD.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvDq.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvYb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvFf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
GvXf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//Grid10.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//gvTj.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvSb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvGD.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvDq.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvYb.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvFf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
//GvXf.EmptyText = "<raw><div class=\"grid-empty-text\">无数据</div></raw>";
hidReportId.Value = ReportId;
}
@@ -1140,7 +1140,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
void loadProcessControl_NondestructiveTest_New()
{
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
var list = new List<Model.ProcessControl_NondestructiveTest_New>();
//加载所有施工分包单位
//var units = from x in db.Project_ProjectUnit
@@ -1164,8 +1164,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
&& c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate)
&& c.CreateDate >= startDate && c.CreateDate <= endDate
orderby c.CreateDate descending
select new