1、logo调整
2、质量管理NCR管理补充字段问题原因分析
This commit is contained in:
@@ -29,14 +29,14 @@ namespace FineUIPro.Web.Comprehensive
|
||||
}
|
||||
public void BindGrid()
|
||||
{
|
||||
string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
|
||||
string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,C.ReasonAnalysis,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
|
||||
C.ClosedDate, C.CompleteDate, C.ResponsibleMan, C.AttachUrl, C.ImplementationFrontState,C.Supervisor,
|
||||
C.CompileMan, C.UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode,su.UserName as SupervisorName
|
||||
from Comprehensive_NCRManagement C
|
||||
left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
|
||||
left join Base_Unit u on u.UnitId = C.SendUnit
|
||||
left join Sys_User su on su.UserId = C.Supervisor
|
||||
where C.ProjectId = @ProjectId";
|
||||
where C.ProjectId = @ProjectId ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
if (sdrpUnitId.SelectedValue != BLL.Const._Null)
|
||||
@@ -469,13 +469,17 @@ namespace FineUIPro.Web.Comprehensive
|
||||
|
||||
cell = row.CreateCell(6);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.Measure);//改进措施
|
||||
cell.SetCellValue(item.ReasonAnalysis);//问题原因分析
|
||||
|
||||
cell = row.CreateCell(7);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.Measure);//改进措施
|
||||
|
||||
cell = row.CreateCell(8);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
|
||||
|
||||
cell = row.CreateCell(8);
|
||||
cell = row.CreateCell(9);
|
||||
cell.CellStyle = cellStyle;
|
||||
string receiveUnitName = string.Empty;
|
||||
if (!string.IsNullOrEmpty(item.ReceiveUnit))
|
||||
@@ -484,7 +488,7 @@ namespace FineUIPro.Web.Comprehensive
|
||||
}
|
||||
cell.SetCellValue(receiveUnitName);//接收单位
|
||||
|
||||
cell = row.CreateCell(9);
|
||||
cell = row.CreateCell(10);
|
||||
cell.CellStyle = cellStyle;
|
||||
string state = string.Empty;
|
||||
if (!string.IsNullOrEmpty(item.ImplementationFrontState))
|
||||
@@ -493,19 +497,19 @@ namespace FineUIPro.Web.Comprehensive
|
||||
}
|
||||
cell.SetCellValue(state);//实施状态
|
||||
|
||||
cell = row.CreateCell(10);
|
||||
cell = row.CreateCell(11);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
|
||||
|
||||
cell = row.CreateCell(11);
|
||||
cell = row.CreateCell(12);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
|
||||
|
||||
cell = row.CreateCell(12);
|
||||
cell = row.CreateCell(13);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.ResponsibleMan);//责任人
|
||||
|
||||
cell = row.CreateCell(13);
|
||||
cell = row.CreateCell(14);
|
||||
cell.CellStyle = cellStyle;
|
||||
string supervisorName = string.Empty;
|
||||
if (!string.IsNullOrEmpty(item.Supervisor))
|
||||
@@ -514,7 +518,7 @@ namespace FineUIPro.Web.Comprehensive
|
||||
}
|
||||
cell.SetCellValue(supervisorName);//监督人
|
||||
|
||||
cell = row.CreateCell(14);
|
||||
cell = row.CreateCell(15);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号
|
||||
|
||||
|
||||
Reference in New Issue
Block a user