shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250213 分包商报告

This commit is contained in:
毕文静 2025-02-13 14:47:54 +08:00
parent 03025b4f69
commit 2a569c1bfe
8 changed files with 72 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs
View File

@ -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<SqlParameter> yearToDateParam = new List<SqlParameter>();
@ -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;

6
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx
View File

@ -103,7 +103,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtReviewOfFC" runat="server" Label="Review of FC Bidding in the Past 原框架合同竞标过程回顾" LabelWidth="240px" Height="60px"></f:TextArea>
<f:TextArea ID="txtReviewOfFC" runat="server" Label="Review of FC Bidding in the Past</br>原框架合同竞标过程回顾" LabelWidth="240px" Height="60px"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
@ -265,7 +265,7 @@
<Rows>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSafetyBonus" runat="server" Label="Bonus of Safety Performance</br>安全业绩加分值（%）" LabelWidth="240px" NoNegative="true"></f:NumberBox>
<f:NumberBox ID="txtSafetyBonus" runat="server" Label="Bonus of Safety Performance</br>安全业绩加分值（%）" LabelWidth="240px" NoNegative="true" NoDecimal="false" RegionPercent="1"></f:NumberBox>
</Items>
</f:FormRow>
</Rows>
@ -297,7 +297,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtTechnicalBonus" runat="server" Label="Technical malus</br>技术减值（%）" LabelWidth="240px" Readonly="true"></f:TextBox>
<f:NumberBox ID="txtTechnicalBonus" runat="server" Label="Technical malus</br>技术减值（%）" LabelWidth="240px" Readonly="true" RegionPercent="1"></f:NumberBox>
</Items>
</f:FormRow>
</Rows>

52
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs
View File

@ -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;

2
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs generated
View File

@ -471,7 +471,7 @@ namespace FineUIPro.Web.Evaluation
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTechnicalBonus;
protected global::FineUIPro.NumberBox txtTechnicalBonus;
/// <summary>
/// txtProposed 控件。

2
FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>
</Use64BitIISExpress>

8
FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx
View File

@ -23,16 +23,16 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtType" runat="server" Label="承包商类型" LabelWidth="160px" Readonly="true">
<f:TextBox ID="txtType" runat="server" Label="承包商类型" LabelWidth="160px" Readonly="true" Required="true" ShowRedStar="true">
</f:TextBox>
<f:TextBox ID="txtContractor" runat="server" Label="承包商名称" MaxLength="200" LabelWidth="160px" Readonly="true">
<f:TextBox ID="txtContractor" runat="server" Label="承包商名称" MaxLength="200" LabelWidth="160px" Readonly="true" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtAuditDate" runat="server" Label="审计日期" LabelWidth="160px" EnableEdit="false"></f:DatePicker>
<f:DropDownList ID="drpAuditResult" runat="server" Label="审计结果" LabelWidth="160px" EnableEdit="false"></f:DropDownList>
<f:DatePicker ID="txtAuditDate" runat="server" Label="审计日期" LabelWidth="160px" EnableEdit="false" Required="true" ShowRedStar="true"></f:DatePicker>
<f:DropDownList ID="drpAuditResult" runat="server" Label="审计结果" LabelWidth="160px" EnableEdit="false" Required="true" ShowRedStar="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>

10
FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs
View File

@ -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
/// <param name="e"></param>
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();

2
FCL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>