From 16cfc57e18f3e571bb59a4e7f14d209b40133f00 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 14:05:30 +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=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=95=B0=E5=90=88=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7?= =?UTF-8?q?(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB)?= =?UTF-8?q?=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(?= =?UTF-8?q?=E7=BE=8E=E5=85=83)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E4=BB=B7(=E7=BE=8E=E5=85=83)=E3=80=81=E5=BE=85=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F=E3=80=81=E5=B7=B2=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E3=80=81=E5=AE=9E=E6=94=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?(RMB)=E3=80=81=E5=AE=9E=E6=94=B6=E9=87=91=E9=A2=9D(=E7=BE=8E?= =?UTF-8?q?=E5=85=83)=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 --- .../system/salesOrder/salesOrder.html | 102 ++++++++++++++++-- 1 file changed, 91 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html index 91bda6d9..ec8773c6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html @@ -271,10 +271,10 @@ sortable: true, // 是否启用排序 sortStable: true, // 设置为 true 将获得稳定的排序 fixedColumns: true, // 启用冻结列 + showFooter: true, rightFixedColumns:1, fixedRightNumber: 1, // 冻结右列个数 modalName: "销售订单", - height: $(window).height() - 100, columns: [ {checkbox: true}, {title: '订单id',field: 'salesOrderId',visible: false}, @@ -343,8 +343,24 @@ {title: '客户ID',field: 'enterpriseCode',}, {title: '客户名称',field: 'enterpriseName'}, {title: '客户订单号',field: 'salesOrderNumber'}, - {title: '物料数合计',field: 'materialSum'}, - {title: '数量合计',field: 'enterpriseSum'}, + {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: '是否含税',field:'confirmTax',formatter:function(value, row, index) { return $.table.selectDictLabel(confirmTaxDatas, value); } @@ -353,10 +369,42 @@ {title: '含税单价(RMB)',field: 'rmbTaxPrice',visible:false}, {title: '不含税单价(美元)',field: 'noUsdPrice',visible:false}, {title: '含税单价(美元)',field: 'usdTaxPrice',visible: false}, - {title: '不含税总价(RMB)',field: 'noRmbSum'}, - {title: '含税总价(RMB)',field: 'rmbTaxSum'}, - {title: '不含税总价(美元)',field: 'noUsdSum'}, - {title: '含税总价(美元)',field: 'usdTaxSum'}, + {title: '不含税总价(RMB)',field: 'noRmbSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noRmbSum)|| 0; + } + return "总不含税总价: " + sum.toFixed(2); + } + }, + {title: '含税总价(RMB)',field: 'rmbTaxSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].rmbTaxSum)|| 0; + } + return "总含税总价: " + sum.toFixed(2); + } + }, + {title: '不含税总价(美元)',field: 'noUsdSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noUsdSum)|| 0; + } + return "总不含税总价: " + sum.toFixed(2); + } + }, + {title: '含税总价(美元)',field: 'usdTaxSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].usdTaxSum)|| 0; + } + return "总含税总价: " + sum.toFixed(2); + } + }, {title: '计划交付时间',field:'deliveryTime' ,visible: false}, {title: '付款条件',field: 'paymentTerms'}, {title: '交货条件',field: 'deliveryConditions'}, @@ -367,10 +415,42 @@ {title: '接单日期',field: 'orderReceivingTime',visible: false}, {title: '接单方式', field: 'orderReceivingMode',visible: false}, {title: '交货方式',field: 'deliveryMethod',visible: false}, - {title: '待出库数量',field: 'unBoundQuantity'}, - {title: '已出库数量',field: 'outBoundQuantity'}, - {title: '实收金额(RMB)',field:'standbyOne'}, - {title: '实收金额(美元)',field:'standbyTwo'}, + {title: '待出库数量',field: 'unBoundQuantity', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].unBoundQuantity) || 0; + } + return "总待出库数量: " + sum; + } + }, + {title: '已出库数量',field: 'outBoundQuantity', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].outBoundQuantity) || 0; + } + return "总已出库数量: " + sum; + } + }, + {title: '实收金额(RMB)',field:'standbyOne', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].standbyOne) || 0; + } + return "总实收金额: " + sum.toFixed(2); + } + }, + {title: '实收金额(美元)',field:'standbyTwo', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].standbyTwo) || 0; + } + return "总实收金额: " + sum.toFixed(2); + } + }, {title: '录入时间',field:'createTime'}, {title: '更新人',field:'updateBy'}, {title: '更新时间',field:'updateTime'},