From c62401f0797ac8f17cd2a675f6a713a183f60be4 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 16:25:56 +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=E4=BC=B0=E4=BB=B7=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=EF=BC=9A?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E9=A1=B5=E8=84=9A=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E4=BB=B7(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB?= =?UTF-8?q?)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(=E7=BE=8E?= =?UTF-8?q?=E5=85=83)=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E4=BB=B7(=E7=BE=8E=E5=85=83)=EF=BC=8C=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E8=BF=99=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=B2=A1=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E9=94=80=E5=94=AE=E5=94=AE=E5=90=8E=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8D=95=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E5=90=AF=E7=94=A8=E5=86=BB=E7=BB=93=E5=88=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=86=BB=E7=BB=93=E6=9C=80=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E5=92=8C=E6=9C=80=E5=8F=B3=E4=BE=A7=E4=B8=80=E5=88=97?= =?UTF-8?q?=EF=BC=8C=E5=90=AF=E7=94=A8=E9=A1=B5=E8=84=9A=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E4=B8=BA=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94=E5=A4=A7=E5=B0=8F=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=90=88=E8=AE=A1=EF=BC=8C=E4=B8=8A=E9=9D=A2=E8=BF=99=E4=BA=9B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A=E6=B2=A1=E5=80=BC?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA0=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../afterSalesNotice/afterSalesNotice.html | 4 ++ .../templates/sales/estimate/estimate.html | 51 +++++++++++++++++-- 2 files changed, 51 insertions(+), 4 deletions(-) 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 f6ae01e6..8404ec3a 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html +++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html @@ -84,6 +84,10 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", showFooter: true, + sortStable: true, // 设置为 true 将获得稳定的排序 + fixedColumns: true, // 启用冻结列 + rightFixedColumns:1, + fixedRightNumber: 1, // 冻结右列个数 modalName: "售后通知单", columns: [{ checkbox: true diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html index 5a2cbf60..bab98ce2 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html @@ -90,6 +90,7 @@ fixedColumns: true, // 启用冻结列 rightFixedColumns:1, fixedRightNumber: 1, // 冻结右列个数 + showFooter: true, modalName: "销售估价", columns: [{ checkbox: true @@ -129,10 +130,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: '估价币种', @@ -142,20 +157,48 @@ } }, { - title: '不含税总价', + title: '不含税总价(RMB)', field: 'allNoTaxRmb', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allNoTaxRmb) || 0; + } + return "总不含税总价: " + sum.toFixed(2); + } }, { - title: '含税总价', + title: '含税总价(RMB)', field: 'allTaxRmb', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allTaxRmb) || 0; + } + return "总含税总价: " + sum.toFixed(2); + } }, { - title: '含税总价', + title: '含税总价(美元)', field: 'allTaxDollar', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allTaxDollar) || 0; + } + return "总含税总价: " + sum.toFixed(2); + } }, { - title: '不含税总价', + title: '不含税总价(美元)', field: 'allNoTaxDollar', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allNoTaxDollar) || 0; + } + return "总不含税总价: " + sum.toFixed(2); + } }, { title: '录入人',