diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs index 61f82bad..8f69c8ea 100644 --- a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs @@ -13,7 +13,8 @@ namespace FineUIPro.Web.AttachFile this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); var url = Request.Params["fileUrl"]; - var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src="; + // var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src="; + var Baseurl = "https://view.xdocin.com/view?src="; var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, ""); var newurl = ""; var FiletExtension = Path.GetExtension(url); diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/ContractStandingBookIn.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/ContractStandingBookIn.xlsx index 933076e5..19f4a29b 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/ContractStandingBookIn.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/ContractStandingBookIn.xlsx differ diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx index 7faf67a6..1c0310f6 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx @@ -177,9 +177,13 @@ - + + + @@ -187,10 +191,6 @@ - - - - diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.cs index 141ae567..92135f59 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.cs @@ -153,7 +153,14 @@ namespace FineUIPro.Web.PHTGL.Filing } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ContractStandingBook&menuId={1}", this.ContractId, BLL.Const.ContractStandingBookMenuId))); } - + protected void btnAttachUrl_1_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(ContractId)) + { + ContractId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ContractStandingBook&menuId={1}", this.ContractId+"-1", BLL.Const.ContractStandingBookMenuId))); + } #endregion protected void btnSave_Click(object sender, EventArgs e) @@ -254,7 +261,12 @@ namespace FineUIPro.Web.PHTGL.Filing { if (!BLL.AttachFileService.Getfile(ContractId , BLL.Const.ContractStandingBookMenuId)) { - ShowNotify("未上传合同文件,无法提交!", MessageBoxIcon.Warning); + ShowNotify("未上传合同签字盖章扫描版文件,无法提交!", MessageBoxIcon.Warning); + return; + } + if (!BLL.AttachFileService.Getfile(this.ContractId + "-1", BLL.Const.ContractStandingBookMenuId)) + { + ShowNotify("未上传合同评审及审批表,无法提交!", MessageBoxIcon.Warning); return; } Save(Const.BtnSubmit); diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.designer.cs index 32e81017..6e5aee43 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.designer.cs @@ -411,13 +411,13 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.Button btnAttachUrl; /// - /// Toolbar5 控件。 + /// btnAttachUrl_1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar5; + protected global::FineUIPro.Button btnAttachUrl_1; /// /// Toolbar2 控件。