底部单据

src/views/order/commodity_contract/components/commodity_contract_bargain/index.vue

@@ -1,46 +1,50 @@
 <template>
   <!-- 商品订单 - 议价单 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template v-if="btnList.length" #expandedRowRender="{ record }">
-        <BtnList :btnList="handleBtnList(record, btnList)" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-      <template #applytime="{ text }">
-        <span>{{ formatTime(text) }}</span>
-      </template>
-      <template #transferamount="{ record , text}">
-        <div>
-          <!-- 审核拒绝 -->
-          <a-tooltip placement="bottom" v-if="record.applystatus === 4" overlayClassName="toolTipTableColumn">
-            <template #title>
-              <span>{{ getScfContractStatusName(text) }}</span>
-            </template>
-            <span :class="record.applystatus === 4 ? 'red' : 'white'">{{ record.transferamount }}</span>
-            <ExclamationCircleOutlined class="ml10 red" v-if="record.applystatus === 4" />
-          </a-tooltip>
-          <span v-else>{{ record.transferamount }}</span>
-        </div>
-      </template>
-      <template #buyorsell="{ text }">
-        <span>{{ getBuyOrSellName(text) }}</span>
-      </template>
-      <template #applystatus="{ text }">
-        <span>{{ getScfContractStatusName(text) }}</span>
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :tableList="tableList" @cancel="closeComponent"></component>
-  </section>
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="handleBtnList(record, buttons)" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <template #applytime="{ text }">
+          <span>{{ formatTime(text) }}</span>
+        </template>
+        <template #transferamount="{ record , text}">
+          <div>
+            <!-- 审核拒绝 -->
+            <a-tooltip placement="bottom" v-if="record.applystatus === 4" overlayClassName="toolTipTableColumn">
+              <template #title>
+                <span>{{ getScfContractStatusName(text) }}</span>
+              </template>
+              <span :class="record.applystatus === 4 ? 'red' : 'white'">{{ record.transferamount }}</span>
+              <ExclamationCircleOutlined class="ml10 red" v-if="record.applystatus === 4" />
+            </a-tooltip>
+            <span v-else>{{ record.transferamount }}</span>
+          </div>
+        </template>
+        <template #buyorsell="{ text }">
+          <span>{{ getBuyOrSellName(text) }}</span>
+        </template>
+        <template #applystatus="{ text }">
+          <span>{{ getScfContractStatusName(text) }}</span>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :tableList="tableList" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { ApplyType } from '@/common/constants/enumCommon';
 import { getBuyOrSellName, getScfContractStatusName } from '@/common/constants/enumsName';
 import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
 import { handleDeliveryRelation } from '@/common/setup/deliveryRelation';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -54,21 +58,30 @@ import { ref } from 'vue';
 import { columns } from './setup';
 
 export default defineComponent({
-  name: 'commodity_contract_bargain',
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     ExclamationCircleOutlined,
     BtnList,
-    commodity_contract_bargain_submit_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_submit_order/index.vue')),
-    commodity_contract_bargain_cancel_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_cancel_order/index.vue')),
-    commodity_contract_bargain_refuse_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_refuse_order/index.vue')),
+    submit: defineAsyncComponent(() => import('./components/commodity_contract_bargain_submit_order/index.vue')), // 同意
+    cancel: defineAsyncComponent(() => import('./components/commodity_contract_bargain_cancel_order/index.vue')), // 撤单
+    refuse: defineAsyncComponent(() => import('./components/commodity_contract_bargain_refuse_order/index.vue')), // 拒绝
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 类型 1-我的申请 2-对方申请
     const margainType = ref<ApplyType>(ApplyType.my);
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTjmdTransferApplyRsp>();
+
     // 交割商品
     handleDeliveryRelation();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryTjmdTransferApplyReq = {
@@ -76,41 +89,45 @@ export default defineComponent({
         accountids: getAccoutIdList(),
       };
       queryTable(queryTjmdTransferApply, param);
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: () => queryTableAction(),
-      recordList: getRecordItemTab(),
-    };
+    }
+
     // 切换 我的申请和对方申请
     Bus.$onOnly('bargain', (value: ApplyType) => {
       margainType.value = value;
       queryTableAction();
-    });
+    })
+
     function handleBtnList(record: QueryTjmdTransferApplyRsp, btnList: BtnListType[]) {
       if (record.applystatus === 1) {
         if (margainType.value === ApplyType.my) {
           // 我的申请
-          return btnList.filter((e) => e.code === 'commodity_contract_bargain_cancel_order');
+          return btnList.filter((e) => e.code === 'cancel');
         } else {
           // 对方的申请
-          return btnList.filter((e) => e.code !== 'commodity_contract_bargain_cancel_order');
+          return btnList.filter((e) => e.code !== 'cancel');
         }
       } else {
         return [];
       }
     }
+
     return {
       ...handleComposeOrderTable<QueryTradePositionRsp>(param),
       columns,
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       handleBtnList,
       getBuyOrSellName,
       getScfContractStatusName,
-    };
-  },
-});
+    }
+  }
+})
 </script>

src/views/order/commodity_contract/components/commodity_contract_commission/index.vue

@@ -1,85 +1,93 @@
 <template>
   <!-- 商品订单 - 委托 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template v-if="btnList.length" #expandedRowRender="{ record }">
-        <BtnList :btnList="filterBtnList(btnList, record)" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-      <!-- 类型 -->
-      <template #buildtype="{ record }">
-        <a>{{ getBuyOrSellTypeName(record.buyorsell) }}</a>
-      </template>
-      <!-- 状态 -->
-      <template #orderstatus="{ record }">
-        <a>{{ getOrderStatusName(record.orderstatus) }}</a>
-      </template>
-
-      <template #ordertime="{ text }">
-        <a>{{ formatTime(text) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="filterBtnList(buttons, record)" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <!-- 类型 -->
+        <template #buildtype="{ record }">
+          <a>{{ getBuyOrSellTypeName(record.buyorsell) }}</a>
+        </template>
+        <!-- 状态 -->
+        <template #orderstatus="{ record }">
+          <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+        </template>
+        <template #ordertime="{ text }">
+          <a>{{ formatTime(text) }}</a>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
-import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
 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 { getBuyOrSellTypeName, getOperateTypeEnumItemName, getOperateTypeName, getOrderStatusName } from '@/common/constants/enumsName';
+import { getBuyOrSellTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
-import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { queryTradeOrderDetail } from '@/services/go/ermcp/order';
 import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import { BtnListType } from '@/common/components/btnList/interface';
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_commission,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     BtnList,
-    commodity_contract_commission_cancel_order: defineAsyncComponent(() => import('./components/cancel/index.vue')),
+    cancel: defineAsyncComponent(() => import('./components/cancel/index.vue')), // 撤单
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradeOrderDetailRsp>();
+
     // 获取列表数据
     const queryTableAction = () => {
       queryTable(queryTradeOrderDetail, {});
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_commission',
-      recordList: getRecordItemTab(),
-    };
+    }
+
     function filterBtnList(list: BtnListType[], record: QueryTradeOrderDetailRsp) {
       //委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 1number;
       const arr = [3, 7];
       if (!arr.includes(record.orderstatus)) {
-        return list.filter((e) => e.code !== 'commodity_contract_commission_cancel_order');
+        return list.filter((e) => e.code !== 'cancel');
       } else {
         return list;
       }
     }
+
     return {
       ...handleComposeOrderTable<WrPerformancePlan>(param),
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       getBuyOrSellTypeName,
       getOrderStatusName,
       filterBtnList,
-    };
-  },
-});
+    }
+  }
+})
 </script>

