diff --git a/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj b/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj index 8d048742..bf956823 100644 --- a/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj +++ b/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj @@ -19,7 +19,6 @@ - @@ -39,6 +38,7 @@ + diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index 2c21f25e..9e201fdf 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -1692,12 +1692,9 @@ namespace AMESCoreStudio.Web.Controllers int extension = 1; Dictionary param = new Dictionary(); var localReport = GetReprot(inhouseNo, seqID); - var result = localReport.Result.Execute(RenderType.Excel, extension, param, mimeType); - return File(result.MainStream, "application/msexcel", "Export.xls"); - //return File(result.MainStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Export.xlsx"); - - - + var result = localReport.Result.Execute(RenderType.ExcelOpenXml, extension, param, mimeType); + //return File(result.MainStream, "application/msexcel", "Export.xls"); + return File(result.MainStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Export.xlsx"); //return File(result.MainStream, "application/msexcel", "Export.xls"); } diff --git a/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/ADMIN.png b/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/ADMIN.png index 530cef17..418de4b7 100644 Binary files a/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/ADMIN.png and b/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/ADMIN.png differ diff --git a/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/胡俊忠.png b/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/胡俊忠.png new file mode 100644 index 00000000..7523d3f4 Binary files /dev/null and b/AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/胡俊忠.png differ