From bfbb03c514b9e60485ea13d5679e6af2e8aeb354 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 23 Nov 2022 09:44:23 +0800
Subject: [PATCH] 20221117

---
 src/main/resources/templates/febs/views/onhookplan/planList.html |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/febs/views/onhookplan/planList.html b/src/main/resources/templates/febs/views/onhookplan/planList.html
index 4423c11..9dc0e31 100644
--- a/src/main/resources/templates/febs/views/onhookplan/planList.html
+++ b/src/main/resources/templates/febs/views/onhookplan/planList.html
@@ -8,6 +8,12 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">用户名</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" name="username" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">操作类型</label>
                                         <div class="layui-input-inline">
                                             <select name="state">
@@ -72,6 +78,12 @@
                     disagree(data.id);
                 });
             }
+
+            if (layEvent === 'amountFlow') {
+                febs.modal.open( '资金流水详情', 'onHookView/amountFlow/' + data.id, {
+                    maxmin: true,
+                });
+            }
         });
 
         function agree(id) {
@@ -111,30 +123,32 @@
                                 return '<span>挂机中</span>'
                             } else if (d.state === 2) {
                                 return '<span>结束</span>'
+                            }else if (d.state === 3) {
+                                return '<span>结算中</span>'
                             }else{
-                                return
+                                return ''
                             }
                         }, minWidth: 100, align: 'center'},
-                    {field: 'planAmount', title: '挂机总金额', minWidth: 100, align: 'center'},
-                    {field: 'avaAmount', title: '剩余金额', minWidth: 120, align: 'center', totalRow: true},
+                    {field: 'planAmount', title: '挂机总金额', minWidth: 100, align: 'center', totalRow: true},
+                    {field: 'avaAmount', title: '剩余金额', minWidth: 120, align: 'center'},
                     {field: 'planCode', title: '挂机方案倍数', minWidth: 120, align: 'center'},
                     {field: 'profit', title: '总收益', minWidth: 120, align: 'center', totalRow: true},
                     {field: 'createTime', 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="agree" shiro:hasPermission="user:update">同意</button>'
-                    //                 +'<button class="layui-btn layui-btn-danger layui-btn-xs layui-btn-danger" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
-                    //         }else{
-                    //             return ''
-                    //         }
-                    //     },minWidth: 120,align:'center'}
+                    {title: '操作',
+                        templet: function (d) {
+                            if(d.state === 2){
+                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="amountFlow" shiro:hasPermission="user:update">流水记录</button>'
+                            }else{
+                                return ''
+                            }
+                        },minWidth: 120,align:'center'}
                 ]]
             });
         }
 
         function getQueryParams() {
             return {
+                username: $searchForm.find('input[name="username"]').val().trim(),
                 state: $searchForm.find("select[name='state']").val()
             };
         }

--
Gitblit v1.9.1