src/views/order/commodity_contract/components/commodity_contract_make_deal/index.vue

@@ -1,33 +1,36 @@
 <template>
   <!-- 商品订单 - 成交 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template v-if="btnList.length" #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-      <!-- 类型 -->
-      <template #buyorsell="{ text }">
-        <span>{{ getBuyOrSellTypeName(text) }}</span>
-      </template>
-      <!-- 状态 -->
-      <template #orderstatus="{ record }">
-        <a>{{ getOrderStatusName(record.orderstatus) }}</a>
-      </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <!-- 类型 -->
+        <template #buyorsell="{ text }">
+          <span>{{ getBuyOrSellTypeName(text) }}</span>
+        </template>
+        <!-- 状态 -->
+        <template #orderstatus="{ record }">
+          <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+        </template>
+        <template #createtime="{ record }">
+          <a>{{ formatTime(record.createtime) }}</a>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { getBuildTypeName, getBuyOrSellTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { BtnList, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -35,33 +38,43 @@ import { queryTradeDetail } from '@/services/go/ermcp/order';
 import { QueryTradeDetailRsp } from '@/services/go/ermcp/order/interface';
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_make_deal,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     BtnList,
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradeDetailRsp>();
+
     // 获取列表数据
     const queryTableAction = () => {
       queryTable(queryTradeDetail, {});
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_make_deal',
-      recordList: getRecordItemTab(),
-    };
+    }
+
     return {
       ...handleComposeOrderTable<QueryTradeDetailRsp>(param),
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       getBuildTypeName,
       getOrderStatusName,
       getBuyOrSellTypeName,
-    };
-  },
-});
+    }
+  }
+})
 </script>

src/views/order/commodity_contract/components/commodity_contract_settlement/index.vue

@@ -1,49 +1,48 @@
 <template>
   <!-- 商品订单 - 交收 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template v-if="btnList.length" #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-      <template #createtime="{ record }">
-        <span>{{ formatTime(record.createtime) }}</span>
-      </template>
-      <!-- 点价价格  x+c 交收模式，不显示价格-->
-      <template #pdeliveryprice="{ record }">
-        <span>{{ record.pgoodsid ? record.pdeliveryprice : '--' }}</span>
-      </template>
-      <!-- 点价货款  x+c 交收模式，不显示点价货款-->
-      <template #p1goodsremainamount="{ record }">
-        <span>{{ record.pgoodsid ? record.p1goodsremainamount : '--' }}</span>
-      </template>
-      <!-- 类型 -->
-      <template #buyorsell="{ text }">
-        <span>{{ getBuyOrSellName(text) }}</span>
-      </template>
-      <!-- 状态 -->
-      <template #deliverystatus="{ record }">
-        <a>{{ getDeliveryStatusName(record.deliverystatus) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <template #createtime="{ record }">
+          <span>{{ formatTime(record.createtime) }}</span>
+        </template>
+        <!-- 点价价格  x+c 交收模式，不显示价格-->
+        <template #pdeliveryprice="{ record }">
+          <span>{{ record.pgoodsid ? record.pdeliveryprice : '--' }}</span>
+        </template>
+        <!-- 点价货款  x+c 交收模式，不显示点价货款-->
+        <template #p1goodsremainamount="{ record }">
+          <span>{{ record.pgoodsid ? record.p1goodsremainamount : '--' }}</span>
+        </template>
+        <!-- 类型 -->
+        <template #buyorsell="{ text }">
+          <span>{{ getBuyOrSellName(text) }}</span>
+        </template>
+        <!-- 状态 -->
+        <template #deliverystatus="{ record }">
+          <a>{{ getDeliveryStatusName(record.deliverystatus) }}</a>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
-import { QueryPerformancePlan, queryWrDeliveryDetail, queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrDeliveryDetail, WrPerformancePlan } from '@/services/go/wrtrade/interface';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
+import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
+import { queryWrDeliveryDetail } from '@/services/go/wrtrade';
+import { WrDeliveryDetail } from '@/services/go/wrtrade/interface';
 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 { getBuildTypeName, getOperateTypeEnumItemName, getOperateTypeName, getDeliveryStatusName } from '@/common/constants/enumsName';
+import { getBuildTypeName, getDeliveryStatusName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
-import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { getBuyOrSellName } from '@/common/constants/enumsName';
 
@@ -174,35 +173,44 @@ const useColumns = () => {
 };
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_settlement,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     BtnList,
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrDeliveryDetail>(true);
+
     // 获取列表数据
     const queryTableAction = () => {
       queryTable(queryWrDeliveryDetail);
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       // tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_settlement',
-      recordList: getRecordItemTab(),
-    };
+    }
 
     return {
       ...handleComposeOrderTable<WrDeliveryDetail>(param),
       ...useColumns(),
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       getBuildTypeName,
       getDeliveryStatusName,
       getBuyOrSellName,
-    };
-  },
-});
+    }
+  }
+})
 </script>

src/views/order/commodity_contract/components/commodity_contract_summary/index.vue

@@ -1,55 +1,58 @@
 <template>
   <!-- 商品订单 - 合约汇总 -->
