2023-04-24

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);

SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx

@@ -177,9 +177,13 @@
                                                         <f:Panel ID="Panel17" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
                                                             <Items>
                                                                 <f:Label runat="server" ID="Label" Text=" " LabelAlign="Right" Width="140px"></f:Label>
-                                                                <f:Button ID="btnAttachUrl" Text="上传合同文件" ToolTip="附件" Icon="TableCell" runat="server"
+                                                                <f:Button ID="btnAttachUrl" Text="合同签字盖章扫描版文件" ToolTip="附件" Icon="TableCell" runat="server"
                                                                     OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
                                                                 </f:Button>
+                                                                <f:Button ID="btnAttachUrl_1" Text="合同评审及审批表" ToolTip="附件" Icon="TableCell" runat="server"
+                                                                    OnClick="btnAttachUrl_1_Click" ValidateForms="SimpleForm1">
+                                                                </f:Button>
+                                                                
                                                             </Items>
                                                         </f:Panel>
                                                     </Items>
@@ -187,10 +191,6 @@
                                                 
                                                 
                                             </Rows>
-                                            <Toolbars>
-                                                <f:Toolbar ID="Toolbar5" Position="Bottom" ToolbarAlign="Right" runat="server">
-                                                </f:Toolbar>
-                                            </Toolbars>
                                         </f:Form>
 
                                     </Items>

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);

SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBookEdit.aspx.designer.cs

@@ -411,13 +411,13 @@ namespace FineUIPro.Web.PHTGL.Filing
         protected global::FineUIPro.Button btnAttachUrl;
 
         /// <summary>
-        /// Toolbar5 控件。
+        /// btnAttachUrl_1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar5;
+        protected global::FineUIPro.Button btnAttachUrl_1;
 
         /// <summary>
         /// Toolbar2 控件。