From 016854476b74d9802e2e5de095b0f3f3b1fe76d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Sat, 10 Aug 2024 11:18:47 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=94=AE=E5=90=8E=E5=AE=A2=E8=AF=89=E9=80=9A=E7=9F=A5=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E8=AF=89=E9=80=9A=E7=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8C=89=E9=92=AE=E7=BB=91=E5=AE=9A=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E5=92=8C=E5=AF=BC=E5=87=BA=E5=A4=9A=E9=80=89=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E5=AE=A2=E8=AF=89=E9=80=9A=E7=9F=A5=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B=20=E6=96=B0=E5=A2=9Econtroller=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=84=E7=90=86=E7=BC=96=E5=8F=B7=E9=9B=86?= =?UTF-8?q?=E5=90=88=E5=81=9A=E6=96=87=E4=BB=B6=E5=90=8D=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesComplaintNoticeController.java | 17 +++++- .../complaintNotice/complaintNotice.html | 53 ++++++++++++++++++- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesComplaintNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesComplaintNoticeController.java index 0f1d7e54..7dd189fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesComplaintNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesComplaintNoticeController.java @@ -68,7 +68,7 @@ public class AftersalesComplaintNoticeController extends BaseController */ @RequiresPermissions("aftersales:complaintNotice:export") @Log(title = "售后客诉通知单", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody public AjaxResult export(AftersalesComplaintNoticeDetail aftersalesComplaintNoticeDetail) { @@ -76,7 +76,20 @@ public class AftersalesComplaintNoticeController extends BaseController ExcelUtil util = new ExcelUtil(AftersalesComplaintNoticeDetail.class); return util.exportExcel(complaintNoticeDetails, "售后客诉通知单数据"); } - + /** + * 导出选中售后客诉通知单列表 + */ + @RequiresPermissions("aftersales:complaintNotice:export") + @Log(title = "售后客诉通知单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody String[] noticeCodes) + { + String noticeCodeString = String.join(",", noticeCodes); + List complaintNoticeDetails = complaintNoticeDetailService.selectDetailListByNoticeCodes(noticeCodes); + ExcelUtil util = new ExcelUtil(AftersalesComplaintNoticeDetail.class); + return util.exportExcel(complaintNoticeDetails, noticeCodeString); + } /** * 新增售后客诉通知单 */ diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/complaintNotice.html b/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/complaintNotice.html index 20886e1e..f8e263d2 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/complaintNotice.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/complaintNotice.html @@ -59,7 +59,7 @@ 添加客诉通知 - + 导出 @@ -166,6 +166,57 @@ $.modal.open("客诉通知单详情",url); } + function exportExcel(formId) { + var complaintNoticeCodes = []; + var selections = $("#bootstrap-table").bootstrapTable("getSelections"); + if(selections.length === 0){ + $.modal.confirm("确定导出所有客诉通知吗?", function() { + var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + var params = $("#bootstrap-table").bootstrapTable('getOptions'); + var dataParam = $("#" + currentId).serializeArray(); + dataParam.push({ "name": "orderByColumn", "value": params.sortName }); + dataParam.push({ "name": "isAsc", "value": params.sortOrder }); + $.modal.loading("正在导出数据,请稍后..."); + $.post(prefix + '/exportAll', dataParam, function(result) { + if (result.code == web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + }else { + //·拼接单号 + for(let i=0;i \ No newline at end of file