From 712e52a614543c8bcc63c283496c1c04d52de2c4 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 24 Apr 2023 09:59:56 +0800 Subject: [PATCH] 2023-04-24 --- SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs | 3 ++- .../Excel/DataIn/ContractStandingBookIn.xlsx | Bin 9454 -> 9528 bytes .../Filing/ContractStandingBookEdit.aspx | 10 +++++----- .../Filing/ContractStandingBookEdit.aspx.cs | 16 ++++++++++++++-- .../ContractStandingBookEdit.aspx.designer.cs | 4 ++-- 5 files changed, 23 insertions(+), 10 deletions(-) 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 933076e5db1745a514d14cbd95aa026ca4736d39..19f4a29bb4a8230d52dba006831957842b5012b3 100644 GIT binary patch delta 2207 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 - + + + @@ -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 控件。