-  <section>
-    <a-table :columns="tabColumns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template v-if="btnList.length" #expandedRowRender="{ record }">
-        <BtnList :btnList="handleBtnList(record,btnList)" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-      <!-- 现价 -->
-      <template #lastprice="{ record }">
-        <a>{{ getLastprice(record) }}</a>
-      </template>
-      <!-- 均价 -->
-      <template #averageprice="{ text }">
-        <a>{{ text ? text : 0 }}</a>
-      </template>
-      <!-- 持仓金额  -->
-      <!-- <template #holderprice="{ record }">
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="tabColumns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="handleBtnList(record,buttons)" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <template #createtime="{ record }">
+          <a>{{ formatTime(record.createtime) }}</a>
+        </template>
+        <!-- 现价 -->
+        <template #lastprice="{ record }">
+          <a>{{ getLastprice(record) }}</a>
+        </template>
+        <!-- 均价 -->
+        <template #averageprice="{ text }">
+          <a>{{ text ? text : 0 }}</a>
+        </template>
+        <!-- 持仓金额  -->
+        <!-- <template #holderprice="{ record }">
         <a>{{ useHolderprice(record) }}</a>
       </template> -->
-      <!-- 持仓盈亏 -->
-      <template #profitloss="{ record }">
-        <span>{{ record.averageprice ? useProfitloss(record) : '--' }}</span>
-      </template>
-      <template #buyorsell="{ record }">
-        <span>{{ getBuyOrSellName(record.buyorsell) }}</span>
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :tableList="tableList" @cancel="closeComponent"></component>
-  </section>
+        <!-- 持仓盈亏 -->
+        <template #profitloss="{ record }">
+          <span>{{ record.averageprice ? useProfitloss(record) : '--' }}</span>
+        </template>
+        <template #buyorsell="{ record }">
+          <span>{{ getBuyOrSellName(record.buyorsell) }}</span>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :tableList="tableList" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { TradeMode } from '@/common/constants/enumCommon';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { BtnList, defineAsyncComponent, defineComponent, ModalEnum, queryTableList } from '@/common/export/commonTable';
+import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
 import { handleDeliveryRelation } from '@/common/setup/deliveryRelation';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { handleSubcriteQuote } from '@/common/setup/table/tableQuote';
