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

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 买大厅 -->
+  <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
   <a-table :columns="handleColumn(columns)"
            :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
@@ -20,7 +20,7 @@
                @click="openComponent" />
     </template>
     <template #username="{text, record }">
-      <span>{{record.userid}}{{text}}</span>
+      <span>{{record.userid + " "}}{{text}}</span>
     </template>
   </a-table>
   <component :is="componentId"

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 卖大厅 -->
+  <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
   <a-table :columns="handleColumn(columns)"
            :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
@@ -18,7 +18,7 @@
                @click="openComponent" />
     </template>
     <template #username="{text, record }">
-      <span>{{record.userid}}{{text}}</span>
+      <span>{{record.userid + " " }}{{text}}</span>
     </template>
   </a-table>
   <component :is="componentId"

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

@@ -24,7 +24,7 @@
         <span>{{getCanUseMoney(record)}}</span>
       </template>
       <template #freezemargin="{record}">
-        <span>{{getFreeze(record)}}</span>
+        <span>{{getFreeze(record, true)}}</span>
       </template>
     </a-table>
     <component :is="componentId"

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

@@ -13,11 +13,12 @@
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
+      <template #expandedRowRender="{ record }" >
         <BtnList :btnList="btnList"
                  class="btn-list-sticky"
                  :record="record"
-                 @click="openComponent" />
+                 @click="openComponent" 
+                 v-if="record.enalbeqty > 0"/>
       </template>
     </a-table>
     <component :is="componentId"

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

@@ -17,7 +17,8 @@
         <BtnList :btnList="btnList"
                  :record="record"
                  class="btn-list-sticky"
-                 @click="openComponent" />
+                 @click="openComponent"
+                 v-if="record.enalbeqty > 0" />
       </template>
     </a-table>
     <component :is="componentId"

src/views/platinum/platinum_document_query/list/waiting/index.vue

@@ -24,6 +24,7 @@
         <template #paylimitedtime="{ record }">
           <a>{{ isOverTime(record.paylimitedtime) }}</a>
         </template>
+
       </a-table>
     </contextMenu>
     <!-- <ControlModal :selectedRow="selectedRow" /> -->