From a0e33f06495287496a2e81ef5675b4cf7a2dfe5c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 17:48:37 +0800
Subject: [PATCH] 资金流水修改

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 919521b..e5cc679 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -324,6 +324,7 @@
                     btn: ['确认', '取消'],
                     yes: function (index, layero) {
                         $('#deliver-update').find('#submit').trigger('click');
+                        // $query.click();
                     },
                     btn2: function () {
                         layer.closeAll();
@@ -388,16 +389,18 @@
                 url: ctx + 'admin/order/orderList?orderType=1',
                 // defaultToolbar: [],
                 //系统自带打印导出
+                totalRow : true,
                 toolbar: '#tableToolBarOrder',
                 cols: [[
                         {type: 'checkbox', fixed: 'left'},
-                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
+                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
                         {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                         {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                         {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
-                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
-                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
-                        {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
+                        {field: 'remark', title: '备注', minWidth: 160,align:'left'},
+                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
+                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
+                        {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                         {field: 'status', title: '状态',
                             templet: function (d) {
@@ -529,6 +532,7 @@
                     // "<div>地址:" + data.address + "</div><br><br>" +
                     // "<div>编号:" + data.orderNo + "</div><br><br>" +
                     "<div>商品:" + data.goodsName + "</div><br><br>" +
+                    "<div>备注:" + data.remark + "</div><br><br>" +
                     "</div>"
 
                 contentHtml += template;

--
Gitblit v1.9.1