From d459af3dafd40e98c65336717ce55a1f20945614 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 17 Sep 2024 15:19:35 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E9=94=80=E5=94=AE=E5=94=AE=E5=90=8E=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=9A=E6=80=BB=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E9=9D=A2=E8=BF=99=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E6=B2=A1=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../afterSalesNotice/afterSalesNotice.html      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
index 54f79498..f6ae01e6 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
@@ -56,7 +56,7 @@
             </div>
 
             <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
+                <table id="bootstrap-table" style="white-space:nowrap"></table>
             </div>
         </div>
     </div>
@@ -83,6 +83,7 @@
                 cancelUrl: prefix + "/cancel/{id}",
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
+                showFooter: true,
                 modalName: "售后通知单",
                 columns: [{
                     checkbox: true
@@ -188,10 +189,24 @@
                     {
                         title: '物料数合计',
                         field: 'materialSum',
+                        footerFormatter: function (value) {
+                            var sum = 0;
+                            for (var i in value) {
+                                sum += parseFloat(value[i].materialSum) || 0;
+                            }
+                            return "总物料合计: " + sum;
+                        }
                     },
                     {
                         title: '数量合计',
                         field: 'enterpriseSum',
+                        footerFormatter: function (value) {
+                            var sum = 0;
+                            for (var i in value) {
+                                sum += parseFloat(value[i].enterpriseSum) || 0;
+                            }
+                            return "总数量合计: " + sum;
+                        }
                     },
                     {
                         title: '联系人',