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

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

@@ -11,7 +11,7 @@
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
-      <template v-if="btnList.length"
+      <template v-if="btnList"
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
@@ -53,6 +53,7 @@ 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 { onMounted } from 'vue';
 export default defineComponent({
     name: enumOrderComponents.performance_information_sell_performance,
     components: {

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

@@ -2,7 +2,7 @@
   <!-- 现货仓单 挂单 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
@@ -16,15 +16,15 @@
                  :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>
-        <!-- 挂牌价格 -->
+      <!--  委托状态-->
+      <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"

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

@@ -1,29 +1,27 @@
 <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>
-        </a-table>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+  <!-- 现货明细 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :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">