huangbin 4 år sedan
förälder
incheckning
02cbd922bb

+ 2 - 2
src/assets/styles/mixin.less

@@ -1850,7 +1850,7 @@ input:-internal-autofill-selected {
                     text-overflow: ellipsis;
                     overflow: hidden;
                 }
-                td:not(:first-child :nth-child(2)) {
+                td:not(:first-child :nth-child(1)) {
                     background: rgba(@m-red1, .1) !important;
                     color: @m-white1;
                 }
@@ -1890,7 +1890,7 @@ input:-internal-autofill-selected {
         }
         .ant-table-tbody {
             tr {
-                td:not(:first-child :nth-child(2)) {
+                td:not(:first-child :nth-child(1)) {
                     background: rgba(@m-green0, .1) !important;
                 }
             }

+ 8 - 1
src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 买大厅 -->
-  <a-table :columns="columns"
+  <a-table :columns="handleColumn(columns)"
            class="buyHallTable"
            :scroll="{ x: '100%', y: 'calc(100vh- 470px)' }"
            :pagination="false"
@@ -38,6 +38,7 @@ import { BtnList as btnListType } from '@/common/components/btnList/interface';
 import { getBuyMarketParam } from '../../setup';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { expandIcon } from '@/common/setup/table/clolumn';
+import { ColumnType } from '@/common/methods/table/interface';
 
 export default defineComponent({
     emits: ['cancel', 'openComponent'],
@@ -83,6 +84,11 @@ export default defineComponent({
             tableFilterKey: [],
             isDetail: false,
         };
+        function handleColumn(columns: ColumnType[]) {
+            const item = columns[1];
+            delete item.width;
+            return columns;
+        }
         return {
             ...handleComposeTable<WrOrderQuoteDetail>(param),
             queryTableAction,
@@ -91,6 +97,7 @@ export default defineComponent({
             tableList,
             enumName: props.enumName,
             expandIcon,
+            handleColumn,
         };
     },
 });

+ 8 - 1
src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 卖大厅 -->
-  <a-table :columns="columns"
+  <a-table :columns="handleColumn(columns)"
            class="sellHallTable"
            :scroll="{ x: '100%', y: 'calc(100vh - 470px)' }"
            :pagination="false"
@@ -38,6 +38,7 @@ import { BtnList as btnListType } from '@/common/components/btnList/interface';
 import { getSellMarketParam } from '../../setup';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { expandIcon } from '@/common/setup/table/clolumn';
+import { ColumnType } from '@/common/methods/table/interface';
 
 export default defineComponent({
     emits: ['cancel', 'openComponent'],
@@ -85,6 +86,11 @@ export default defineComponent({
             tableFilterKey: [],
             isDetail: false,
         };
+        function handleColumn(columns: ColumnType[]) {
+            const item = columns[1];
+            delete item.width;
+            return columns;
+        }
         return {
             ...handleComposeTable<WrOrderQuoteDetail>(param),
             queryTableAction,
@@ -93,6 +99,7 @@ export default defineComponent({
             BuyOrSell,
             enumName: props.enumName,
             expandIcon,
+            handleColumn,
         };
     },
 });

+ 12 - 12
src/views/market/spot_trade/components/buy-sell-market/setup.ts

@@ -1,8 +1,8 @@
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { TableKey } from '@/common/methods/table/interface';
 import { getTableColumns, getTableEvent, queryTableList } from "@/common/setup/table";
+import { WrMarketTradeConfig } from "@/services/go/wrtrade/interface";
 import { ref } from 'vue';
-import {WrMarketTradeConfig} from "@/services/go/wrtrade/interface";
 
 
 export function handleBuyAndSellList<T>(menuType: EnumRouterName, isDetail: boolean, tableName: keyof TableKey) {
@@ -124,11 +124,11 @@ export enum WrTradePriceEnum {
  *     履约保证金, 估算总额, 摘牌最大数量
  * }
  */
-export function ListedViewModel(enumType : WrTradePriceEnum){
+export function ListedViewModel(enumType: WrTradePriceEnum) {
 
-    let marginPrice: number = 0  // 履约保证金
-    let amount: number = 0 // 摘牌金额 或 估算总额
-    let maxNum: number = 0 // 摘牌最大数量
+    let marginPrice = 0  // 履约保证金
+    let amount = 0 // 摘牌金额 或 估算总额
+    let maxNum = 0 // 摘牌最大数量
 
     // 负责把输入的数据 转换成 ui需要显示的数据
     function getCalculate(param: WrParam) {
@@ -140,9 +140,9 @@ export function ListedViewModel(enumType : WrTradePriceEnum){
                 } else {
                     // 摘牌最大数量 = min 挂牌数量,可用资金/(买方履约保证金比例*挂牌价格)
                     if (param.config.buymarginalgorithm === 1) {  //  买方保证金模式 1: 比率 2: 固定
-                        maxNum = Math.min(param.listedNum, param.availableFunds as number / param.config.buymarginvalue * param.orderPrice)
+                        maxNum = Math.min(param.listedNum, param.availableFunds / param.config.buymarginvalue * param.orderPrice)
                     } else {
-                        maxNum = Math.min(param.listedNum, param.availableFunds as number / (param.config.buymarginvalue + param.orderPrice))
+                        maxNum = Math.min(param.listedNum, param.availableFunds / (param.config.buymarginvalue + param.orderPrice))
                     }
                 }
                 // 摘牌金额 = 挂牌价格 * 摘牌数量
@@ -158,9 +158,9 @@ export function ListedViewModel(enumType : WrTradePriceEnum){
             case WrTradePriceEnum.OnePriceDeListSale:  // 一口价  摘牌卖出
                 if (param.warehouseNum === undefined) { // 这里防止异常
                     maxNum = 0
-                }else{
+                } else {
                     // 摘牌最大数量 = min(现货库存可用数量,挂牌数量),现货库存数量为所选仓单数量
-                    maxNum = Math.min(param.listedNum, param.warehouseNum as number)
+                    maxNum = Math.min(param.listedNum, param.warehouseNum)
                 }
                 // 摘牌金额 = 挂牌价格 * 摘牌数量
                 amount = param.orderPrice * param.deListNum
@@ -180,14 +180,14 @@ export function ListedViewModel(enumType : WrTradePriceEnum){
         maxNum: maxNum
     }
 
-    return {getCalculate , uiParam}
+    return { getCalculate, uiParam }
 }
 
 /**
  * 需要传入的数据集合
  */
 export interface WrParam {
-    orderPrice : number  // 挂牌价格 (浮动价是期货合约价 + 基差)  也传这个 (会变)
+    orderPrice: number  // 挂牌价格 (浮动价是期货合约价 + 基差)  也传这个 (会变)
     availableFunds?: number //可用资金(当前账号的可用) 摘牌买入传可用 (可能会变)
     warehouseNum?: number  // 仓单数量(如果当前是用自己仓单卖商品给其他人 则需要传自己仓单商品的总数) 摘牌卖出传选择的仓单数量 (可能会变)
     deListNum: number     // 摘牌数量 (当前选择数量)  (会变)
@@ -202,4 +202,4 @@ export interface UiParam {
     marginPrice: number  // 履约保证金
     amount: number       // 摘牌金额 或 估算总额
     maxNum: number       // 摘牌最大数量
-}
+}