-import { findGoodsTradeModeById, getQuoteDayInfoByCodeFindPrice, getQutoGoodsByTradeMode } from '@/services/bus/goods';
+import { findGoodsTradeModeById, getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
 import { useHolderprice, useProfitloss } from '@/services/bus/holdPosition';
 import { queryTradePosition } from '@/services/go/ermcp/order';
 import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
-import { getBuyOrSellName, getChannelBuildName } from '@/common/constants/enumsName';
+import { getBuyOrSellName } from '@/common/constants/enumsName';
 
 const tabColumns = [
   {
@@ -165,18 +168,26 @@ const tabColumns = [
 ];
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_summary,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     BtnList,
-    [ModalEnum.commodity_contract_summary_settlement]: defineAsyncComponent(() => import('./components/commodity_contract_summary_settlement/index.vue')),
-    [ModalEnum.commodity_contract_summary_transfer]: defineAsyncComponent(() => import('./components/commodity_contract_summary_transfer/index.vue')),
-    commodity_contract_summary_deal_closed: defineAsyncComponent(() => import('./components/commodity_contract_summary_deal_closed/index.vue')),
-    commodity_contract_summary_order_closed: defineAsyncComponent(() => import('./components/commodity_contract_summary_order_closed/index.vue')),
+    MtpTableScroll,
+    settlement: defineAsyncComponent(() => import('./components/commodity_contract_summary_settlement/index.vue')), // 交收
+    transfer: defineAsyncComponent(() => import('./components/commodity_contract_summary_transfer/index.vue')), // 转让
+    deal_closed: defineAsyncComponent(() => import('./components/commodity_contract_summary_deal_closed/index.vue')), // 协议平仓
+    order_closed: defineAsyncComponent(() => import('./components/commodity_contract_summary_order_closed/index.vue')), // 平仓
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradePositionRsp>();
     const { subscribeAction } = handleSubcriteQuote();
+
     // 交割商品
     handleDeliveryRelation();
 
@@ -184,6 +195,7 @@ export default defineComponent({
     //         const { deliverGoods, getQuoteList, goodsList, } = handleDeliveryRelation([1, 3]);
     //         // 参考行情商品
     // const goodsList = getQutoGoodsByTradeMode(TradeMode.quote99);
+
     // 获取列表数据
     const queryTableAction = () => {
       queryTable(queryTradePosition).then((res) => {
@@ -195,13 +207,14 @@ export default defineComponent({
         //  行情订阅
         subscribeAction(goodsList);
       });
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_summary',
-      recordList: getRecordItemTab(),
-    };
+    }
+
     // 现价
     function getLastprice({ goodscode, decimalplace }: QueryTradePositionRsp) {
       const lastPrice = getQuoteDayInfoByCodeFindPrice(goodscode);
@@ -210,16 +223,18 @@ export default defineComponent({
 
     function handleBtnList(record: QueryTradePositionRsp, btnList: BtnListType[]) {
       // 挂牌点选
-      const listing = ['commodity_contract_summary_transfer', 'commodity_contract_summary_settlement'];
+      const listing = ['transfer', 'settlement'];
       // 贸易圈
-      const diaoqi = ['commodity_contract_summary_deal_closed', 'commodity_contract_summary_order_closed'];
+      const diaoqi = ['deal_closed', 'order_closed'];
       const arr = findGoodsTradeModeById(record.goodsid) === TradeMode.DiaoQi ? diaoqi : listing;
       return btnList.filter((e) => arr.includes(e.code));
     }
+
     return {
       ...handleComposeOrderTable<QueryTradePositionRsp>(param),
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       getLastprice,
@@ -228,7 +243,7 @@ export default defineComponent({
       handleBtnList,
       tabColumns,
       getBuyOrSellName,
-    };
-  },
-});
+    }
+  }
+})
 </script>

src/views/order/commodity_contract/index.vue

@@ -1,22 +1,16 @@
+<!-- 无用组件，待废弃 -->
 <template>
   <!-- 商品合约 -->
   <section class="spot_warran">
-    <component :is="componentId"
-               v-if="componentId"></component>
-    <thirdMenu :list="tabList"
-               @selectMenu="changeTab"
-               :value="'title'">
+    <component :is="componentId" v-if="componentId"></component>
+    <thirdMenu :list="tabList" @selectMenu="changeTab" :value="'title'">
       <!-- 议价单 -->
-      <div class="goods-apply"
-           v-if="componentId === BARGIN">
+      <div class="goods-apply" v-if="componentId === BARGIN">
         <!-- <span @click="changeBargain(ApplyType.my)">我的议价</span>
                 <span @click="changeBargain(ApplyType.counterpart)">对方议价</span>-->
-        <a-radio-group class="conditionCommonRadioGroup"
-                       v-model:value="bargainValue">
-          <a-radio @focus="changeBargain(ApplyType.my)"
-                   :value="ApplyType.my">我的议价</a-radio>
-          <a-radio @focus="changeBargain(ApplyType.counterpart)"
-                   :value="ApplyType.counterpart">对方议价</a-radio>
+        <a-radio-group class="conditionCommonRadioGroup" v-model:value="bargainValue">
+          <a-radio @focus="changeBargain(ApplyType.my)" :value="ApplyType.my">我的议价</a-radio>
+          <a-radio @focus="changeBargain(ApplyType.counterpart)" :value="ApplyType.counterpart">对方议价</a-radio>
         </a-radio-group>
       </div>
     </thirdMenu>
@@ -34,23 +28,23 @@ import { ApplyType } from '@/common/constants/enumCommon';
 const BARGIN = 'commodity_contract_bargain'; // 议价单
 
 export default defineComponent({
-    name: enumOrderComponents.commodity_contract,
-    components: {
-        thirdMenu,
-        [enumOrderComponents.commodity_contract_summary]: defineAsyncComponent(() => import('./components/commodity_contract_summary/index.vue')),
-        [enumOrderComponents.commodity_contract_commission]: defineAsyncComponent(() => import('./components/commodity_contract_commission/index.vue')),
-        [enumOrderComponents.commodity_contract_make_deal]: defineAsyncComponent(() => import('./components/commodity_contract_make_deal/index.vue')),
-        [enumOrderComponents.commodity_contract_settlement]: defineAsyncComponent(() => import('./components/commodity_contract_settlement/index.vue')),
-        [BARGIN]: defineAsyncComponent(() => import('./components/commodity_contract_bargain/index.vue')),
-    },
-    setup() {
-        // 切换 我的
-        function changeBargain(value: ApplyType) {
-            Bus.$emit('bargain', value);
-        }
-        const bargainValue = ref<ApplyType>(ApplyType.my);
-        return { ...handleOrderDetailList(enumOrderComponents.commodity_contract), changeBargain, BARGIN, ApplyType, bargainValue };
-    },
+  name: enumOrderComponents.commodity_contract,
+  components: {
+    thirdMenu,
+    [enumOrderComponents.commodity_contract_summary]: defineAsyncComponent(() => import('./components/commodity_contract_summary/index.vue')),
+    [enumOrderComponents.commodity_contract_commission]: defineAsyncComponent(() => import('./components/commodity_contract_commission/index.vue')),
+    [enumOrderComponents.commodity_contract_make_deal]: defineAsyncComponent(() => import('./components/commodity_contract_make_deal/index.vue')),
+    [enumOrderComponents.commodity_contract_settlement]: defineAsyncComponent(() => import('./components/commodity_contract_settlement/index.vue')),
+    [BARGIN]: defineAsyncComponent(() => import('./components/commodity_contract_bargain/index.vue')),
+  },
+  setup() {
+    // 切换 我的
+    function changeBargain(value: ApplyType) {
+      Bus.$emit('bargain', value);
+    }
+    const bargainValue = ref<ApplyType>(ApplyType.my);
+    return { ...handleOrderDetailList(enumOrderComponents.commodity_contract), changeBargain, BARGIN, ApplyType, bargainValue };
+  },
 });
 </script>
 

src/views/order/financing_manager/index.vue

@@ -1,3 +1,4 @@
+<!-- 无用组件，待废弃 -->
 <template>
   <!-- 融资管理 -->
   <section class="spot_warran">

src/views/order/funding_information/index.vue

@@ -1,3 +1,4 @@
+<!-- 无用组件，待废弃 -->
 <template>
   <!-- 资金信息 -->
   <section class="funding_information">

src/views/order/futures_information/index.vue

@@ -1,3 +1,4 @@
+<!-- 无用组件，待废弃 -->
 <template>
   <!-- 期货订单 -->
   <section class="futures_information">

src/views/order/performance_information/index.vue

@@ -1,3 +1,4 @@
+<!-- 无用组件，待废弃 -->
 <template>
   <!-- 履约信息 -->
   <section class="performance_information">

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

@@ -1,67 +1,77 @@
 <template>
-  <!-- 现货仓单 挂单 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #buyorsell="{ text }">
-        <span>{{ text ? '买' : '卖' }}</span>
-      </template>
-      <!--  委托状态-->
-      <!-- <template #wrtradeorderstatus="{ record }">
+  <!-- 预售仓单-议价 -->
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <!-- 挂牌有效期 -->
+        <template #validtime="{ text }">
+          <span>{{ formatTime(text, 'd') }}</span>
+        </template>
+        <!-- 挂牌类型 -->
+        <template #buyorsell="{ text }">
+          <span>{{ text ? '买' : '卖' }}</span>
+        </template>
+        <!--  委托状态-->
+        <!-- <template #wrtradeorderstatus="{ record }">
         <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
       </template> -->
-      <!-- 挂牌类型 -->
-      <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>
-      <template #marginvalue="{ text }">
-        <span>{{ (text * 100).toFixed(2) }}%</span>
-      </template>
-      <!-- 挂牌价格 -->
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+        <!-- 挂牌类型 -->
+        <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>
+        <template #marginvalue="{ text }">
+          <span>{{ (text * 100).toFixed(2) }}%</span>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { queryQueryWrTradeBargainApply, queryWrOrderDetail } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { PropType } from 'vue';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryQueryWrTradeBargainApply } from '@/services/go/wrtrade';
+import { QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq } 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 { 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';
 import { formatTime } from '@/common/methods';
 import { getUserId } from '@/services/bus/user';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import Bus from '@/utils/eventBus';
 
 export default defineComponent({
-  name: enumOrderComponents.pre_sale_warehouse_receipt_bargain,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     BtnList,
-    pre_sale_warehouse_receipt_bargain_detail: defineAsyncComponent(() => import('./components/bargain_detail/index.vue')),
+    detail: defineAsyncComponent(() => import('./components/bargain_detail/index.vue')),
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryWrTradeBargainApplyQsp>();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryWrTradeBargainApplyReq = {
@@ -70,14 +80,17 @@ export default defineComponent({
       };
       queryTable(queryQueryWrTradeBargainApply, param);
     };
+
     Bus.$on('blocsTrade', () => {
       queryTableAction();
     });
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       recordList: getRecordItemTab(),
     };
+
     const {
       contextMenu,
       openContext,
@@ -88,7 +101,6 @@ export default defineComponent({
       componentId,
       closeComponent,
       openComponent, // 控制异步组件
-      btnList, // 表格按钮
     } = handleComposeOrderTable<QueryWrTradeBargainApplyQsp>(param);
 
     return {
@@ -101,7 +113,7 @@ export default defineComponent({
       componentId,
       closeComponent,
       openComponent, // 控制异步组件
-      btnList, // 表格按钮
+      buttons, // 表格按钮
       columns: getSpotWarrantBargainColumns(),
       loading,
       tableList,
@@ -110,7 +122,7 @@ export default defineComponent({
       expandIcon,
       formatTime,
       getBarmaginApplyStatus,
-    };
-  },
-});
+    }
+  }
+})
 </script>

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

@@ -1,46 +1,57 @@
 <template>
-  <!-- 成交 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList" class="btn-list-sticky" :record="record" @click="openComponent" />
-      </template>
-      <!-- 成交金额 -->
-      <template #amount="{ record }">
-        <a>{{ record.tradeqty * record.tradeprice }}</a>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :tableName="tableName" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+  <!-- 预售仓单-成交 -->
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" class="btn-list-sticky" :record="record" @click="openComponent" />
+        </template>
+        <!-- 成交金额 -->
+        <template #amount="{ record }">
+          <a>{{ record.tradeqty * record.tradeprice }}</a>
+        </template>
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ record }">
+          <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :tableName="tableName" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { PropType } from 'vue';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
 import { queryWrTradeDetail } from '@/services/go/wrtrade';
 import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } 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';
 import { getWrOrderTypeName } from '@/common/constants/enumsName';
 import { TableKey } from '@/common/methods/table/interface';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 
 export default defineComponent({
-  name: enumOrderComponents.pre_sale_warehouse_receipt_deal,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     BtnList,
-    pre_sale_warehouse_receipt_deal_detail: defineAsyncComponent(() => import('./components/pre_sale_warehouse_receipt_deal_detail/index.vue')),
+    detail: defineAsyncComponent(() => import('./components/pre_sale_warehouse_receipt_deal_detail/index.vue')),
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     const tableName: keyof TableKey = 'table_pcweb_spot_trade_bottom_pre_sale_make_deal';
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryWrSpecialMatchOrderReq = {
@@ -48,20 +59,22 @@ export default defineComponent({
       };
       queryTable(queryWrTradeDetail, param);
     };
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       tableName,
       queryFn: queryTableAction,
-      recordList: getRecordItemTab(),
-    };
+    }
+
     return {
       ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
       loading,
       tableName,
       tableList,
+      buttons,
       expandIcon,
       getWrOrderTypeName,
-    };
-  },
-});
+    }
+  }
+})
 </script>

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

@@ -1,33 +1,47 @@
 <template>
-  <!-- 指定成交 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+  <!-- 预售仓单-指定成交 -->
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
-import { queryWrSpecialMatchOrder, queryWrTradeDetail } from '@/services/go/wrtrade';
+import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
+import { queryWrTradeDetail } from '@/services/go/wrtrade';
 import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } 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';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
+
 export default defineComponent({
   name: enumOrderComponents.pre_sale_warehouse_receipt_designated_deal,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
+    MtpTableScroll,
     BtnList,
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryWrSpecialMatchOrderReq = {
@@ -35,18 +49,20 @@ export default defineComponent({
       };
       queryTable(queryWrTradeDetail, param);
     };
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_pre_sale_make_deal',
-      recordList: getRecordItemTab(),
-    };
+    }
+
     return {
       ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
       loading,
       tableList,
+      buttons,
       expandIcon,
-    };
-  },
-});
+    }
+  }
+})
 </script>

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

@@ -1,34 +1,46 @@
 <template>
-  <!-- 订单汇总 -->
-  <section>
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList" class="btn-list-sticky" :record="record" @click="openComponent" v-if="record.creditenableqty > 0" />
-      </template>
-    </a-table>
-    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-  </section>
+  <!-- 预售仓单-订单汇总 -->
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" class="btn-list-sticky" :record="record" @click="openComponent" v-if="record.creditenableqty > 0" />
+        </template>
+      </a-table>
+    </template>
+  </mtp-table-scroll>
+  <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { PropType } from 'vue';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
 import { queryWrPosition } from '@/services/go/wrtrade';
 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';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
+
 export default defineComponent({
-  name: enumOrderComponents.pre_sale_warehouse_receipt_order_summary,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     BtnList,
-    [ModalEnum.pre_sale_warehouse_receipt_order_summary_listed]: defineAsyncComponent(() => import('./components/listed/index.vue')),
+    MtpTableScroll,
+    listed: defineAsyncComponent(() => import('./components/listed/index.vue')),
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrPosition>();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryWrPositionReq = {
@@ -37,16 +49,18 @@ export default defineComponent({
       };
       queryTable(queryWrPosition, param);
     };
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_pre_sale_order_summary',
-      recordList: getRecordItemTab(),
     };
+
     return {
       ...handleComposeOrderTable<WrPosition>(param),
       loading,
       tableList,
+      buttons,
       expandIcon,
     };
   },

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

@@ -1,36 +1,39 @@
 <template>
-  <!-- 仓单预售 挂单 -->
-  <a-table :columns="tableColumns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record,index)=>index" :data-source="tableList">
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="filterBtnList(btnList, record)" class="btn-list-sticky" :record="record" @click="openComponent" />
+  <!-- 预售仓单 挂单 -->
+  <mtp-table-scroll>
+    <template #default="{ scroll }">
+      <a-table :columns="tableColumns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+          <BtnList :btnList="filterBtnList(buttons, record)" class="btn-list-sticky" :record="record" @click="openComponent" />
+        </template>
+        <!--  委托状态-->
+        <template #wrtradeorderstatus="{ record }">
+          <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
+        </template>
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ record }">
+          <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+        </template>
+        <!-- 挂牌方式 -->
+        <template #wrpricetype="{ record }">
+          <span>{{ getWrPriceType(record) }}</span>
+        </template>
+        <!-- 价格/基差 -->
+        <template #futushow="{ record }">
+          <span>{{ showPriceOrMove(record) }}</span>
+        </template>
+      </a-table>
     </template>
