From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html |   51 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 4f60714..048c7f9 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -8,17 +8,19 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
+                                        <label class="layui-form-label">名称:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label">账号:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="账号" name="phone" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">状态</label>
+                                        <label class="layui-form-label">状态:</label>
                                         <div class="layui-input-inline">
                                             <select name="status">
                                                 <option value="">请选择</option>
@@ -37,6 +39,9 @@
                                 <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                     <i class="layui-icon">&#xe79b;</i>
                                 </div>
+                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="exportExcel">
+                                    导出
+                                </div>
                             </div>
                         </div>
                     </form>
@@ -46,6 +51,15 @@
         </div>
     </div>
 </div>
+<script type="text/html" id="charge-flow-list-option">
+    {{# if(d.status === 1) { }}
+        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>
+        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeDisagree:update" lay-event="chargeDisagree" >拒绝</button>
+        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
+    {{# } else { }}
+        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
+    {{# } }}
+</script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
@@ -57,11 +71,15 @@
             $view = $('#febs-money-flow-charge'),
             $query = $view.find('#query'),
             $reset = $view.find('#reset'),
+            $exportExcel = $view.find('#exportExcel'),
             $searchForm = $view.find('form'),
             sortObject = {field: 'phone', type: null},
             tableIns;
 
         form.render();
+        let currPageGoods = 1;//首先默认值为1,防止出错
+        //获取当前页
+        currPageGoods = $view.find(".layui-laypage-em").next().html();
 
         // 表格初始化
         initTable();
@@ -103,14 +121,18 @@
         // 查询按钮
         $query.on('click', function () {
             var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
-            tableIns.reload({where: params, page: {curr: 1}});
+            tableIns.reload({where: params, page: {curr: currPageGoods}});
         });
 
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
             sortObject.type = 'null';
-            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+            tableIns.reload({where: getQueryParams(), page: {curr: currPageGoods}, initSort: sortObject});
+        });
+
+        $exportExcel.on('click', function() {
+            febs.download(ctx + 'admin/mallMember/chargeList/excel', getQueryParams(), '提现列表.xlsx');
         });
 
         function initTable() {
@@ -118,17 +140,21 @@
                 elem: $view.find('table'),
                 id: 'moneyFlowChargeTable',
                 url: ctx + 'admin/mallMember/getMoneyChargeList',
+                totalRow: true ,// 开启合计行
                 cols: [[
+                    {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left', totalRowText: '合计:'},
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                     {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
-                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+                    {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
+                    {field: 'amountFee', title: '手续费', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountFee) }}'},
+                    {field: 'remark', title: '类型', minWidth: 150,align:'left'},
                     {field: 'status', title: '状态',
                         templet: function (d) {
                             if (d.status === 1) {
                                 return '<span style="color:green;">提现中</span>'
                             } else if (d.status === 2) {
-                                return '<span style="color:red;">成功</span>'
+                                return '<span style="color:blue;">成功</span>'
                             } else if (d.status === 3) {
                                 return '<span style="color:red;">拒绝</span>'
                             } else{
@@ -136,16 +162,7 @@
                             }
                         }, minWidth: 80,align:'center'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'},
-                    {title: '操作',
-                        templet: function (d) {
-                            if (d.status === 1) {
-                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeAgree" shiro:hasPermission="user:update">同意</button>'
-                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
-                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
-                            }else{
-                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
-                            }
-                        },minWidth: 300,align:'center'}
+                    {title: '操作', minWidth: 250 ,toolbar: '#charge-flow-list-option'}
                 ]]
             });
         }

--
Gitblit v1.9.1