diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs index cc33078..5666ba2 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs @@ -418,9 +418,10 @@ namespace FineUIPro.Web.Evaluation reportModel.GetRow(9).GetCell(6).SetCellValue(previous.Validate_Date.HasValue ? string.Format("{0:yyyy-MM-dd}", previous.Validate_Date) : "");//合同生效日 if (reportModel.GetRow(9).GetCell(8) == null) reportModel.GetRow(9).CreateCell(8); reportModel.GetRow(9).GetCell(8).SetCellValue(previous.Expire_Date.HasValue ? string.Format("{0:yyyy-MM-dd}", previous.Expire_Date) : "");//合同结束日 - } + } // 左边列表 + int s = 0; DateTime startDate = DateTime.Now.AddMonths(-23); DateTime startTime = DateTime.Parse(startDate.Year + "-" + startDate.Month + "-01"); DateTime endTime = DateTime.Parse(DateTime.Now.Year + "-" + DateTime.Now.Month + "-13"); @@ -436,7 +437,6 @@ namespace FineUIPro.Web.Evaluation DateTime dtime = DateTime.Now.AddMonths(-1); endTime = DateTime.Parse(dtime.Year + "-" + dtime.Month + "-13"); } - int s = 0; if (eva.IfExtend=="Y")//续签合同 { List yearToDateParam = new List(); @@ -606,16 +606,28 @@ namespace FineUIPro.Web.Evaluation } if (reportModel.GetRow(13).GetCell(5) == null) reportModel.GetRow(13).CreateCell(5); - reportModel.GetRow(13).GetCell(5).SetCellValue(eva.Enumeration); + reportModel.GetRow(13).GetCell(5).SetCellValue(eva.Enumeration);//有无其他潜在承包商？政府类，OEM？若有，请列举 if (reportModel.GetRow(17).GetCell(6) == null) reportModel.GetRow(17).CreateCell(6); - reportModel.GetRow(17).GetCell(6).SetCellValue(eva.PriceEvaluation1); + reportModel.GetRow(17).GetCell(6).SetCellValue(eva.PriceEvaluation1);//参照1 if (reportModel.GetRow(18).GetCell(6) == null) reportModel.GetRow(18).CreateCell(6); - reportModel.GetRow(18).GetCell(6).SetCellValue(eva.PriceEvaluation2); + reportModel.GetRow(18).GetCell(6).SetCellValue(eva.PriceEvaluation2);//参照2 + + //价格水平 + if (reportModel.GetRow(21).GetCell(6) == null) reportModel.GetRow(21).CreateCell(6); + reportModel.GetRow(21).GetCell(6).SetCellValue(eva.PriceLevel == "1" ? "☑" : "□");//很高 + if (reportModel.GetRow(22).GetCell(6) == null) reportModel.GetRow(22).CreateCell(6); + reportModel.GetRow(22).GetCell(6).SetCellValue(eva.PriceLevel == "2" ? "☑" : "□");//较高 + if (reportModel.GetRow(23).GetCell(6) == null) reportModel.GetRow(23).CreateCell(6); + reportModel.GetRow(23).GetCell(6).SetCellValue(eva.PriceLevel == "3" ? "☑" : "□");//适宜 + if (reportModel.GetRow(24).GetCell(6) == null) reportModel.GetRow(24).CreateCell(6); + reportModel.GetRow(24).GetCell(6).SetCellValue(eva.PriceLevel == "4" ? "☑" : "□");//较低 + if (reportModel.GetRow(25).GetCell(6) == null) reportModel.GetRow(25).CreateCell(6); + reportModel.GetRow(25).GetCell(6).SetCellValue(eva.PriceLevel == "5" ? "☑" : "□");//很低 if (reportModel.GetRow(27).GetCell(2) == null) reportModel.GetRow(27).CreateCell(2); reportModel.GetRow(27).GetCell(2).SetCellValue(eva.InterviewTimes.ToString());//约谈次数 if (reportModel.GetRow(27).GetCell(5) == null) reportModel.GetRow(27).CreateCell(5); - reportModel.GetRow(27).GetCell(5).SetCellValue("");//原合同竞标/续签过程回顾 + reportModel.GetRow(27).GetCell(5).SetCellValue(eva.ReviewOfFC);//原合同竞标/续签过程回顾 if (reportModel.GetRow(30).GetCell(2) == null) reportModel.GetRow(30).CreateCell(2); reportModel.GetRow(30).GetCell(2).SetCellValue(eva.NCRTimes.ToString());//NCR次数 if (reportModel.GetRow(33).GetCell(2) == null) reportModel.GetRow(33).CreateCell(2); @@ -633,12 +645,12 @@ namespace FineUIPro.Web.Evaluation if (reportModel.GetRow(38).GetCell(2) == null) reportModel.GetRow(38).CreateCell(2); reportModel.GetRow(38).GetCell(2).SetCellValue(eva.RedTimes.ToString());//红区次数 if (reportModel.GetRow(38).GetCell(3) == null) reportModel.GetRow(38).CreateCell(3); - reportModel.GetRow(38).GetCell(3).SetCellValue(eva.NotAudit);//不在审计清单 + reportModel.GetRow(38).GetCell(3).SetCellValue(eva.NotAudit == "√" ? "☑" : "□");//不在审计清单 //41行 if (reportModel.GetRow(40).GetCell(3) == null) reportModel.GetRow(40).CreateCell(3); reportModel.GetRow(40).GetCell(3).SetCellValue(eva.OthersNum.ToString());//其他 //43行 - decimal? technicalBonusMalus = eva.TechnicalBonusMalus.HasValue ? Convert.ToDecimal(eva.TechnicalBonusMalus) : 0; + decimal? technicalBonusMalus = eva.TechnicalBonusMalus.HasValue ? Convert.ToDecimal(eva.TechnicalBonusMalus.Value.ToString("0.0")) : 0; if (reportModel.GetRow(42).GetCell(3) == null) reportModel.GetRow(42).CreateCell(3); reportModel.GetRow(42).GetCell(3).SetCellValue(technicalBonusMalus.ToString()+"%");//技术减值 //44行 @@ -649,7 +661,7 @@ namespace FineUIPro.Web.Evaluation safetyBonus = 0; } if (reportModel.GetRow(43).GetCell(3) == null) reportModel.GetRow(43).CreateCell(3); - reportModel.GetRow(43).GetCell(3).SetCellValue(safetyBonus.HasValue ? safetyBonus.ToString() + "%" : "0");//安全业绩加值 + reportModel.GetRow(43).GetCell(3).SetCellValue(safetyBonus.HasValue ? safetyBonus.Value.ToString("0.0") + "%" : "0");//安全业绩加值 //45行 decimal? totalSocre = technicalBonusMalus + safetyBonus; if (reportModel.GetRow(44).GetCell(3) == null) reportModel.GetRow(44).CreateCell(3); @@ -670,10 +682,14 @@ namespace FineUIPro.Web.Evaluation { rs = "序号1：该合同累计三个NCR提前终止合同且不得参与下轮合同"; } - if (!string.IsNullOrEmpty(eva.Proposed)) + if (!string.IsNullOrEmpty(eva.Proposed) && !string.IsNullOrEmpty(rs)) { proposed = rs + "\r\n" + eva.Proposed; } + else if (!string.IsNullOrEmpty(eva.Proposed) && string.IsNullOrEmpty(rs)) + { + proposed = eva.Proposed; + } else { proposed = rs; diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx index 2f07958..9469e3b 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx @@ -103,7 +103,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -297,7 +297,7 @@ - + diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs index 167d9af..0c2b4a3 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs @@ -119,7 +119,7 @@ namespace FineUIPro.Web.Evaluation } // 框架合同信息 - + txtSpending_commitment.Text = foview.First().Spending_commitment.ToString(); txtForecasted.Text = foview.First().Forecasted.ToString(); txtTotal.Text = foview.First().Total.ToString(); @@ -222,7 +222,7 @@ namespace FineUIPro.Web.Evaluation SqlParameter[] yearToDateParList2 = yearToDateParam2.ToArray(); var sesDataTable2 = SQLHelper.GetDataTableRunProc("Sp_ContractorEvaluation", yearToDateParList2); - + sesDataTable.Merge(sesDataTable2); } } @@ -238,15 +238,15 @@ namespace FineUIPro.Web.Evaluation if (j >= 0 && j < 12) { Grid1.Rows[0].Values[j + 1] = curDate.ToString("yyyy-MM"); - if (j == 0) - { - Grid1.Rows[0].Values[j] = "1st Year"; - Grid1.Rows[1].Values[j] = ""; - Grid1.Rows[2].Values[j] = "2st Year"; - Grid1.Rows[3].Values[j] = ""; - } - else - { + //if (j == 0) + //{ + Grid1.Rows[0].Values[0] = "1st Year"; + Grid1.Rows[1].Values[0] = ""; + Grid1.Rows[2].Values[0] = "2st Year"; + Grid1.Rows[3].Values[0] = ""; + //} + //else + //{ if (sesDataScore.Count(p => p.dataMonth == curDate.ToString("yyyy-MM")) > 0 && Funs.GetNewDecimal(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore) > 0) { var yearNums = float.Parse(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore).ToString("0.##"); @@ -267,7 +267,7 @@ namespace FineUIPro.Web.Evaluation { Grid1.Rows[1].Values[j + 1] = ""; } - } + //} } if (j >= 12 && j < 24) @@ -321,16 +321,16 @@ namespace FineUIPro.Web.Evaluation if (j >= 0 && j < 12) { Grid1.Rows[0].Values[j + 1] = curDate.ToString("yyyy-MM"); - if (j == 0) - { - Grid1.Rows[0].Values[j] = "1st Year"; - Grid1.Rows[1].Values[j] = ""; - Grid1.Rows[2].Values[j] = "2st Year"; - Grid1.Rows[3].Values[j] = ""; - } - else - { - if (sesDataScore.Count(p => p.dataMonth == curDate.ToString("yyyy-MM")) > 0 && Funs.GetNewDecimal(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore) > 0) + //if (j == 0) + //{ + Grid1.Rows[0].Values[0] = "1st Year"; + Grid1.Rows[1].Values[0] = ""; + Grid1.Rows[2].Values[0] = "2st Year"; + Grid1.Rows[3].Values[0] = ""; + //} + //else + //{ + if (sesDataScore.Count(p => p.dataMonth == curDate.ToString("yyyy-MM")) > 0 && Funs.GetNewDecimal(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore) > 0) { var yearNums = float.Parse(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore).ToString("0.##"); Grid1.Rows[1].Values[j + 1] = yearNums; @@ -343,7 +343,7 @@ namespace FineUIPro.Web.Evaluation { Grid1.Rows[1].Values[j + 1] = ""; } - } + //} } if (j >= 12 && j < 24) @@ -378,10 +378,14 @@ namespace FineUIPro.Web.Evaluation { rs = "序号1：该合同累计三个NCR提前终止合同且不得参与下轮合同"; } - if (!string.IsNullOrEmpty(foview.First().Proposed)) + if (!string.IsNullOrEmpty(foview.First().Proposed) && !string.IsNullOrEmpty(rs)) { txtProposed.Text = rs + "\r\n" + foview.First().Proposed; } + else if (!string.IsNullOrEmpty(foview.First().Proposed) && string.IsNullOrEmpty(rs)) + { + txtProposed.Text = foview.First().Proposed; + } else { txtProposed.Text = rs; diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs index 998d788..c9eeaf6 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs @@ -471,7 +471,7 @@ namespace FineUIPro.Web.Evaluation /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtTechnicalBonus; + protected global::FineUIPro.NumberBox txtTechnicalBonus; /// /// txtProposed 控件。 diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user index accb770..fcf3204 100644 --- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - Release|Any CPU + Debug|Any CPU true diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx index 3fac8bb..fcd11d5 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx @@ -23,16 +23,16 @@ - + - + - - + + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs index b23b5f0..abef95a 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Org.BouncyCastle.Asn1.Cmp; using System; using System.Collections.Generic; using System.Linq; @@ -87,9 +88,9 @@ namespace FineUIPro.Web.SES } } this.txtAuditDate.Text = file.AuditDate.HasValue ? string.Format("{0:yyyy-MM-dd}", file.AuditDate) : ""; - if (!string.IsNullOrEmpty(file.AuditResult)) + if (!string.IsNullOrEmpty(file.AuditResult.Trim())) { - this.drpAuditResult.SelectedValue = file.AuditResult; + this.drpAuditResult.SelectedValue = file.AuditResult.Trim(); } } } @@ -146,6 +147,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { + if (this.drpAuditResult.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择审计结果！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/WebApi/WebApi.csproj.user b/FCL/WebApi/WebApi.csproj.user index 643f3e5..ca0d73e 100644 --- a/FCL/WebApi/WebApi.csproj.user +++ b/FCL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU