huangbin 4 年之前
父節點
當前提交
bbdcb80243

+ 9 - 2
src/views/order/spot_warran/components/spot_warrant_bargain/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 现货仓单 挂单 -->
+  <!-- 现货仓单 议价 -->
   <section>
     <a-table :columns="columns"
              class="srcollYTable expandLeftTable"
@@ -38,6 +38,12 @@
       <template #wrtradetype="{ record }">
         <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
       </template>
+      <template #applystatus="{ text }">
+        <span>{{ getBarmaginApplyStatus(text) }}</span>
+      </template>
+      <template #applytime="{ text }">
+        <span>{{ formatTime(text) }}</span>
+      </template>
       <!-- 挂牌价格 -->
     </a-table>
     <component :is="componentId"
@@ -55,7 +61,7 @@ import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyQsp, QueryWrTradeBargain
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { getWrOrderTypeName, getWrTradeOrderStatusName, getBarmaginApplyStatus } from '@/common/constants/enumsName';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { getSpotWarrantBargainColumns } from './setup';
@@ -113,6 +119,7 @@ export default defineComponent({
             getWrOrderTypeName,
             expandIcon,
             formatTime,
+            getBarmaginApplyStatus,
         };
     },
 });

+ 4 - 0
src/views/order/spot_warran/components/spot_warrant_bargain/setup.ts

@@ -14,6 +14,10 @@ export function getSpotWarrantBargainColumns() {
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
         { title: '履约方式', key: 'templatename', align: 'center', width: 160 },
+        { title: '最新议价价格', key: 'applyprice', align: 'center', width: 120 },
+        { title: '最新议价数量', key: 'applyqty', align: 'center', width: 120 },
+        { title: '最新议价时间', key: 'applytime', align: 'center', width: 160 },
+        { title: '最新议价状态', key: 'applystatus', align: 'center', width: 140 },
     ];
     return columns.map(el => {
         const slots = { customRender: el.key };