From 28800b5c2bc15d5d02487fb7ab046013cb4d969c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 15:11:53 +0800
Subject: [PATCH] 20210323  后台保留两位小数,(平台数据除外)

---
 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
index 9475656..c89d0f0 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -13,6 +13,16 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">合约类型</label>
+                                        <div class="layui-input-inline">
+                                            <select name="contractType">
+                                                <option value="0">请选择</option>
+                                                <option value="1">普通合约</option>
+                                                <option value="2">跟单合约</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">账号类型</label>
                                         <div class="layui-input-inline">
                                             <select name="isTest">
@@ -81,6 +91,24 @@
                 cols: [[
                     {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
                     {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+                    {field: 'inviteIdTrader', title: '交易员邀请码', minWidth: 120,align:'left'},
+                    {field: 'createTime', title: '时间', minWidth: 120,align:'center'},
+                    {field: 'positionType', title: '开仓类型',
+                        templet: function (d) {
+                            if (d.positionType === 1) {
+                                return '<span style="color:green;">分仓</span>'
+                            }else {
+                                return '<span style="color:red;">全仓</span>'
+                            }
+                        }, minWidth: 100,align:'center'},
+                    {field: 'contractType', title: '合约类型',
+                        templet: function (d) {
+                            if (d.contractType === 1) {
+                                return '<span style="color:green;">普通合约</span>'
+                            }else {
+                                return '<span style="color:red;">跟单合约</span>'
+                            }
+                        }, minWidth: 100,align:'center'},
                     {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
                     {field: 'openingType', title: '开仓类型', 
                     	templet: function (d) {
@@ -100,20 +128,26 @@
                             }, minWidth: 100,align:'center'},
                     {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
                     {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+                    {field: 'symbolCntSale', title: '可平张数', minWidth: 120,align:'center'},
                     {field: 'rewardRatio', title: '实时盈亏', 
                     	templet: function (d) {
                             if (d.rewardRatio > 0) {
-                                return '<span style="color:green;">' + d.rewardRatio + '</span>'
-                            }else {
-                                return '<span style="color:red;">' + d.rewardRatio + '</span>'
+                                return '<span style="color:green;">' + parseFloat((d.rewardRatio*100).toFixed(2))+'%' + '</span>'
+                            }
+                            if (d.rewardRatio < 0) {
+                                return '<span style="color:red;">' + parseFloat((d.rewardRatio*100).toFixed(2))+'%' + '</span>'
+                            }
+                            if (d.rewardRatio == 0 ||  d.rewardRatio == "" || d.rewardRatio == null) {
+                                return '<span></span>'
                             }
                         },minWidth: 120,align:'center',totalRow: true},
-                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
+                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
                     {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
                     {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
+                    {field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},
                     {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
                     {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
-                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
+                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
                     {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
                     {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
@@ -136,6 +170,8 @@
             return {
                 account: $searchForm.find('input[name="account"]').val().trim(),
                 isTest: $searchForm.find("select[name='isTest']").val(),
+                contractType: $searchForm.find("select[name='contractType']").val(),
+                accountType: $searchForm.find("select[name='accountType']").val(),
             };
         }
         

--
Gitblit v1.9.1