-    <!--  委托状态-->
-    <template #wrtradeorderstatus="{ record }">
-      <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
-    </template>
-    <!-- 挂牌类型 -->
-    <template #wrtradetype="{ record }">
-      <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-    </template>
-    <!-- 挂牌方式 -->
-    <template #wrpricetype="{ record }">
-      <span>{{ getWrPriceType(record) }}</span>
-    </template>
-    <!-- 价格/基差 -->
-    <template #futushow="{ record }">
-      <span>{{ showPriceOrMove(record) }}</span>
-    </template>
-  </a-table>
+  </mtp-table-scroll>
   <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :isMy="false" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { PropType } from 'vue';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
 import { queryWrOrderDetail } from '@/services/go/wrtrade';
 import { QueryWrOrderDetailReq, WrOrderDetail } 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 { getWrOrderTypeName, getOrderStatusName } from '@/common/constants/enumsName';
@@ -38,58 +41,72 @@ import { BtnListType } from '@/common/components/btnList/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import Bus from '@/utils/eventBus';
 import { useOrderWarrant } from '@/views/order/setup';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
+import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 
 export default defineComponent({
-  name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     BtnList,
-    [ModalEnum.pre_sale_warehouse_receipt_pending_order_cancel_order]: defineAsyncComponent(() => import('./components/cancle/index.vue')),
+    MtpTableScroll,
+    cancel: defineAsyncComponent(() => import('./components/cancle/index.vue')),
     detail: defineAsyncComponent(() => import('./components/detail/index.vue')),
-    pre_sale_warehouse_receipt_pending_order_bargain_order: defineAsyncComponent(() => import('@/views/order/spot_warran/components/spot_warrant_bargain/components/detail/index.vue')),
+    bargain: defineAsyncComponent(() => import('@/views/order/spot_warran/components/spot_warrant_bargain/components/detail/index.vue')),
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryWrOrderDetailReq = {
         haswr: 0,
       };
       queryTable(queryWrOrderDetail, param);
-    };
+    }
+
     Bus.$on('blocsTrade', () => {
       queryTableAction();
-    });
+    })
+
     const { tableColumns, getWrPriceType, isShowBarginBtn, showPriceOrMove } = useOrderWarrant(0);
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
-      recordList: getRecordItemTab(),
-    };
+    }
+
     function filterBtnList(list: BtnListType[], record: WrOrderDetail) {
       if (!isShowBarginBtn(record)) {
-        list = list.filter((e) => e.code !== 'spot_warrant_pending_order_bargain_order');
+        list = list.filter((e) => e.code !== 'bargain');
       }
       //委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 1number;
       const arr = [3, 7];
       if (!arr.includes(record.wrtradeorderstatus)) {
-        return list.filter((e) => e.code !== ModalEnum.pre_sale_warehouse_receipt_pending_order_cancel_order);
+        return list.filter((e) => e.code !== 'cancel');
       } else {
         return list;
       }
     }
+
     return {
       ...handleComposeOrderTable<WrOrderDetail>(param),
       filterBtnList,
       loading,
       tableList,
+      buttons,
       expandIcon,
       getOrderStatusName,
       getWrOrderTypeName,
       tableColumns,
       getWrPriceType,
       showPriceOrMove,
-    };
-  },
-});
+    }
+  }
+})
 </script>

src/views/order/pre_sale_warehouse_receipt/index.vue

@@ -1,3 +1,4 @@
+<!-- 无用组件，待废弃 -->
 <template>
   <!-- 预售仓单 -->
   <section class="pre_sale_warehouse_receipt">

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

@@ -42,7 +42,6 @@
 <script lang="ts">
 import { PropType } from 'vue';
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getBarmaginApplyStatus, getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
 import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
@@ -58,7 +57,6 @@ import { getSpotWarrantBargainColumns } from './setup';
 import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_pending_order,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 成交 -->
+  <!-- 现货仓单-成交 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
@@ -23,7 +23,6 @@
 
 <script lang="ts">
 import { PropType } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
 import { queryWrTradeDetail } from '@/services/go/wrtrade';
 import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
@@ -36,7 +35,6 @@ import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_deal,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 指定成交 -->
+  <!-- 现货仓单-指定成交 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
@@ -15,7 +15,6 @@
 
 <script lang="ts">
 import { PropType } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
 import { queryWrSpecialMatchOrder } from '@/services/go/wrtrade';
 import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
@@ -26,7 +25,6 @@ import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_designated_deal,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 提货 -->
+  <!-- 现货仓单-提货 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
@@ -26,7 +26,6 @@
 
 <script lang="ts">
 import { PropType } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
 import { queryWrOutInApply } from '@/services/go/wrtrade';
 import { WrOutInApply } from '@/services/go/wrtrade/interface';
@@ -39,7 +38,6 @@ import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_in_and_out_warehouse,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 库存汇总 -->
+  <!-- 现货仓单-库存汇总 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
@@ -16,7 +16,6 @@
 <script lang="ts">
 import { PropType } from 'vue';
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
 import { queryWrPosition } from '@/services/go/wrtrade';
 import { QueryWrPositionReq, WrHoldLB } from '@/services/go/wrtrade/interface';
@@ -26,7 +25,6 @@ import { expandIcon } from '@/common/setup/table/clolumn';
 import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_inventory_summary,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -32,7 +32,6 @@
 
 <script lang="ts">
 import { PropType } from 'vue'
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
 import { queryWrOrderDetail } from '@/services/go/wrtrade';
 import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
@@ -47,7 +46,6 @@ import { DynamicComponent } from '@/@next/hooks/common/interface'
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_pending_order,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 现货明细 -->
+  <!-- 现货仓单-现货明细 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
@@ -15,7 +15,6 @@
 
 <script lang="ts">
 import { PropType } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
@@ -27,7 +26,6 @@ import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_spot_details,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 现货汇总 -->
+  <!-- 现货仓单-现货汇总 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" :rowKey="(record, index) => index" :data-source="tableList">
@@ -15,7 +15,6 @@
 
 <script lang="ts">
 import { PropType } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
 import { queryWrPosition } from '@/services/go/wrtrade';
 import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
