From c3235a5d2bd25a80f13a09a61786aedd0a9d07bd Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 13 Sep 2024 15:56:46 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E3=80=81=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E6=80=BB=E4=BB=B7=EF=BC=88RMB=EF=BC=89=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7=EF=BC=88=E7=BE=8E?=
 =?UTF-8?q?=E5=85=83=EF=BC=89=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salesShippingInform.html                  | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
index 6267d49e..ee196812 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
@@ -83,7 +83,7 @@
 <!--                </div>-->
             </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>
@@ -113,6 +113,7 @@
                 cancelUrl: prefix + "/cancel/{id}",
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
+                showFooter: true,
                 modalName: "销售出货通知",
                 columns: [{
                     checkbox: true
@@ -173,23 +174,58 @@
                 {
                     title: '物料合计',
                     field: 'materialSum',
+                    footerFormatter: function (value) {
+                        var sum = 0;
+                        for (var i in value) {
+                            sum += parseFloat(value[i].materialSum);
+                        }
+                        return "总物料: " + sum;
+                    }
                 },
                 {
                     title: '数量合计',
                     field: 'enterpriseSum',
+                    footerFormatter: function (value) {
+                        var sum = 0;
+                        for (var i in value) {
+                            sum += parseFloat(value[i].enterpriseSum);
+                        }
+                        return "总数量: " + sum;
+                    }
                 },
 
                 {
-                    title: '不含税总价',
+                    title: '不含税总价(RMB)',
                     field: 'allPriceExcludingTaxRmb',
+                    footerFormatter: function (value) {
+                        var sum = 0;
+                        for (var i in value) {
+                            sum += parseFloat(value[i].allPriceExcludingTaxRmb);
+                        }
+                        return "总不含税总价: " + sum.toFixed(2);
+                    }
                 },
                 {
-                    title: '不含税总价',
+                    title: '不含税总价(美元)',
                     field: 'allPriceExcludingTaxDollar',
+                    footerFormatter: function (value) {
+                        var sum = 0;
+                        for (var i in value) {
+                            sum += parseFloat(value[i].allPriceExcludingTaxDollar);
+                        }
+                        return "总不含税总价: " + sum.toFixed(2);
+                    }
                 },
                 {
                     title: '含税总价',
                     field: 'allPriceIncludesTax',
+                    footerFormatter: function (value) {
+                        var sum = 0;
+                        for (var i in value) {
+                            sum += parseFloat(value[i].allPriceIncludesTax);
+                        }
+                        return "总含税总价: " + sum.toFixed(2);
+                    }
                 },
                 {
                     title: '计划交付时间',