diff --git a/FCL/FineUIPro.Web/AttachFile/fileupload.ashx.cs b/FCL/FineUIPro.Web/AttachFile/fileupload.ashx.cs index 48d4ee8..394830b 100644 --- a/FCL/FineUIPro.Web/AttachFile/fileupload.ashx.cs +++ b/FCL/FineUIPro.Web/AttachFile/fileupload.ashx.cs @@ -1,4 +1,6 @@ using Newtonsoft.Json.Linq; +using NPOI.HSSF.Record.Chart; +using Org.BouncyCastle.Asn1.Ocsp; using System; using System.Collections.Generic; using System.IO; diff --git a/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx.cs b/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx.cs index b6ce757..9728e84 100644 --- a/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx.cs +++ b/FCL/FineUIPro.Web/AttachFile/webuploader2.aspx.cs @@ -272,8 +272,34 @@ namespace FineUIPro.Web.AttachFile { attachUrl = attachUrl.Replace('/', '\\'); attachUrl = attachUrl.Substring(0, attachUrl.LastIndexOf(",")); - } + } var sour = from x in db.AttachFile where x.ToKeyId == ToKeyId select x; + + //合同管理附件名重复提醒 + if (MenuId == BLL.Const.SESRelatedDateMenuId) + { + string newName = attachUrl.Substring(attachUrl.LastIndexOf("\\")); + string n = newName.Substring(newName.IndexOf("_") + 1); + foreach (var item in sour) + { + if (item.AttachUrl.Contains(n)) + { + Alert.ShowInTop(n + "已存在!", MessageBoxIcon.Warning); + return; + } + } + string fc_id = Request.QueryString["fcid"]; + string fileTypeId = Request.QueryString["fileTypeId"]; + var conLists = from x in Funs.DB.FC_ContractManagement where x.FC_ID.ToString() == fc_id && x.FileTypeId == fileTypeId select x; + foreach (var item in conLists) + { + if (item.AttachUrl.Contains(n)) + { + Alert.ShowInTop(n + "已存在!", MessageBoxIcon.Warning); + return; + } + } + } if (sour.Count() == 0) { diff --git a/FCL/FineUIPro.Web/Global.asax.cs b/FCL/FineUIPro.Web/Global.asax.cs index 1622646..ed1ee52 100644 --- a/FCL/FineUIPro.Web/Global.asax.cs +++ b/FCL/FineUIPro.Web/Global.asax.cs @@ -87,7 +87,7 @@ } // 框架承包商评估表的填写邮件通知 - if (DateTime.Now.Hour == 11) + if (DateTime.Now.Hour == 15) { System.Timers.Timer aTimer = new System.Timers.Timer(); aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_FC_AutoSend); @@ -812,10 +812,25 @@ mailCode = mailCode + "|" + fo.Expire_Date.Value.ToShortDateString(); + //把CGP/S采购经理Purchasing Manager 改为fc list该合同的采购员buyer对应的部门leader + string deparatLeader = string.Empty; + if (!string.IsNullOrEmpty(fo.BuyerId)) + { + var bu = from x in Funs.DB.Sys_User where x.UserId == fo.BuyerId select x; + if (bu != null && !string.IsNullOrEmpty(bu.FirstOrDefault().DepartId)) + { + var de = from x in Funs.DB.Base_Depart where x.DepartId == bu.FirstOrDefault().DepartId select x; + if (de != null && !string.IsNullOrEmpty(de.FirstOrDefault().DepartLeader)) + { + deparatLeader = de.FirstOrDefault().DepartLeader; + } + } + } + var cc = from x in Funs.DB.Sys_User join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId where x.Email != null && x.Email != "" - && (y.RoleName == "CTE/D Manager" || y.RoleName == "Purchasing Manager" || y.RoleName == "CGP Director" || (y.RoleName== "CT Director" && x.DepartId== departId)) + && (y.RoleName == "CTE/D Manager" || x.UserId== deparatLeader || y.RoleName == "CGP Director" || (y.RoleName== "CT Director" && x.DepartId== departId)) select x; mailTo = userList.Select(x => x.Email).ToArray(); @@ -852,8 +867,8 @@ // 过期提示,30天范围 var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null - && x.Expire_Date.Value.AddMonths(-6).AddDays(-7).Date <= DateTime.Now.Date - && x.Expire_Date.Value.AddMonths(-5).AddDays(-7).Date >= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-6).AddDays(-7) <= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-5).AddDays(-7) >= DateTime.Now.Date select x; if (foList.Count() > 0) { diff --git a/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs b/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs index 302952a..8063e9c 100644 --- a/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs +++ b/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs @@ -226,11 +226,11 @@ namespace FineUIPro.Web.SES PunishmentId = string.Empty; } - if (BLL.PunishmentService.IsExistSES_NO(PunishmentId, this.txtSESNo.Text.Trim(), "1")) - { - Alert.ShowInTop("The Backcharge SES NO. already exists!"); - return; - } + //if (BLL.PunishmentService.IsExistSES_NO(PunishmentId, this.txtSESNo.Text.Trim(), "1")) + //{ + // Alert.ShowInTop("The Backcharge SES NO. already exists!"); + // return; + //} if (txtViolationRelatedSes.Text != string.Empty && drpFO_No.SelectedValue != Const._Null) { diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage1.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage1.aspx.cs index 9426168..6d19349 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage1.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage1.aspx.cs @@ -6,6 +6,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage1 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -36,6 +48,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; this.txtFileName.Text = file.FileName; if (!string.IsNullOrEmpty(file.UploadMan)) @@ -78,6 +91,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -180,7 +194,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "1"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs index 4e0971e..5f6482f 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage10 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "10"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs index 223ca7a..d7a097b 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage11 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "11"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs index c10fc3f..a495707 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage12 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "12"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs index 6d53b63..8594fe9 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage13 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "13"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs index 2191314..4077bce 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs @@ -11,6 +11,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage2 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -41,6 +53,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; this.txtFileName.Text = file.FileName; if (!string.IsNullOrEmpty(file.UploadMan)) @@ -85,6 +98,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -203,7 +217,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "2"))); } #endregion diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage3.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage3.aspx.cs index 2e678ab..9b698c5 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage3.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage3.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage3 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -40,6 +52,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; this.txtFileName.Text = file.FileName; if (!string.IsNullOrEmpty(file.UploadMan)) @@ -83,6 +96,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -197,7 +211,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "3"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage4.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage4.aspx.cs index 70b19c1..9c5fa06 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage4.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage4.aspx.cs @@ -11,6 +11,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage4 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -41,6 +53,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; this.txtFileName.Text = file.FileName; if (!string.IsNullOrEmpty(file.UploadMan)) @@ -84,6 +97,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -197,7 +211,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "4"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs index abef95a..1820d99 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage5.aspx.cs @@ -11,6 +11,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage5 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -46,6 +58,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; this.txtFileName.Text = file.FileName; if (!string.IsNullOrEmpty(file.UploadMan)) @@ -99,6 +112,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -228,7 +242,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "5"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs index 2d36049..8b640dd 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage6 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "6"))); } #endregion diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs index c234a26..ec8a719 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage7 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "7"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs index e895835..fa1392a 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage8 :PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "8"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs index 443f7b5..74f6fc1 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs @@ -10,6 +10,18 @@ namespace FineUIPro.Web.SES { public partial class SESRelatedDataContractManage9 : PageBase { + public string FC_ID + { + get + { + return (string)ViewState["FC_ID"]; + } + set + { + ViewState["FC_ID"] = value; + } + } + #region 加载 /// /// 加载页面 @@ -42,6 +54,7 @@ namespace FineUIPro.Web.SES Model.FC_ContractManagement file = BLL.ContractManagementService.GetContractManagementById(fileId); if (file != null) { + this.FC_ID = file.FC_ID.ToString(); this.hdId.Text = file.FileId; //if (!string.IsNullOrEmpty(file.FileTypeId)) //{ @@ -93,6 +106,7 @@ namespace FineUIPro.Web.SES string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { + this.FC_ID = id; var data = BLL.SESRelatedDataService.GetSESRelatedDataById(id); if (data != null) { @@ -205,7 +219,7 @@ namespace FineUIPro.Web.SES { this.hdId.Text = SQLHelper.GetNewID(typeof(Model.FC_ContractManagement)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/SESRelatedData/ContractManagement&menuId={1}&fcid={2}&fileTypeId={3}", this.hdId.Text, BLL.Const.SESRelatedDateMenuId, this.FC_ID, "9"))); } #endregion } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx index 6edfda6..6b16ba5 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx @@ -104,7 +104,7 @@ - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs index 7548dec..67c9115 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs @@ -361,7 +361,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 = this.txtInitial_Budget.Text;//data.Actual_Budget.HasValue ? data.Actual_Budget.Value.ToString() : ""; this.txtRemark.Text = data.Remark; if (!string.IsNullOrEmpty(data.ConstRecords)) { @@ -741,5 +741,13 @@ namespace FineUIPro.Web.SES } } #endregion + + protected void txtInitial_Budget_TextChanged(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.txtInitial_Budget.Text.Trim())) + { + this.txtActual_Budget.Text = this.txtInitial_Budget.Text.Trim(); + } + } } } \ No newline at end of file