@@ -26,7 +25,6 @@ import { DynamicComponent } from '@/@next/hooks/common/interface'
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_spot_summary,
   props: {
     parentComponent: {
       type: Object as PropType<DynamicComponent>,

src/views/order/swap_the_order/components/swap_commodity_contract_bargain/index.vue

@@ -1,11 +1,11 @@
 <template>
-  <!-- 商品订单 - 议价单 -->
+  <!-- 掉期订单-议价单 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
         <!-- 额外的展开行 -->
-        <template v-if="btnList.length" #expandedRowRender="{ record }">
-          <BtnList :btnList="handleBtnList(record, btnList)" :record="record" class="btn-list-sticky" @click="openComponent" />
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="handleBtnList(record, buttons)" :record="record" class="btn-list-sticky" @click="openComponent" />
         </template>
         <template #applytime="{ text }">
           <span>{{ formatTime(text) }}</span>
@@ -36,6 +36,8 @@
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { ApplyType } from '@/common/constants/enumCommon';
@@ -43,7 +45,6 @@ import { getBuyOrSellName, getScfContractStatusName } from '@/common/constants/e
 import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
 import { handleDeliveryRelation } from '@/common/setup/deliveryRelation';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -57,22 +58,30 @@ import { ref } from 'vue';
 import { columns } from './setup';
 
 export default defineComponent({
-  name: 'commodity_contract_bargain',
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     ExclamationCircleOutlined,
     MtpTableScroll,
     BtnList,
-    swap_commodity_contract_bargain_submit_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_submit_order/index.vue')),
-    swap_commodity_contract_bargain_cancel_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_cancel_order/index.vue')),
-    swap_commodity_contract_bargain_refuse_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_refuse_order/index.vue')),
+    submit: defineAsyncComponent(() => import('./components/commodity_contract_bargain_submit_order/index.vue')),
+    cancel: defineAsyncComponent(() => import('./components/commodity_contract_bargain_cancel_order/index.vue')),
+    refuse: defineAsyncComponent(() => import('./components/commodity_contract_bargain_refuse_order/index.vue')),
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 类型 1-我的申请 2-对方申请
     const margainType = ref<ApplyType>(ApplyType.my);
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTjmdTransferApplyRsp>();
+
     // 交割商品
     handleDeliveryRelation();
+
     // 获取列表数据
     const queryTableAction = () => {
       const param: QueryTjmdTransferApplyReq = {
@@ -80,44 +89,45 @@ export default defineComponent({
         accountids: getAccoutIdList(),
       };
       queryTable(queryTjmdTransferApply, param);
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: () => queryTableAction(),
-      recordList: getRecordItemTab(),
-    };
+    }
+
     // 切换 我的申请和对方申请
     Bus.$onOnly('bargain', (value: ApplyType) => {
       margainType.value = value;
       queryTableAction();
-    });
+    })
+
     function handleBtnList(record: QueryTjmdTransferApplyRsp, btnList: BtnListType[]) {
       if (record.applystatus === 1) {
         if (margainType.value === ApplyType.my) {
           // 我的申请
-          return btnList.filter((e) => e.code === 'swap_commodity_contract_bargain_cancel_order');
+          return btnList.filter((e) => e.code === 'cancel');
         } else {
           // 对方的申请
-          return btnList.filter((e) => e.code !== 'swap_commodity_contract_bargain_cancel_order');
+          return btnList.filter((e) => e.code !== 'cancel');
         }
       } else {
         return [];
       }
     }
+
     return {
       ...handleComposeOrderTable<QueryTradePositionRsp>(param),
       columns,
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       handleBtnList,
       getBuyOrSellName,
       getScfContractStatusName,
-    };
-  },
-});
-</script>
-
-<style lang="less">
-</style>;
+    }
+  }
+})
+</script>

src/views/order/swap_the_order/components/swap_commodity_contract_commission/index.vue

@@ -1,11 +1,11 @@
 <template>
-  <!-- 商品订单 - 委托 -->
+  <!-- 掉期订单-委托 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
         <!-- 额外的展开行 -->
-        <template v-if="btnList.length" #expandedRowRender="{ record }">
-          <BtnList :btnList="filterBtnList(btnList, record)" :record="record" class="btn-list-sticky" @click="openComponent" />
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="filterBtnList(buttons, record)" :record="record" class="btn-list-sticky" @click="openComponent" />
         </template>
         <!-- 类型 -->
         <template #buildtype="{ record }">
@@ -15,7 +15,6 @@
         <template #orderstatus="{ record }">
           <a>{{ getOrderStatusName(record.orderstatus) }}</a>
         </template>
-
         <template #ordertime="{ text }">
           <a>{{ formatTime(text) }}</a>
         </template>
@@ -26,14 +25,13 @@
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { TradeMode } from '@/common/constants/enumCommon';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getBuyOrSellTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -41,53 +39,62 @@ import { queryTradeOrderDetail } from '@/services/go/ermcp/order';
 import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import Bus from '@/utils/eventBus/index';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_commission,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     MtpTableScroll,
     BtnList,
-    swap_commodity_contract_commission_cancel_order: defineAsyncComponent(() => import('./components/cancel/index.vue')),
+    cancel: defineAsyncComponent(() => import('./components/cancel/index.vue')), // 撤单
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradeOrderDetailRsp>();
+
     // 获取列表数据
     const queryTableAction = () => {
       queryTable(queryTradeOrderDetail, { tradeMode: TradeMode.DiaoQi.toString() });
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_commission',
-      recordList: getRecordItemTab(),
-    };
+    }
+
     function filterBtnList(list: BtnListType[], record: QueryTradeOrderDetailRsp) {
       //委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 1number;
       const arr = [3, 7];
       if (!arr.includes(record.orderstatus)) {
-        return list.filter((e) => e.code !== 'swap_commodity_contract_commission_cancel_order');
+        return list.filter((e) => e.code !== 'cancel');
       } else {
         return list;
       }
     }
+
     // 挂牌
     Bus.$on('spotTrade', () => {
       queryTableAction();
-    });
+    })
+
     return {
       ...handleComposeOrderTable<WrPerformancePlan>(param),
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       getBuyOrSellTypeName,
       getOrderStatusName,
       filterBtnList,
-    };
-  },
-});
-</script>
-
-<style lang="less">
-</style>;
+    }
+  }
+})
+</script>

src/views/order/swap_the_order/components/swap_commodity_contract_make_deal/index.vue

@@ -1,11 +1,11 @@
 <template>
-  <!-- 商品订单 - 成交 -->
+  <!-- 掉期订单-成交 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="columns" class="srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
         <!-- 额外的展开行 -->
-        <template v-if="btnList.length" #expandedRowRender="{ record }">
-          <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
+        <template v-if="buttons.length" #expandedRowRender="{ record }">
+          <BtnList :btnList="buttons" :record="record" class="btn-list-sticky" @click="openComponent" />
         </template>
         <!-- 类型 -->
         <template #buyorsell="{ text }">
