diff --git a/FCL/BLL/Common/Const.cs b/FCL/BLL/Common/Const.cs
index 672d5d5..fc72436 100644
--- a/FCL/BLL/Common/Const.cs
+++ b/FCL/BLL/Common/Const.cs
@@ -196,6 +196,71 @@ namespace BLL
public const string BtnTARManageView = "TARManageView";
public const string BtnViewAll = "ViewAll";
+
+ public const string BtnConTab1Add = "续签Add";
+ public const string BtnConTab1Modify = "续签Modify";
+ public const string BtnConTab1Delete = "续签Delete";
+ public const string BtnConTab1View = "续签View";
+
+ public const string BtnConTab2Add = "增补Add";
+ public const string BtnConTab2Modify = "增补Modify";
+ public const string BtnConTab2Delete = "增补Delete";
+ public const string BtnConTab2View = "增补View";
+
+ public const string BtnConTab3Add = "变更Add";
+ public const string BtnConTab3Modify = "变更Modify";
+ public const string BtnConTab3Delete = "变更Delete";
+ public const string BtnConTab3View = "变更View";
+
+ public const string BtnConTab4Add = "延续Add";
+ public const string BtnConTab4Modify = "延续Modify";
+ public const string BtnConTab4Delete = "延续Delete";
+ public const string BtnConTab4View = "延续View";
+
+ public const string BtnConTab5Add = "审计报告Add";
+ public const string BtnConTab5Modify = "审计报告Modify";
+ public const string BtnConTab5Delete = "审计报告Delete";
+ public const string BtnConTab5View = "审计报告View";
+
+ public const string BtnConTab6Add = "NCRAdd";
+ public const string BtnConTab6Modify = "NCRModify";
+ public const string BtnConTab6Delete = "NCRDelete";
+ public const string BtnConTab6View = "NCRView";
+
+ public const string BtnConTab7Add = "约谈Add";
+ public const string BtnConTab7Modify = "约谈Modify";
+ public const string BtnConTab7Delete = "约谈Delete";
+ public const string BtnConTab7View = "约谈View";
+
+ public const string BtnConTab8Add = "开工会Add";
+ public const string BtnConTab8Modify = "开工会Modify";
+ public const string BtnConTab8Delete = "开工会Delete";
+ public const string BtnConTab8View = "开工会View";
+
+ public const string BtnConTab9Add = "会议Add";
+ public const string BtnConTab9Modify = "会议Modify";
+ public const string BtnConTab9Delete = "会议Delete";
+ public const string BtnConTab9View = "会议View";
+
+ public const string BtnConTab10Add = "停工Add";
+ public const string BtnConTab10Modify = "停工Modify";
+ public const string BtnConTab10Delete = "停工Delete";
+ public const string BtnConTab10View = "停工View";
+
+ public const string BtnConTab11Add = "合同终止Add";
+ public const string BtnConTab11Modify = "合同终止Modify";
+ public const string BtnConTab11Delete = "合同终止Delete";
+ public const string BtnConTab11View = "合同终止View";
+
+ public const string BtnConTab12Add = "组织架构Add";
+ public const string BtnConTab12Modify = "组织架构Modify";
+ public const string BtnConTab12Delete = "组织架构Delete";
+ public const string BtnConTab12View = "组织架构View";
+
+ public const string BtnConTab13Add = "承包商Add";
+ public const string BtnConTab13Modify = "承包商Modify";
+ public const string BtnConTab13Delete = "承包商Delete";
+ public const string BtnConTab13View = "承包商View";
#endregion
#endregion
diff --git a/FCL/FineUIPro.Web/Global.asax.cs b/FCL/FineUIPro.Web/Global.asax.cs
index c07d7c1..9dd4113 100644
--- a/FCL/FineUIPro.Web/Global.asax.cs
+++ b/FCL/FineUIPro.Web/Global.asax.cs
@@ -46,7 +46,7 @@
}
- //自动发送邮件
+ //每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价
if ((DateTime.Now.Day == 2 || DateTime.Now.Day == 5 || DateTime.Now.Day == 8 || DateTime.Now.Day == 10))
{
System.Timers.Timer aTimer = new System.Timers.Timer();
@@ -961,7 +961,7 @@
#endregion
///
- /// 发送邮件
+ /// 每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价
///
///
///
diff --git a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
index 867001a..a36dc40 100644
--- a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.SES
private void BindGrid()
{
- string strSql = @"SELECT * FROM dbo.View_EMC_Punishment WHERE Flag='1' ";
+ string strSql = @"SELECT * FROM dbo.View_EMC_Punishment WHERE Flag='1' and DATEADD(year,1,PunishDate) >= GETDATE() ";
List listStr = new List();
if (!string.IsNullOrEmpty(this.txtFO_NO.Text.Trim()))
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
index 5a7a060..c343180 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
@@ -102,7 +102,7 @@ namespace FineUIPro.Web.SES
//var u = string.Join(",", sesdata.Where(p => p.User_Representative != null).Select(p => p.User_Representative).Distinct());
//var m = string.Join(",", sesdata.Where(p => p.Main_Coordinator != null).Select(p => p.Main_Coordinator).Distinct());
string cruUser = CurrUser.UserId;
- string strSql = @"SELECT * from View_FC_SESRelatedData WHERE 1=1 ";
+ string strSql = @"SELECT * from View_FC_SESRelatedData WHERE DATEADD(year,1,Expire_Date) >=GETDATE() ";
List listStr = new List();
@@ -2696,92 +2696,331 @@ namespace FineUIPro.Web.SES
{
TabSigned.Hidden = true;
}
-
- if (buttonList.Contains(BLL.Const.BtnManageAdd))
+ if (buttonList.Contains(BLL.Const.BtnConTab1Add))
{
this.btnAddFile3.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab2Add))
+ {
this.btnAddFile4.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab3Add))
+ {
this.btnAddFile5.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab4Add))
+ {
this.btnAddFile6.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab5Add))
+ {
this.btnAddFile7.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab6Add))
+ {
this.btnAddFile.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab7Add))
+ {
this.btnAddFile9.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab8Add))
+ {
this.btnAddFile10.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab9Add))
+ {
this.btnAddFile11.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab10Add))
+ {
this.btnAddFile12.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab11Add))
+ {
this.btnAddFile13.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab12Add))
+ {
this.btnAddFile14.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab13Add))
+ {
this.btnAddFile15.Hidden = false;
}
- if (buttonList.Contains(BLL.Const.BtnManageModify))
+
+ if (buttonList.Contains(BLL.Const.BtnConTab1Modify))
{
this.btnMenuEdit3.Hidden = false;
this.Grid3.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid3.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab2Modify))
+ {
this.btnMenuEdit4.Hidden = false;
this.Grid4.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid4.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab3Modify))
+ {
this.btnMenuEdit5.Hidden = false;
this.Grid5.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid5.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab4Modify))
+ {
this.btnMenuEdit6.Hidden = false;
this.Grid6.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid6.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab5Modify))
+ {
this.btnMenuEdit7.Hidden = false;
this.Grid7.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid7.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab6Modify))
+ {
this.btnMenuEdit8.Hidden = false;
this.Grid8.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid8.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab7Modify))
+ {
this.btnMenuEdit9.Hidden = false;
this.Grid9.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid9.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab8Modify))
+ {
this.btnMenuEdit10.Hidden = false;
this.Grid10.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid10.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab9Modify))
+ {
this.btnMenuEdit11.Hidden = false;
this.Grid11.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid11.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab10Modify))
+ {
this.btnMenuEdit12.Hidden = false;
this.Grid12.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid12.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab11Modify))
+ {
this.btnMenuEdit13.Hidden = false;
this.Grid13.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid13.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab12Modify))
+ {
this.btnMenuEdit14.Hidden = false;
this.Grid14.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid14.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab13Modify))
+ {
this.btnMenuEdit15.Hidden = false;
this.Grid15.EnableRowDoubleClickEvent = true;
}
else
{
- this.Grid3.EnableRowDoubleClickEvent = false;
- this.Grid4.EnableRowDoubleClickEvent = false;
- this.Grid5.EnableRowDoubleClickEvent = false;
- this.Grid6.EnableRowDoubleClickEvent = false;
- this.Grid7.EnableRowDoubleClickEvent = false;
- this.Grid8.EnableRowDoubleClickEvent = false;
- this.Grid9.EnableRowDoubleClickEvent = false;
- this.Grid10.EnableRowDoubleClickEvent = false;
- this.Grid11.EnableRowDoubleClickEvent = false;
- this.Grid12.EnableRowDoubleClickEvent = false;
- this.Grid13.EnableRowDoubleClickEvent = false;
- this.Grid14.EnableRowDoubleClickEvent = false;
this.Grid15.EnableRowDoubleClickEvent = false;
}
-
- if (buttonList.Contains(BLL.Const.BtnManageDelete))
+ if (buttonList.Contains(BLL.Const.BtnConTab1Delete))
{
this.btnMenuDelete3.Hidden = false;
- this.btnMenuDelete4.Hidden = false;
- this.btnMenuDelete5.Hidden = false;
- this.btnMenuDelete6.Hidden = false;
- this.btnMenuDelete7.Hidden = false;
- this.btnMenuDelete8.Hidden = false;
- this.btnMenuDelete9.Hidden = false;
- this.btnMenuDelete10.Hidden = false;
- this.btnMenuDelete11.Hidden = false;
- this.btnMenuDelete12.Hidden = false;
- this.btnMenuDelete13.Hidden = false;
- this.btnMenuDelete14.Hidden = false;
- this.btnMenuDelete15.Hidden = false;
}
- if (buttonList.Contains(BLL.Const.BtnManageView))
+ if (buttonList.Contains(BLL.Const.BtnConTab2Delete))
{
- TabManagement.Hidden = false;
+ this.btnMenuDelete4.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab3Delete))
+ {
+ this.btnMenuDelete5.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab4Delete))
+ {
+ this.btnMenuDelete6.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab5Delete))
+ {
+ this.btnMenuDelete7.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab6Delete))
+ {
+ this.btnMenuDelete8.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab7Delete))
+ {
+ this.btnMenuDelete9.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab8Delete))
+ {
+ this.btnMenuDelete10.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab9Delete))
+ {
+ this.btnMenuDelete11.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab10Delete))
+ {
+ this.btnMenuDelete12.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab11Delete))
+ {
+ this.btnMenuDelete13.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab12Delete))
+ {
+ this.btnMenuDelete14.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab13Delete))
+ {
+ this.btnMenuDelete5.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab1View))
+ {
+ Tab1.Hidden = false;
}
else
{
- TabManagement.Hidden = true;
+ Tab1.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab2View))
+ {
+ Tab2.Hidden = false;
+ }
+ else
+ {
+ Tab2.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab3View))
+ {
+ Tab3.Hidden = false;
+ }
+ else
+ {
+ Tab3.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab4View))
+ {
+ Tab4.Hidden = false;
+ }
+ else
+ {
+ Tab4.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab5View))
+ {
+ Tab5.Hidden = false;
+ }
+ else
+ {
+ Tab5.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab6View))
+ {
+ Tab6.Hidden = false;
+ }
+ else
+ {
+ Tab6.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab7View))
+ {
+ Tab7.Hidden = false;
+ }
+ else
+ {
+ Tab7.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab8View))
+ {
+ Tab8.Hidden = false;
+ }
+ else
+ {
+ Tab8.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab9View))
+ {
+ Tab9.Hidden = false;
+ }
+ else
+ {
+ Tab9.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab10View))
+ {
+ Tab10.Hidden = false;
+ }
+ else
+ {
+ Tab10.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab11View))
+ {
+ Tab11.Hidden = false;
+ }
+ else
+ {
+ Tab11.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab12View))
+ {
+ Tab12.Hidden = false;
+ }
+ else
+ {
+ Tab12.Hidden = true;
+ }
+ if (buttonList.Contains(BLL.Const.BtnConTab13View))
+ {
+ Tab13.Hidden = false;
+ }
+ else
+ {
+ Tab13.Hidden = true;
}
#endregion
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs
index 2e1ddd8..2191314 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs
@@ -173,6 +173,20 @@ namespace FineUIPro.Web.SES
BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "增加费用增补！");
ShowNotify("Save successfully!", MessageBoxIcon.Success);
}
+
+ //费用增补回写到Contract Budget中
+ var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id);
+ if (data != null)
+ {
+ //decimal? totalBudget = 0;
+ //var conMaLists = BLL.ContractManagementService.GetContractManagementByDataIdFileType(id, "2");
+ //foreach (var item in conMaLists)
+ //{
+ // totalBudget += item.TotalBudget;
+ //}
+ data.Actual_Budget = newContract.TotalBudget;
+ BLL.SESRelatedDataService.UpdateSESRelatedData(data);
+ }
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
index 4595bd9..6edfda6 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx
@@ -106,7 +106,7 @@
-
+
diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
index 6d1fa7a..68b0fc0 100644
--- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.SES
this.numProportion_of_FC_Definition.Text = "";
}
this.txtInitial_Budget.Text = data.InitialBudget.HasValue ? data.InitialBudget.Value.ToString() : "";
- this.txtActual_Budget.Text = data.Actual_Budget.HasValue ? data.Actual_Budget.Value.ToString() : "";
+ this.txtActual_Budget.Text = data.Actual_Budget.HasValue ? data.Actual_Budget.Value.ToString() : this.txtInitial_Budget.Text;
this.txtRemark.Text = data.Remark;
if (!string.IsNullOrEmpty(data.ConstRecords))
{