Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -1292,6 +1292,8 @@
     margin-top: -64px;
     .ant-modal-content {
         background: @m-grey11;
+        color: @m-white0;
+        font-size: 14px;
         .ant-modal-close {
             .ant-modal-close-x {
                 width: 40px;

src/views/order/funding_information/components/funding_information_funding_log/index.vue

@@ -1,27 +1,29 @@
 <template>
-  <!-- 资金流水 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 资金流水 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -32,9 +34,9 @@ import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrad
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import {queryAmountLog} from "@/services/go/TaAccount";
-import {QueryAmountLogReq} from "@/services/go/TaAccount/interface";
-import {getSelectedAccountId} from "@/services/bus/account";
+import { queryAmountLog } from '@/services/go/TaAccount';
+import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
+import { getSelectedAccountId } from '@/services/bus/account';
 export default defineComponent({
     name: enumOrderComponents.funding_information_funding_log,
     components: {

src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -1,33 +1,35 @@
 <template>
-  <!-- 资金汇总 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <template #balanc="{record}">
-        <span>{{getCanUseMoney(record)}}</span>
-      </template>
-      <template #freezemargin="{record}">
-        <span>{{getCanUseMoney(record)}}</span>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 资金汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+            <template #balanc="{record}">
+                <span>{{getCanUseMoney(record)}}</span>
+            </template>
+            <template #freezemargin="{record}">
+                <span>{{getCanUseMoney(record)}}</span>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/performance_information/components/performance_information_buy_performance/index.vue

@@ -1,46 +1,48 @@
 <template>
-  <!-- 买履约 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-        <!-- 履约类型 -->
-        <template #performancetype="{ record }">
-            <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
-        </template>
+    <!-- 买履约 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+            <!-- 履约类型 -->
+            <template #performancetype="{ record }">
+                <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+            </template>
 
-        <!-- 付款方式 -->
-        <template #paymenttype="{ record }">
-            <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
-        </template>
+            <!-- 付款方式 -->
+            <template #paymenttype="{ record }">
+                <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+            </template>
 
-        <!-- 履约状态 -->
-        <template #performancestatus="{ record }">
-            <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
-        </template>
+            <!-- 履约状态 -->
+            <template #performancestatus="{ record }">
+                <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+            </template>
 
-        <!-- 当前步骤 -->
-        <template #curstepname="{ record }">
-            <a>{{ record.curstepname }}</a>
-        </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- 当前步骤 -->
+            <template #curstepname="{ record }">
+                <a>{{ record.curstepname }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -51,7 +53,7 @@ import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrad
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import {getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName} from "@/common/constants/enumsName";
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
 export default defineComponent({
     name: enumOrderComponents.performance_information_buy_performance,
     components: {

src/views/order/performance_information/components/performance_information_sell_performance/index.vue

@@ -1,46 +1,48 @@
 <template>
-  <!-- 卖履约 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-        <!-- 履约类型 -->
-        <template #performancetype="{ record }">
-            <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
-        </template>
+    <!-- 卖履约 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+            <!-- 履约类型 -->
+            <template #performancetype="{ record }">
+                <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+            </template>
 
-        <!-- 付款方式 -->
-        <template #paymenttype="{ record }">
-            <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
-        </template>
+            <!-- 付款方式 -->
+            <template #paymenttype="{ record }">
+                <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+            </template>
 
-        <!-- 履约状态 -->
-        <template #performancestatus="{ record }">
-            <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
-        </template>
+            <!-- 履约状态 -->
+            <template #performancestatus="{ record }">
+                <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+            </template>
 
-        <!-- 当前步骤 -->
-        <template #curstepname="{ record }">
-            <a>{{ record.curstepname }}</a>
-        </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- 当前步骤 -->
+            <template #curstepname="{ record }">
+                <a>{{ record.curstepname }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -51,7 +53,7 @@ import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrad
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import {getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName} from "@/common/constants/enumsName";
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
 export default defineComponent({
     name: enumOrderComponents.performance_information_sell_performance,
     components: {

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_deal/index.vue

@@ -1,27 +1,29 @@
 <template>
-  <!-- 成交 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 成交 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_designated_deal/index.vue

@@ -1,27 +1,29 @@
 <template>
-  <!-- 指定成交 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 指定成交 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue

@@ -1,27 +1,29 @@
 <template>
-  <!-- 订单汇总 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 订单汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue

@@ -1,35 +1,37 @@
 <template>
-  <!-- 仓单预售 挂单 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <!--  委托状态-->
-      <template #wrtradeorderstatus="{ record }">
-        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 仓单预售 挂单 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+            <!--  委托状态-->
+            <template #wrtradeorderstatus="{ record }">
+                <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+            </template>
+            <!-- 挂牌类型 -->
+            <template #wrtradetype="{ record }">
+                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_inventory_summary/index.vue

@@ -1,34 +1,36 @@
 <template>
-  <!-- 库存汇总 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 库存汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
 import { queryWrPosition } from '@/services/go/wrtrade';
-import {QueryWrPositionReq, WrHoldLB, WrPosition} from '@/services/go/wrtrade/interface';
+import { QueryWrPositionReq, WrHoldLB, WrPosition } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';

src/views/order/spot_warran/components/spot_warrant_pending_order/components/cancle/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <!-- 现货仓单 现货明细 撤单 -->
-  <div></div>
+    <!-- 现货仓单 现货明细 撤单 -->
+    <div></div>
 </template>
 
 <script lang="ts">
@@ -53,7 +53,7 @@ export default defineComponent({
 
         Modal.confirm({
             title: '撤单',
-            content: '是否确认撤单！',
+            content: '是否确认撤单?',
             onOk: submit,
             onCancel: cancel,
         });

src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue

@@ -1,35 +1,41 @@
 <template>
-  <!-- 现货仓单 挂单 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="filterBtnList(btnList, record)"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <!--  委托状态-->
-      <template #wrtradeorderstatus="{ record }">
-        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 现货仓单 挂单 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="filterBtnList(btnList, record)"
+                    :record="record"
+                    @click="openComponent"
+                />
+            </template>
+            <!--  委托状态-->
+            <template #wrtradeorderstatus="{ record }">
+                <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+            </template>
+            <!-- 挂牌类型 -->
+            <template #wrtradetype="{ record }">
+                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_spot_details/index.vue

@@ -1,27 +1,29 @@
 <template>
-  <!-- 现货明细 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 现货明细 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_spot_summary/index.vue

@@ -1,27 +1,29 @@
 <template>
-  <!-- 现货汇总 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 现货汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: '227px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">