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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
高飞
2024-05-14 09:03:42 +08:00
parent 3c73800853 8b3c544f40
commit 9d070167c9
9 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+6 -4
View File
@@ -230,9 +230,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//更新书签内容
Document doc = new Aspose.Words.Document(newUrl);
DocumentBuilder builder = new DocumentBuilder(doc);
//builder.CellFormat.VerticalAlignment = CellVerticalAlignment.Center;
//builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
#region 头部静态列
//业主单位
var unitsYz = (from x in db.Base_Unit
@@ -347,13 +346,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
row.Cells.Add(CreateCell(item.TargetValue, doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.MonthPer, doc, table.FirstRow.Cells[4].CellFormat.Width));
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[5].CellFormat.Width));
table.Rows.Insert(numberIndex, row);
numberIndex += 1;
}
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
//table.Alignment = Aspose.Words.Tables.TableAlignment.Center;
//builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
#endregion
#region 本月主要工作内容
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+2 -2
View File
@@ -103,8 +103,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
//&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
&& x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
orderby x.SortIndex
select new ProfessionalsClass
{
CNProfessionalId=x.CNProfessionalId,
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+1 -12
View File
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
//&& x.CNProfessionalId != BLL.Const.ComprehensiveId
&& x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
orderby x.SortIndex
select new ProfessionalsClass
{
@@ -600,17 +600,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0;
int Quantity2Sum = 0;
//加载所有专业
//var CNProfessionals = from x in db.Base_CNProfessional
// where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
// && x.CNProfessionalId != BLL.Const.ComprehensiveId
// orderby x.SortIndex
// select new
// {
// x.CNProfessionalId,
// x.ProfessionalName
// };
foreach (var item in CNProfessionals)
{