@@ -35,13 +35,13 @@
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
+import { DynamicComponent } from '@/@next/hooks/common/interface'
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { TradeMode } from '@/common/constants/enumCommon';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getBuildTypeName, getBuyOrSellTypeName, getOrderStatusName, getChannelBuildName } from '@/common/constants/enumsName';
 import { BtnList, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -51,24 +51,32 @@ import { QueryTradeDetailRsp } from '@/services/go/ermcp/order/interface';
 import Bus from '@/utils/eventBus/index';
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_make_deal,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     MtpTableScroll,
     BtnList,
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradeDetailRsp>();
+
     // 获取列表数据
     const queryTableAction = () => {
       queryTable(queryTradeDetail, { tradeMode: TradeMode.DiaoQi.toString() });
-    };
+    }
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_make_deal',
-      recordList: getRecordItemTab(),
-    };
+    }
+
     // fix: #2063
     function handleType(record: QueryTradeDetailRsp, value: string | number) {
       let result: number | string = '--';
@@ -77,13 +85,16 @@ export default defineComponent({
       }
       return result;
     }
+
     Bus.$on('spotTrade', () => {
       queryTableAction();
-    });
+    })
+
     return {
       ...handleComposeOrderTable<QueryTradeDetailRsp>(param),
       loading,
       tableList,
+      buttons,
       formatTime,
       expandIcon,
       getBuildTypeName,
@@ -92,10 +103,7 @@ export default defineComponent({
       handleNoneValue,
       handleType,
       getChannelBuildName,
-    };
-  },
-});
-</script>
-
-<style lang="less">
-</style>;
+    }
+  }
+})
+</script>

src/views/order/swap_the_order/components/swap_commodity_contract_summary/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 商品订单 - 合约汇总 -->
+  <!-- 掉期订单-合约汇总 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
       <a-table :columns="getTableColums()" class="srcollYTableExpendBgColor srcollYTable" :scroll="scroll" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="positionList">
@@ -7,7 +7,7 @@
         <template #expandedRowRender="{ record }">
           <a-table :columns="getDetailColums()" class="expandBottomTable" :pagination="false" :loading="detailLoading" :expandedRowKeys="expandedRowKeys" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="getTradeHolderDetail(record)">
             <template #operate="sub">
-              <BtnList :btnList="handleBtnList(record, btnList)" :record="sub.record" class="btn-list-sticky" @click="openComponent" />
+              <BtnList :btnList="handleBtnList(record, buttons)" :record="sub.record" class="btn-list-sticky" @click="openComponent" />
             </template>
             <!-- 持仓盈亏 -->
             <template #profitloss="{ record }">
@@ -50,15 +50,14 @@
 </template>
 
 <script lang="ts">
+import { PropType } from 'vue';
 import MtpTableScroll from '@/common/components/tableScroll/index.vue';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { TradeMode } from '@/common/constants/enumCommon';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getBuyOrSellName } from '@/common/constants/enumsName';
 import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
 import { handleDeliveryRelation } from '@/common/setup/deliveryRelation';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -70,20 +69,27 @@ import Bus from '@/utils/eventBus/index';
 import { isInvestment } from '@/views/market/market-spot/spot_trade_order_transaction/spot_trade_order_transaction_swap/components/setup';
 import { useHazardRates } from '@/views/order/funding_information/components/funding_information_funding_summary/setup'
 import { findGoodsCode, getTableColums, useDetail } from './setup';
-
+import { DynamicComponent } from '@/@next/hooks/common/interface'
 
 export default defineComponent({
-  name: enumOrderComponents.commodity_contract_summary,
+  props: {
+    parentComponent: {
+      type: Object as PropType<DynamicComponent>,
+      required: true
+    }
+  },
   components: {
     MtpTableScroll,
     BtnList,
-    swap_commodity_contract_summary_deal_closed: defineAsyncComponent(() => import('./components/swap_commodity_contract_summary_deal_closed/index.vue')), // 协议平仓
-    swap_commodity_contract_summary_order_closed: defineAsyncComponent(() => import('./components/swap_commodity_contract_summary_order_closed/index.vue')), // 平仓
+    deal_closed: defineAsyncComponent(() => import('./components/swap_commodity_contract_summary_deal_closed/index.vue')), // 协议平仓
+    order_closed: defineAsyncComponent(() => import('./components/swap_commodity_contract_summary_order_closed/index.vue')), // 平仓
   },
-  setup() {
+  setup(props) {
+    const { buttons } = props.parentComponent;
     const { positionList, swapList, getHoldsList, getSwapList, getTradeHolderDetail, useProfitloss } = useHazardRates();
     // 表格列表数据
     const { loading } = queryTableList<QueryTradePositionRsp>();
+
     // 交割商品
     handleDeliveryRelation();
     getSwapList();
@@ -97,8 +103,7 @@ export default defineComponent({
     const param: ComposeOrderTableParam = {
       queryFn: queryTableAction,
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_summary',
-      recordList: getRecordItemTab(),
-    };
+    }
 
     // 现价
     function getLastprice(record: QueryTradePositionRsp) {
@@ -113,7 +118,7 @@ export default defineComponent({
     function handleBtnList(record: QueryTradePositionRsp, btnList: BtnListType[]) {
       // 贸易圈
       // 只有机构 才有平仓
-      const diaoqi = isInvestment() ? ['swap_commodity_contract_summary_deal_closed', 'swap_commodity_contract_summary_order_closed'] : ['swap_commodity_contract_summary_deal_closed'];
+      const diaoqi = isInvestment() ? ['deal_closed', 'order_closed'] : ['deal_closed'];
       return btnList.filter((e) => diaoqi.includes(e.code));
     }
     const {
@@ -121,20 +126,22 @@ export default defineComponent({
       columns, registerColumn, updateColumn,  // 表头
       expandedRowKeys, selectedRow, Rowclick, // 表格折腾面板数据与单击、双击事件
       componentId, closeComponent, openComponent,  // 控制异步组件
-      btnList, // 表格按钮
     } = handleComposeOrderTable<QueryTradePositionRsp>(param)
+
     function clsoeAction(value: boolean) {
       closeComponent(value)
     }
+
     Bus.$on('spotTrade', () => {
       queryTableAction()
-    });
+    })
+
     return {
       contextMenu, openContext, closeContext, // 右键
       columns, registerColumn, updateColumn,  // 表头
       expandedRowKeys, selectedRow, Rowclick, // 表格折腾面板数据与单击、双击事件
       componentId, closeComponent, openComponent,  // 控制异步组件
-      btnList, // 表格按钮
+      buttons, // 表格按钮
       loading,
       positionList,
       formatTime,
@@ -152,10 +159,7 @@ export default defineComponent({
       getTradeHolderDetail,
       findGoodsCode,
       getDetailProfitloss, getDetailMarketAmount, handleQuotePriceColor, clsoeAction
-    };
-  },
-});
-</script>
-
-<style lang="less">
-</style>;
+    }
+  }
+})
+</script>