From ec2c41a6dfbcd99b90d8df2b71f364f7d4fae96c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Dec 2022 10:34:23 +0800
Subject: [PATCH] 20221213转币

---
 src/main/resources/templates/febs/views/dapp/money-change-flow.html |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index 316e8af..feb502d 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -9,7 +9,17 @@
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
                                         <div class="layui-input-inline">
+                                            <input type="text" name="systemProfitId" autocomplete="off" placeholder="输入动能编号" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
                                             <input type="text" name="address" autocomplete="off" placeholder="输入地址" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input type="text" name="fromHash" autocomplete="off" placeholder="输入FromHash" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
@@ -24,7 +34,7 @@
                                                 <option value="4">层级收益</option>
                                                 <option value="5">剩余层级收益</option>
                                                 <option value="6">复投动能</option>
-                                                <option value="7">动能收益</option>
+                                                <option value="7">出局收益</option>
                                             </select>
                                         </div>
                                     </div>
@@ -90,10 +100,20 @@
     4: {title: '层级收益'},
     5: {title: '剩余层级收益'},
     6: {title: '复投动能'},
-    7: {title: '动能收益'},
+    7: {title: '出局收益'},
     }[d.type];
     }}
     <span>{{ type.title }}</span>
+</script>
+<script type="text/html" id="status-able">
+    {{#
+    var status = {
+    1: {title: '进行中', color: 'blue'},
+    2: {title: '成功', color: 'green'},
+    3: {title: '失败', color: 'red'}
+    }[d.status];
+    }}
+    <span class="layui-badge febs-bg-{{status.color}}">{{ status.title }}</span>
 </script>
 <script data-th-inline="none" type="text/javascript">
     layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
@@ -117,7 +137,24 @@
         table.on('tool(moneyChangeTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
+            // if (layEvent === 'transferManual') {
+            //     febs.modal.confirm('人工操作', '是否人工转账?', function () {
+            //         transferManual("flow/withdrawAgree/" + data.id);
+            //     });
+            // }
+            if (layEvent === 'transferManual') {
+                febs.modal.confirm('人工操作', '是否人工转账?', function () {
+                    transferManual(data.id);
+                });
+            }
         });
+
+        function transferManual(id) {
+            febs.get(ctx + 'flow/transferManual/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $reset.click();
+            });
+        }
 
         table.on('sort(moneyChangeTable)', function (obj) {
             sortObject = obj;
@@ -146,7 +183,8 @@
                 id: 'moneyChangeTable',
                 url: ctx + 'flow/fundFlow',
                 cols: [[
-                    {field: 'address', title: '地址', minWidth: 380},
+                    {field: 'address', title: '地址', minWidth: 400},
+                    {field: 'systemProfitId', title: '动能编号', minWidth: 100},
                     {title: '类型', minWidth: 100,templet: '#flow-type',align:'center'},
                     {field: 'amount', title: '金额',
                         templet: function (d) {
@@ -158,17 +196,27 @@
                                 return d.amount
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'fee', title: '手续费', minWidth: 80},
+                    // {field: 'fee', title: '手续费', minWidth: 80},
                     {field: 'createTime', title: '创建时间', minWidth: 150},
-                    {field: 'fromHash', title: 'fromHash', minWidth: 150},
-                    {field: 'toHash', title: 'toHash', minWidth: 150},
+                    {title: '状态', templet: '#status-able', minWidth: 80},
+                    {field: 'fromHash', title: 'FromHash', minWidth: 150},
+                    // {title: '操作',
+                    //     templet: function (d) {
+                    //         if(d.status == 1){
+                    //             return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="transferManual" shiro:hasPermission="transferManual:update">手动转账</button>'
+                    //         }else{
+                    //             return ''
+                    //         }
+                    //     },minWidth: 100,align:'center'}
                 ]]
             });
         }
 
         function getQueryParams() {
             return {
+                systemProfitId: $searchForm.find('input[name="systemProfitId"]').val().trim(),
                 address: $searchForm.find('input[name="address"]').val().trim(),
+                fromHash: $searchForm.find('input[name="fromHash"]').val().trim(),
                 type: $searchForm.find("select[name='type']").val(),
                 // accountStatus: $searchForm.find("select[name='accountStatus']").val(),
                 // withdrawAble: $searchForm.find("input[name='withdrawAble']").val(),

--
Gitblit v1.9.1