diff --git a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs index a69dfeb..5527c81 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs @@ -134,8 +134,8 @@ namespace ZR.Admin.WebApi.Controllers.System { var list = PostService.GetAll(); - string sFileName = ExportExcel(list, "syspost", "岗位"); - return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName }); + var result = ExportExcelMini(list, "post", "岗位列表"); + return ExportExcel(result.Item2, result.Item1); } } } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt index 72cfae3..ded7dbf 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt @@ -372,13 +372,9 @@ $if(replaceDto.ShowBtnExport) confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", + }).then(async () => { + await export${genTable.BusinessName}(queryParams); }) - .then(function () { - return export${genTable.BusinessName}(queryParams); - }) - .then((response) => { - this.download(response.data.path); - }); }, $end //展开/折叠操作 diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index f4f5d5a..211d22c 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -376,13 +376,9 @@ $if(replaceDto.ShowBtnExport) confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", + }).then(async () => { + await export${genTable.BusinessName}(queryParams); }) - .then(function () { - return export${genTable.BusinessName}(queryParams); - }) - .then((response) => { - this.download(response.data.path); - }); }, $end }, diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt index 8849f45..7d19a6f 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt @@ -249,13 +249,9 @@ $if(replaceDto.ShowBtnExport) confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", + }).then(async () => { + await export${genTable.BusinessName}(queryParams); }) - .then(function () { - return export${genTable.BusinessName}(queryParams); - }) - .then((response) => { - this.download(response.data.path); - }); }, $end },