diff --git a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
index 0fb1935..3afe246 100644
--- a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
+++ b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
@@ -1077,7 +1077,7 @@ namespace FineUIPro.Web.Evaluation
Funs.DB.FC_NoEvaluatedUser.DeleteAllOnSubmit(deNoEva);
Funs.DB.SubmitChanges();
- var departEva = (from x in Funs.DB.FC_BigDepartEvaRate where x.ReportMonth == txtStartTime.Text select x).ToList();
+ var departEva = (from x in Funs.DB.FC_BigDepartEvaRate select x).ToList();
Funs.DB.FC_BigDepartEvaRate.DeleteAllOnSubmit(departEva);
Funs.DB.SubmitChanges();
@@ -1088,7 +1088,7 @@ namespace FineUIPro.Web.Evaluation
DateTime eTime = DateTime.Parse(mindate.Value.Year.ToString() + "-" + mindate.Value.Month.ToString() + "-13");
- #region
+ #region 提取常规框架承包商绩效
for (int j = 0; j < toDiff; j++)
{
percentIn[UserId] = (int)(100 * (j + 1) / (toDiff * 6));
diff --git a/FCL/FineUIPro.Web/File/Excel/FC_list.xlsx b/FCL/FineUIPro.Web/File/Excel/FC_list.xlsx
index 4981904..723fdd6 100644
Binary files a/FCL/FineUIPro.Web/File/Excel/FC_list.xlsx and b/FCL/FineUIPro.Web/File/Excel/FC_list.xlsx differ
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx
index 81d929d..1d4fccd 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx
@@ -87,7 +87,7 @@
-
@@ -409,7 +409,7 @@
FieldType="String" HeaderText="Exceed limit(day)" HeaderTextAlign="Center">
-
@@ -422,7 +422,7 @@
-
+ --%>
<%--
@@ -939,7 +939,7 @@
-
+
@@ -987,7 +987,7 @@
-
+
@@ -1035,7 +1035,7 @@
-
+
@@ -1083,7 +1083,7 @@
-
+
@@ -1131,7 +1131,7 @@
-
+
@@ -1179,7 +1179,7 @@
-
+
@@ -1227,7 +1227,7 @@
-
+
@@ -1275,7 +1275,7 @@
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
index ed2e378..5a7a060 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
@@ -1354,10 +1354,14 @@ namespace FineUIPro.Web.SES
//Connected Transaction
if (reportModel.GetRow(rowIndex).GetCell(27) == null) reportModel.GetRow(rowIndex).CreateCell(27);
reportModel.GetRow(rowIndex).GetCell(27).SetCellValue(itemOver.Connectedtransaction);
- //Checked Value
+ //Exceed limit(day)
if (reportModel.GetRow(rowIndex).GetCell(28) == null) reportModel.GetRow(rowIndex).CreateCell(28);
- reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver.CheckedValue != null ? (double)itemOver.CheckedValue.Value : 0);
- reportModel.GetRow(rowIndex).GetCell(28).CellStyle = styleQfw;
+ reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver.ExceedLimit.HasValue ? itemOver.ExceedLimit.ToString() : "");
+
+ //Checked Value
+ //if (reportModel.GetRow(rowIndex).GetCell(28) == null) reportModel.GetRow(rowIndex).CreateCell(28);
+ //reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver.CheckedValue != null ? (double)itemOver.CheckedValue.Value : 0);
+ //reportModel.GetRow(rowIndex).GetCell(28).CellStyle = styleQfw;
////Remaining Budget
//if (reportModel.GetRow(rowIndex).GetCell(29) == null) reportModel.GetRow(rowIndex).CreateCell(29);
//reportModel.GetRow(rowIndex).GetCell(29).SetCellValue(itemOver.RemainingBudget != null ? (double)itemOver.RemainingBudget.Value : 0);
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs
index f453580..d2b5805 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs
@@ -590,15 +590,6 @@ namespace FineUIPro.Web.SES
///
protected global::FineUIPro.DropDownList DropDownList27;
- ///
- /// DropDownList28 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList DropDownList28;
-
///
/// DropDownList31 控件。
///
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx
index 9662ea3..ec9f52a 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs
index 36d2ffe..4e0971e 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx
index 0a04b15..f5d5516 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs
index 1c4459b..223ca7a 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx
index 606a44c..c04be2c 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs
index 79d0e7c..c10fc3f 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx
index 193841d..c89318a 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs
index 560e912..6d53b63 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx
index 9097671..3eed44f 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs
index 72567e9..2d36049 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx
index 40a55ea..dd8f014 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs
index 97b6ade..c234a26 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx
index b3a242a..de1c359 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs
index 6e38fef..e895835 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx
index 5bb5d00..d4c2be4 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx
@@ -17,14 +17,14 @@
<%----%>
-
+
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs
index a0a054e..443f7b5 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs
@@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES
///
protected void btnSave_Click(object sender, EventArgs e)
{
- //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null)
- //{
- // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning);
- // return;
- //}
+ if (this.drpBycDept.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择BYC负责部门！", 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/FineUIPro.Web/SES/SESRelatedDataEdit.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
index 6093785..4595bd9 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
@@ -137,19 +137,11 @@
-
+ <%----%>
-
-
-
-
-
-
-
-
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
index 4647a86..6d1fa7a 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
@@ -211,7 +211,7 @@ namespace FineUIPro.Web.SES
{
this.drpConnectedTransaction.SelectedValue = data.ConnectedTransaction;
}
- this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString();
+ //this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString();
//this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString();
txtNumExceedLimit.Text = data.ExceedLimit != null ? data.ExceedLimit.Value.ToString() : "";
@@ -379,7 +379,7 @@ namespace FineUIPro.Web.SES
{
this.drpConnectedTransaction.SelectedValue = data.ConnectedTransaction;
}
- this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString();
+ //this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString();
//this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString();
txtNumExceedLimit.Text = data.ExceedLimit != null ? data.ExceedLimit.Value.ToString() : "";
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs
index 1d70741..b894269 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs
@@ -419,15 +419,6 @@ namespace FineUIPro.Web.SES
///
protected global::FineUIPro.TextBox txtMainHeadContact;
- ///
- /// txtCheckedValue 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.NumberBox txtCheckedValue;
-
///
/// txtSafetyOfficer 控件。
///
@@ -464,33 +455,6 @@ namespace FineUIPro.Web.SES
///
protected global::FineUIPro.TextBox txtProjectManagerContact;
- ///
- /// Label1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label1;
-
- ///
- /// Label2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label2;
-
- ///
- /// Label3 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label3;
-
///
/// txtRemark 控件。
///