Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/order/spot_warran/components/spot_warrant_deal/index.vue

src/assets/styles/mixin.less

@@ -288,9 +288,9 @@
                     font-size: 14px;
                     border-right: 1px solid @m-black9;
                     border-bottom: 1px solid @m-black9;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
-                    overflow: hidden;
+                    // white-space: nowrap;
+                    // text-overflow: ellipsis;
+                    // overflow: hidden;
                 }
             }
         }
@@ -304,9 +304,9 @@
                     border-bottom: 1px solid @m-black9;
                     font-size: 16px;
                     color: @m-white1;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
-                    overflow: hidden;
+                    // white-space: nowrap;
+                    // text-overflow: ellipsis;
+                    // overflow: hidden;
                 }
             }
             tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row,
@@ -2059,4 +2059,11 @@ input:-internal-autofill-selected {
     .ant-calendar-picker-icon {
         display: none;
     }
+}
+
+// 表格按钮列表固定在右边
+.btn-list-sticky {
+    position: sticky;
+    position: -webkit-sticky;
+    right: 2px;
 }

src/common/setup/table/clolumn.ts

@@ -44,12 +44,22 @@ export function getTableColumns() {
                 item.customRender = (obj: any) => `${obj.index + 1}`
                 item.width = 30
             }
-            // 设置表格宽度，默认120
+            // 设置表格宽度
             if (columnwidth && columnwidth !== '0') {
                 item.width = +columnwidth
             } else {
-                item.width = 120 // 默认120
+                if (columntitle.includes('时间') || columntitle.includes('编号')) {
+                    item.width = 200
+                } else {
+                    const len = columntitle.length
+                    if (len > 4) {
+                        item.width = 120 + 10 * (len - 4)
+                    } else {
+                        item.width = 120 // 默认120
+                    }
+                }
             }
+
             // 数据格式化
             if (formatterstring) {
                 const fn = getFromatterFn(formatterstring)

src/views/business/plan/list/audit/index.vue

@@ -16,8 +16,10 @@
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

src/views/business/plan/list/running/index.vue

@@ -19,6 +19,7 @@
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
       <template #contracttype="{ text }">

src/views/business/purchase/list/all/index.vue

@@ -19,6 +19,7 @@
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>

src/views/business/purchase/list/pending/index.vue

@@ -19,6 +19,7 @@
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>

src/views/business/purchase/list/performance/index.vue

@@ -19,6 +19,7 @@
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>

src/views/business/sell/list/all/index.vue

@@ -19,6 +19,7 @@
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>

src/views/business/sell/list/pending/index.vue

@@ -18,6 +18,7 @@
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

src/views/business/sell/list/performance/index.vue

@@ -18,6 +18,7 @@
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

src/views/information/spot-contract/list/checkpending/index.vue

@@ -15,8 +15,10 @@
              :data-source="tableList"
              :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
       <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

src/views/information/spot-contract/list/finished/index.vue

@@ -15,8 +15,10 @@
              :data-source="tableList"
              :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
       <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

src/views/information/spot-contract/list/performance/index.vue

@@ -15,8 +15,10 @@
              :data-source="tableList"
              :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
       <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -15,8 +15,10 @@
              :data-source="tableList"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="secondBtn"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>

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

@@ -2,12 +2,14 @@
   <!-- 资金流水 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
@@ -15,6 +17,7 @@
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
       <template #createtime="{ record }">
@@ -42,6 +45,7 @@ import { getSelectedAccountId } from '@/services/bus/account';
 import { getOperateTypeEnumItemName, getOperateTypeName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
 import Bus from '@/utils/eventBus/index';
+import { expandIcon } from '@/common/setup/table/clolumn';
 
 export default defineComponent({
     name: enumOrderComponents.funding_information_funding_log,
@@ -74,6 +78,7 @@ export default defineComponent({
             loading,
             tableList,
             formatTime,
+            expandIcon,
         };
     },
 });

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

@@ -2,12 +2,14 @@
   <!-- 资金汇总 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
@@ -15,6 +17,7 @@
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
       <template #balance="{record}">
@@ -45,6 +48,7 @@ import { getSelectedAccountId, getCanUseMoney, getFreeze } from '@/services/bus/
 import { getLongTypeLoginID } from '@/services/bus/login';
 import * as Long from 'long';
 import Bus from '@/utils/eventBus/index';
+import { expandIcon } from '@/common/setup/table/clolumn';
 
 export default defineComponent({
     name: enumOrderComponents.funding_information_funding_summary,
@@ -77,6 +81,7 @@ export default defineComponent({
             tableList,
             getCanUseMoney,
             getFreeze,
+            expandIcon,
         };
     },
 });

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

@@ -2,12 +2,14 @@
   <!-- 买履约 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
@@ -15,6 +17,7 @@
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
       <!-- 履约类型 -->
@@ -52,6 +55,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 { expandIcon } from '@/common/setup/table/clolumn';
 import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
 export default defineComponent({
     name: enumOrderComponents.performance_information_buy_performance,
@@ -85,6 +89,7 @@ export default defineComponent({
             getPerformanceTypeName,
             getPerformanceStatusName,
             getPaymentTypeName,
+            expandIcon,
         };
     },
 });

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

@@ -2,19 +2,22 @@
   <!-- 卖履约 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
-      <template v-if="btnList"
+      <template v-if="btnList.length"
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
       <!-- 履约类型 -->
@@ -51,6 +54,7 @@ import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade'
 import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { expandIcon } from '@/common/setup/table/clolumn';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
 import { onMounted } from 'vue';
@@ -86,6 +90,7 @@ export default defineComponent({
             getPerformanceTypeName,
             getPaymentTypeName,
             getPerformanceStatusName,
+            expandIcon,
         };
     },
 });

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

