diff --git a/HJGL/BLL/Common/MailHelper.cs b/HJGL/BLL/Common/MailHelper.cs index e789553..97a413f 100644 --- a/HJGL/BLL/Common/MailHelper.cs +++ b/HJGL/BLL/Common/MailHelper.cs @@ -1,9 +1,13 @@ using BLL; using Model; +using Org.BouncyCastle.Bcpg.OpenPgp; using System; using System.Collections.Generic; using System.Linq; using System.Net.Mail; +using System.Web; +using System.Web.Mail; + namespace FineUIPro.Web.common { public class MailHelper @@ -123,6 +127,15 @@ namespace FineUIPro.Web.common if(mailCC!=null &&mailCC.Length>0) mail.Cc = string.Join(",", mailCC); + if (!string.IsNullOrEmpty(mailAttch)) + { + string[] arr = mailAttch.Split(','); + for (int i = 0; i < arr.Length; i++) + { + + mail.Attachments.Add(new System.Web.Mail.MailAttachment(@arr[i])); + } + } mail.Fields.Add("http://schemas.microsoft.com/cdo/configuration/smtpauthenticate", "1"); mail.Fields.Add("http://schemas.microsoft.com/cdo/configuration/sendusername", ps.EmailYx); mail.Fields.Add("http://schemas.microsoft.com/cdo/configuration/sendpassword", ps.EmailPass); diff --git a/HJGL/FineUIPro.Web/File/OfficeControl.rar b/HJGL/FineUIPro.Web/File/OfficeControl.rar deleted file mode 100644 index 06623f5..0000000 Binary files a/HJGL/FineUIPro.Web/File/OfficeControl.rar and /dev/null differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx index fbbc75f..527447b 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx @@ -9,164 +9,185 @@ font-weight: bold; color: red; } - +