Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
dd3878fd82
|
@ -1284,7 +1284,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -1372,7 +1372,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -1500,7 +1500,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -1628,7 +1628,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -1756,7 +1756,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -1884,7 +1884,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -2012,7 +2012,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -2140,7 +2140,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//创建行
|
||||
Row row = new Row(doc);
|
||||
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.Rows[0].Cells[1].CellFormat.Width));
|
||||
// 合并第一行的前两个单元格
|
||||
table.Rows[0].Cells[0].CellFormat.VerticalMerge = CellMerge.First;
|
||||
|
@ -2268,13 +2268,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
MonthsCountstring = Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
|
||||
}
|
||||
else {
|
||||
item.RectificationRate = "0%";
|
||||
MonthsCountstring= Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(item.TotationRate))
|
||||
{
|
||||
ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
|
||||
}
|
||||
else {
|
||||
item.TotationRate = "0%";
|
||||
ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
|
||||
}
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.RectificationRate.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.TotationRate.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2330,7 +2339,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2387,7 +2396,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.TotalNoBackCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2443,7 +2452,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.TotalNoBackCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2500,7 +2509,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2566,7 +2575,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2621,7 +2630,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2674,7 +2683,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2728,7 +2737,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex18_1.ToString(), doc, table18_1.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex18_1.ToString(), doc, table18_1.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.UnitId, doc, table18_1.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProblemDesrioption, doc, table18_1.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.TreatmentMeasures, doc, table18_1.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2765,7 +2774,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex18_2.ToString(), doc, table18_2.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex18_2.ToString(), doc, table18_2.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.UnitId, doc, table18_2.FirstRow.Cells[1].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.ProblemDesrioption, doc, table18_2.FirstRow.Cells[2].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(item.TreatmentMeasures, doc, table18_2.FirstRow.Cells[3].CellFormat.Width));
|
||||
|
@ -2803,7 +2812,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
//创建行
|
||||
Row row = new Row(doc);
|
||||
row.Cells.Add(CreateCell(numberIndex19.ToString(), doc, table19.FirstRow.Cells[0].CellFormat.Width));
|
||||
row.Cells.Add(CreateCell(numberIndex19.ToString(), doc, table19.FirstRow.Cells[0].CellFormat.Width, "", "1"));
|
||||
row.Cells.Add(CreateCell(item.NextQualityControlContent, doc, table19.FirstRow.Cells[1].CellFormat.Width));
|
||||
table19.Rows.Insert(numberIndex19, row);
|
||||
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
PK
|
||||
|