@@ -1,29 +1,30 @@
 <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"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 class="btn-list-sticky"
+                 :record="record"
+                 @click="openComponent" />
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
@@ -34,6 +35,8 @@ import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+
 export default defineComponent({
     name: enumOrderComponents.pre_sale_warehouse_receipt_deal,
     components: {
@@ -59,6 +62,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });

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

@@ -2,18 +2,21 @@
   <!-- 指定成交 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>
@@ -32,6 +35,7 @@ import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 export default defineComponent({
     name: enumOrderComponents.pre_sale_warehouse_receipt_designated_deal,
     components: {
@@ -57,6 +61,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });

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

@@ -1,29 +1,30 @@
 <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"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 class="btn-list-sticky"
+                 :record="record"
+                 @click="openComponent" />
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
@@ -34,6 +35,7 @@ import { QueryWrPositionReq, 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';
+import { expandIcon } from '@/common/setup/table/clolumn';
 export default defineComponent({
     name: enumOrderComponents.pre_sale_warehouse_receipt_order_summary,
     components: {
@@ -61,6 +63,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrPosition>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });

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

@@ -2,17 +2,20 @@
   <!-- 仓单预售 挂单 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="filterBtnList(btnList, record)"
+                 class="btn-list-sticky"
                  :record="record"
                  @click="openComponent" />
       </template>
@@ -42,6 +45,7 @@ import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
 import { BtnList as btnType } from '@/common/components/btnList/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 
 export default defineComponent({
     name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
@@ -79,6 +83,7 @@ export default defineComponent({
             filterBtnList,
             loading,
             tableList,
+            expandIcon,
             getWrTradeOrderStatusName,
             getWrOrderTypeName,
         };

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

@@ -2,18 +2,21 @@
   <!-- 成交 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
 
@@ -23,6 +26,10 @@
         </template>
 
 
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -39,6 +46,9 @@ import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getWrOrderTypeName } from '@/common/constants/enumsName';
+
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_deal,
     components: {
@@ -60,10 +70,31 @@ export default defineComponent({
             tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_deal',
             recordList: getRecordItemTab(),
         };
+        //仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
+        function getType(type: number) {
+            let result = '--';
+            switch (type) {
+                case 1:
+                    result = '挂牌';
+                    break;
+                case 2:
+                    result = '摘牌';
+                    break;
+                case 3:
+                    result = '提货卖';
+                    break;
+                case 4:
+                    result = '提货买';
+                    break;
+            }
+            return result;
+        }
         return {
             ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
             loading,
             tableList,
+            expandIcon,
+            getWrOrderTypeName,
         };
     },
 });

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

@@ -8,12 +8,15 @@
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>
@@ -32,6 +35,8 @@ import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_designated_deal,
     components: {
@@ -57,6 +62,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });

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

@@ -2,12 +2,14 @@
   <!-- 库存汇总 -->
   <section>
     <a-table :columns="columns"
-             class="srcollYTable"
+             class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
@@ -15,6 +17,7 @@
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>
@@ -33,6 +36,7 @@ import { QueryWrPositionReq, WrHoldLB, WrPosition } from '@/services/go/wrtrade/
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_inventory_summary,
@@ -61,6 +65,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrHoldLB>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });

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

@@ -8,12 +8,15 @@
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="filterBtnList(btnList, record)"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
       <!--  委托状态-->
@@ -43,6 +46,7 @@ import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
 import { BtnList as btnType } from '@/common/components/btnList/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_pending_order,
@@ -82,6 +86,7 @@ export default defineComponent({
             getWrTradeOrderStatusName,
             getWrOrderTypeName,
             filterBtnList,
+            expandIcon,
         };
     },
 });

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

@@ -8,12 +8,15 @@
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>
@@ -33,6 +36,7 @@ import { QueryHoldLBReq, QueryWrOrderDetailReq, QueryWrPositionReq, WrHoldLB, Wr
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_spot_details,
     components: {
@@ -57,6 +61,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrHoldLB>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });

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

@@ -8,6 +8,8 @@
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
@@ -15,6 +17,7 @@
                 #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  :record="record"
+                 class="btn-list-sticky"
                  @click="openComponent" />
       </template>
     </a-table>
@@ -33,6 +36,7 @@ import { QueryWrPositionReq, 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';
+import { expandIcon } from '@/common/setup/table/clolumn';
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_spot_summary,
     components: {
@@ -59,6 +63,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrPosition>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });