修改枚举

src/common/setup/table/button.ts

@@ -1,4 +1,5 @@
 import { BtnList as btnType } from '@/common/components/btnList/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { ModalName } from '@/common/constants/modalName';
 import { OperationTabMenu } from '@/services/go/commonService/interface';
 import { sessionStorageUtil } from "@/utils/storage";
@@ -170,7 +171,7 @@ export function _getBtnList(menuType: keyof ButtonListKey, hasDetail: boolean):
     return _handleBtnList(list, hasDetail)
 }
 
-export function getBtnList_(menuType: keyof ButtonListKey, hasDetail: boolean) {
+export function getBtnList_(menuType: EnumRouterName, hasDetail: boolean) {
     const data = getThirdMenuData()
     const list = data.find((e) => e.code === menuType);
     return _handleBtnList_(list, hasDetail)

src/common/setup/table/interface.ts

@@ -1,3 +1,4 @@
+import { EnumRouterName } from "@/common/constants/enumRouterName";
 import { TableKey } from "@/common/methods/table/interface";
 
 export interface TableEventCB {
@@ -21,7 +22,7 @@ export interface BtnParam {
 
 export interface ComposeTableParam {
     queryFn: Function,  // 查询表格数据
-    menuType: keyof ButtonListKey,  // 操作按钮列表key
+    menuType: EnumRouterName,  // 操作按钮列表key
     tableName: keyof TableKey, // 表头key
     tableFilterKey: string[], // 表格过滤字段
     tableFilterCB?: Function, // 表格过滤字段回调函数
@@ -32,7 +33,7 @@ export interface ComposeTableDetailParam {
     queryFn: Function,  // 查询表格数据
     tableName: keyof TableKey, // 表头key
     tableFilterKey: string[], // 表格过滤字段
-    menuType: keyof ButtonListKey
+    menuType: EnumRouterName
 }
 
 export interface ButtonListKey {

src/views/business/exposure/list/futures/index.vue

@@ -32,9 +32,10 @@ import { handleComposeTable_detail } from '@/common/setup/table/compose';
 import { TabList } from '@/common/components/description/interface';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import Description from '@/common/components/description/index.vue';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
-    name: 'exposure-futures',
+    name: EnumRouterName.exposure_futures,
     components: {
         filterCustomTable,
         Description,
@@ -48,7 +49,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_exposure_futuresposition', // 表头key
             tableFilterKey: ['MiddleGoodsName'], // 表格过滤字段
-            menuType: 'exposure_futures', // 当前tab页对应的code
+            menuType: EnumRouterName.exposure_futures, // 当前tab页对应的code
         };
         const {
             visible,

src/views/business/exposure/list/realTime/index.vue

@@ -34,9 +34,10 @@ import { ComposeTableDetailParam } from '@/common/setup/table/interface';
 import { TabList } from '@/common/components/description/interface';
 import { handleComposeTable_detail } from '@/common/setup/table/compose';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
-    name: 'exposure-real-time',
+    name: EnumRouterName.exposure_realtime,
     components: {
         Description,
         filterCustomTable,
@@ -50,7 +51,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_exposure', // 表头key
             tableFilterKey: ['MiddleGoodsName'], // 表格过滤字段
-            menuType: 'exposure_realtime', // 当前tab页对应的code
+            menuType: EnumRouterName.exposure_realtime, // 当前tab页对应的code
         };
         const {
             visible,

src/views/business/exposure/list/spot/index.vue

@@ -32,9 +32,10 @@ import { queryTableList } from '@/common/setup/table';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import Description from '@/common/components/description/index.vue';
 import { TabList } from '@/common/components/description/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
-    name: 'exposure-spot',
+    name: EnumRouterName.exposure_spot,
     components: {
         Description,
         filterCustomTable,
@@ -48,7 +49,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_exposure_spotposition', // 表头key
             tableFilterKey: ['MiddleGoodsName'], // 表格过滤字段
-            menuType: 'exposure_spot', // 当前tab页对应的code
+            menuType: EnumRouterName.exposure_spot, // 当前tab页对应的code
         };
         const {
             visible,

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

@@ -49,13 +49,14 @@ import { Filter } from '../../components';
 import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/setup';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
 import { QueryHedgePlan } from '@/services/go/ermcp/plan';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Cancel = defineAsyncComponent(() => import('../../components/cancel/index.vue'));
 const Audit = defineAsyncComponent(() => import('../../components/audit/index.vue'));
 
 export default defineComponent({
-    name: 'plan_uncommitted',
+    name: EnumRouterName.plan_audit,
     components: {
         contextMenu,
         BtnList,
@@ -72,7 +73,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'plan_audit',
+            menuType: EnumRouterName.plan_audit,
             tableName: 'table_pcweb_hedging_plan',
             tableFilterKey: ['contracttype', 'hedgeplanno', 'deliverygoodsname'],
             isDetail: true,

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

@@ -47,11 +47,12 @@ import { Filter } from '../../components';
 import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/setup';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
 import { QueryHedgePlan } from '@/services/go/ermcp/plan';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 
 export default defineComponent({
-    name: 'spot-contract-peddding',
+    name: EnumRouterName.plan_running,
     components: {
         contextMenu,
         BtnList,
@@ -66,7 +67,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'plan_running',
+            menuType: EnumRouterName.plan_running,
             tableName: 'table_pcweb_hedging_plan',
             tableFilterKey: ['contracttype', 'hedgeplanno', 'deliverygoodsname'],
             isDetail: true,

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

@@ -48,6 +48,7 @@ import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/se
 import { BtnList as BtnListType } from '@/common/components/btnList/interface';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
 import { QueryHedgePlan } from '@/services/go/ermcp/plan';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Add = defineAsyncComponent(() => import('../../components/add/index.vue'));
@@ -55,7 +56,7 @@ const Delete = defineAsyncComponent(() => import('../../components/delete/index.
 const Modfiy = defineAsyncComponent(() => import('../../components/modify/index.vue'));
 
 export default defineComponent({
-    name: 'plan-uncommitted',
+    name: EnumRouterName.plan_uncommitted,
     components: {
         contextMenu,
         BtnList,
@@ -73,7 +74,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'plan_uncommitted',
+            menuType: EnumRouterName.plan_uncommitted,
             tableName: 'table_pcweb_hedging_plan',
             tableFilterKey: ['contracttype', 'hedgeplanno', 'deliverygoodsname'],
             isDetail: true,

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

@@ -40,6 +40,7 @@ import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineCompo
 import { Ermcp3SellBuyContract } from '../index';
 import { filterCustomTable } from '../../components';
 import { QueryPurchase } from '@/services/go/ermcp/purchase';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -49,7 +50,7 @@ const Storage = defineAsyncComponent(() => import('../../components/storage/inde
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
 
 export default defineComponent({
-    name: 'purchase-all',
+    name: EnumRouterName.purchase_all,
     components: {
         contextMenu,
         filterCustomTable,
@@ -70,7 +71,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'purchase_all',
+            menuType: EnumRouterName.purchase_all,
             tableName: 'table_pcweb_purchase_all',
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,

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

@@ -40,12 +40,13 @@ import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineCompo
 import { Ermcp3SellBuyContract } from '../index';
 import { filterCustomTable } from '../../components';
 import { QueryPurchase } from '@/services/go/ermcp/purchase';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
 
 export default defineComponent({
-    name: 'purchase-peddding',
+    name: EnumRouterName.purchase_pending,
     components: {
         contextMenu,
         filterCustomTable,
@@ -61,7 +62,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'purchase_pending',
+            menuType: EnumRouterName.purchase_pending,
             tableName: 'table_pcweb_purchase_pointprice',
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,

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

@@ -40,6 +40,7 @@ import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineCompo
 import { filterCustomTable } from '../../components';
 import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { Ermcp3SellBuyContract } from '@/views/business/sell/list';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -48,7 +49,7 @@ const Invoice = defineAsyncComponent(() => import('../../components/invoice/inde
 const Storage = defineAsyncComponent(() => import('../../components/storage/index.vue')); // 入库登记
 
 export default defineComponent({
-    name: 'purchase-performance',
+    name: EnumRouterName.purchase_performance,
     components: {
         contextMenu,
         filterCustomTable,
@@ -67,7 +68,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'purchase_performance',
+            menuType: EnumRouterName.purchase_performance,
             tableName: 'table_pcweb_purchase_settle',
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,

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

@@ -35,6 +35,7 @@
 </template>
 
 <script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
@@ -48,7 +49,7 @@ const Storage = defineAsyncComponent(() => import('../../components/storage/inde
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
 
 export default defineComponent({
-    name: 'sell-all',
+    name: EnumRouterName.sell_all,
     components: {
         contextMenu,
         filterCustomTable,
@@ -68,7 +69,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'sell_all',
+            menuType: EnumRouterName.sell_all,
             tableName: 'table_pcweb_sales_all',
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,

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

@@ -35,6 +35,7 @@
 </template>
 
 <script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
@@ -44,7 +45,7 @@ const Detail = defineAsyncComponent(() => import('../../components/detail/index.
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
 
 export default defineComponent({
-    name: 'sell-peddding',
+    name: EnumRouterName.sell_pending,
     components: {
         contextMenu,
         filterCustomTable,
@@ -60,7 +61,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'sell_pending',
+            menuType: EnumRouterName.sell_pending,
             tableName: 'table_pcweb_sales_pointprice',
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,

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

@@ -35,6 +35,7 @@
 </template>
 
 <script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
@@ -47,7 +48,7 @@ const Invoice = defineAsyncComponent(() => import('../../components/invoice/inde
 const Storage = defineAsyncComponent(() => import('../../components/storage/index.vue')); // 入库登记
 
 export default defineComponent({
-    name: 'sell_performance',
+    name: EnumRouterName.sell_performance,
     components: {
         contextMenu,
         filterCustomTable,
@@ -66,7 +67,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'sell_performance',
+            menuType: EnumRouterName.sell_performance,
             tableName: 'table_pcweb_sales_settle',
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,

src/views/information/account_info/list/account_info_business/index.vue

@@ -77,6 +77,7 @@ import { _handleTableList } from '../setup';
 import { ref } from 'vue';
 import { handleModalComponent } from '@/common/setup/asyncComponent';
 import { getBtnList_ } from '@/common/setup/table/button';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Add = defineAsyncComponent(() => import('../../compoments/add-business/index.vue'));
 const Modify = defineAsyncComponent(() => import('../../compoments/modify-business/index.vue'));
@@ -104,7 +105,7 @@ export default defineComponent({
         // 加载状态
         const loading = ref<boolean>(false);
         const { tableList, queryTable } = handlerManagerList(loading, 1);
-        const [firstBtn, secondBtn] = getBtnList_('account_info_business', true).value;
+        const [firstBtn, secondBtn] = getBtnList_(EnumRouterName.account_info_business, true).value;
 
         // 处理根据状态显示对应按钮
         function handleBtnAction() {

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

@@ -78,13 +78,14 @@ import { formatTime, formatValue } from '@/common/methods';
 import { queryBusinessManager, findManagerName, tableFilterCB } from '../setup';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Check = defineAsyncComponent(() => import('../../components/check/index.vue'));
 const Cancel = defineAsyncComponent(() => import('../../components/cancel/index.vue'));
 
 export default defineComponent({
-    name: 'spot-contract-peddding',
+    name: EnumRouterName.spot_contract_checkpending,
     components: {
         filterCustomTable,
         contextMenu,
@@ -105,7 +106,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'spot_contract_checkpending',
+            menuType: EnumRouterName.spot_contract_checkpending,
             tableName: 'table_pcweb_delivery',
             tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
             tableFilterCB,

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

@@ -80,11 +80,12 @@ import { formatTime, formatValue } from '@/common/methods';
 
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 
 export default defineComponent({
-    name: 'spot-contract-done',
+    name: EnumRouterName.spot_contract_finished,
     components: {
         contextMenu,
         BtnList,
@@ -102,7 +103,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'spot_contract_finished',
+            menuType: EnumRouterName.spot_contract_finished,
             tableName: 'table_pcweb_delivery',
             tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
             tableFilterCB,

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

@@ -80,12 +80,13 @@ import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { formatTime, formatValue } from '@/common/methods';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Finish = defineAsyncComponent(() => import('../../components/finish/index.vue'));
 
 export default defineComponent({
-    name: 'spot-contract-performance',
+    name: EnumRouterName.spot_contract_performance,
     components: {
         filterCustomTable,
         contextMenu,
@@ -105,7 +106,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'spot_contract_performance',
+            menuType: EnumRouterName.spot_contract_performance,
             tableName: 'table_pcweb_delivery',
             tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
             tableFilterCB,

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

@@ -79,6 +79,7 @@ import { queryBusinessManager, findManagerName, tableFilterCB } from '../setup';
 import { getPriceTypeName, getBizTypeName, getContractStatusName, getContractTypeName } from '@/common/constants/enumsName';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Add = defineAsyncComponent(() => import('../../components/add/index.vue'));
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
@@ -86,7 +87,7 @@ const Modify = defineAsyncComponent(() => import('../../components/modify/index.
 const Delete = defineAsyncComponent(() => import('../../components/delete/index.vue'));
 
 export default defineComponent({
-    name: 'spot-contract-not-commit',
+    name: EnumRouterName.spot_contract_unsubmitted,
     components: {
         filterCustomTable,
         contextMenu,
@@ -108,7 +109,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'spot_contract_unsubmitted',
+            menuType: EnumRouterName.spot_contract_unsubmitted,
             tableName: 'table_pcweb_delivery',
             tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
             tableFilterCB,

src/views/market/spot_trade/setup.ts

@@ -0,0 +1,111 @@
+import { BtnList } from '@/common/components/btnList/interface';
+import { ContextMenuTemp } from "@/common/components/contextMenu/interface";
+import { handleContextMenu } from "@/common/components/contextMenu/setup";
+import { TabList } from '@/common/components/description/interface';
+import { getTableColumns, getTableEvent, initData } from "@/common/export/table";
+import { handleModalComponent } from '@/common/setup/asyncComponent';
+import { getBtnList_, getThirdMenuData } from "@/common/setup/table/button";
+import { handleTableDrawer } from "@/common/setup/table/drawer";
+import { ComposeTableDetailParam, ComposeTableParam, TableEventCB } from "@/common/setup/table/interface";
+import { onUnmounted, ref, Ref } from "vue";
+
+export type { ComposeTableParam, ComposeTableDetailParam };
+
+// 表格 + 表头 + 右键 + 单击表格 + 按钮列表 通用处理逻辑
+export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName, tableFilterKey }: ComposeTableParam) {
+    // 右键逻辑
+    const { contextMenu, openContext, closeContext: closeContextAction } = handleContextMenu();
+    // 表头数据
+    const { columns, registerColumn, updateColumn } = getTableColumns();
+    // 右键回调函数
+    const eventsCB: TableEventCB = {
+        contextmenuCB: (record: T, value: ContextMenuTemp) => {
+            // 控制打开右键
+            contextMenu.value = value
+        }
+    }
+    // 表格事件
+    const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
+    // 表格操作按钮列表
+    const [firstBtn, secondBtn] = getBtnList_(menuType, isDetail).value;
+    // 控制异步组件
+    const { componentId, closeComponent, openComponent } = handleModalComponent(queryFn, selectedRow);
+    // 关闭右键
+    function closeContext(value: BtnList | null) {
+        // 打开对应的弹窗组件
+        if (value) openComponent(value, selectedRow.value)
+        // 关闭右键
+        closeContextAction()
+    }
+    onUnmounted(() => {
+        // 离开组件，手动关闭右键，防止出现bug
+        closeContextAction()
+    })
+    initData(() => {
+        // 获取列表数据
+        queryFn();
+        // 注册表头信息 过滤
+        registerColumn(tableName, tableFilterKey);
+    }); return {
+        contextMenu, openContext, closeContext, // 右键
+        columns, registerColumn, updateColumn,  // 表头
+        expandedRowKeys, selectedRow, Rowclick, // 表格折腾面板数据与单击、双击事件
+        componentId, closeComponent, openComponent,  // 控制异步组件
+        firstBtn, secondBtn, // 表格按钮
+    }
+}
+
+
+// 表格 + 表头 + 表格明细 + 单击表格  通用处理逻辑
+export function handleComposeTable_detail<T>({ queryFn, tableName, tableFilterKey, menuType }: ComposeTableDetailParam) {
+    // 控制 drawer 组件是否显示
+    const { visible, openDrawer, closeDrawer } = handleTableDrawer()
+    // 表头数据
+    const { columns, registerColumn, updateColumn } = getTableColumns();
+    // 明细列表数据
+    const detailTableList = ref<any[]>([])
+    // 明细表头数据
+    const { columns: columnsDetail, registerColumn: registerColumnDetail, updateColumn: updateColumnDetail } = getTableColumns();
+    // 缓存点击选中的数据
+    let cacheSelectedRow: null | Ref<T> = null
+    // 单击回调
+    const events: TableEventCB = {
+        clickCB: (value: T) => {
+            if (cacheSelectedRow) {
+                // 点击同一个
+                if (JSON.stringify(cacheSelectedRow.value) === JSON.stringify(value)) {
+                    visible.value ? closeDrawer() : openDrawer()
+                } else {
+                    openDrawer()
+                }
+            } else {
+                openDrawer()
+            }
+        },
+    };
+    // 表格事件
+    const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(events);
+    cacheSelectedRow = selectedRow as Ref<T>
+    // 明细tab 列表
+    const data = getThirdMenuData()
+    const list = data.find((e) => e.code === menuType);
+    const tabList = ref<TabList[]>([])
+    list?.children.forEach(el => {
+        const { code, title, type } = el
+        if (type === 3) {
+            tabList.value.push({ lable: title, code })
+        }
+    })
+
+    initData(() => {
+        queryFn();
+        registerColumn(tableName, tableFilterKey);
+    });
+    return {
+        visible, openDrawer, closeDrawer,   // 控制 drawer 组件是否显示
+        columns, registerColumn, updateColumn,  //  表头数据
+        columnsDetail, registerColumnDetail, updateColumnDetail, detailTableList,// 明细表头数据
+        expandedRowKeys, selectedRow, Rowclick, // 表格事件
+        tabList,
+    }
+}

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_floating_price/index.vue

@@ -1,16 +1,61 @@
 <template>
   <!-- 仓单贸易 浮动价挂牌-->
-  <div class="warehouse_receipt_trade_floating_price">浮动价挂牌</div>
+  <div class="warehouse_receipt_trade_floating_price">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu"
+                 @cancel="closeContext"
+                 :list="secondBtn">
+    </contextMenu>
+  </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { defineComponent } from '@/common/export/commonTable';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryAgreementConfig } from '@/services/go/ermcp/qhj';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_floating_price,
+    components: {
+        contextMenu,
+    },
     setup() {
-        return {};
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 2,
+                haswr: 1,
+            };
+            // queryTable(queryOrderQuote, param);
+            queryTable(queryAgreementConfig);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_receipt_trade_floating_price,
+            tableName: 'table_pcweb_agreement',
+            tableFilterKey: [],
+            isDetail: true,
+        };
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            loading,
+            tableList,
+        };
     },
 });
 </script>

src/views/platinum/platinum_agreement/list/tab/index.vue

@@ -50,6 +50,7 @@ import { QhjAgreementConfig } from '@/services/go/ermcp/qhj/interface';
 import Filter from '../../compoments/filter/index.vue';
 import { getAgreementStatus, getAgreementTypeName } from '@/common/constants/enumsName';
 import { handleArgreementType, handlePermissionBtn } from '../../setup';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 const Detail = defineAsyncComponent(() => import('../../compoments/detail/index.vue'));
 const Modify = defineAsyncComponent(() => import('../../compoments/modify/index.vue'));
@@ -59,7 +60,7 @@ const Resume = defineAsyncComponent(() => import('../../compoments/resume/index.
 const Stop = defineAsyncComponent(() => import('../../compoments/stop/index.vue'));
 
 export default defineComponent({
-    name: 'platinum_agreement_tabdd',
+    name: EnumRouterName.platinum_agreement_tab,
     components: {
         Filter,
         contextMenu,
@@ -79,7 +80,7 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: 'platinum_agreement_tab',
+            menuType: EnumRouterName.platinum_agreement_tab,
             tableName: 'table_pcweb_agreement',
             tableFilterKey: ['agreementno', 'agreementtype'],
             isDetail: true,

src/views/report/exposure-report/list/exposure_report/index.vue

@@ -1,172 +1,163 @@
 <template>
-    <!-- 敞口报表 -->
-    <div class="table-detail-container table-height"
-         :loading="loading">
-        <Filter @update="search"></Filter>
-        <a-table :columns="columns"
-                 class="topOrderTable"
-                 :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-                 :pagination="false"
-                 :expandedRowKeys="expandedRowKeys"
-                 :customRow="Rowclick"
-                 rowKey="key"
-                 :data-source="tableList">
-        </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible"
-                     @close="closeDrawer"
-                     @changeTab="changeTab"
-                     :columns="columnsDetail"
-                     :tabList="tabList"
-                     :tableList="detailTableList">
-            <!-- 合同类型 -->
-            <template #contracttype="{ record }">
-                <a>{{ getContractTypeName(record.contracttype) }}</a>
-            </template>
-        </Description>
-    </div>
+  <!-- 敞口报表 -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"></Filter>
+    <a-table :columns="columns"
+             class="topOrderTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :columns="columnsDetail"
+                 :tabList="tabList"
+                 :tableList="detailTableList">
+      <!-- 合同类型 -->
+      <template #contracttype="{ record }">
+        <a>{{ getContractTypeName(record.contracttype) }}</a>
+      </template>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">
-    import Filter from '../../components/filterTable/index.vue';
-    import {defineComponent, queryTableList} from '@/common/export/table';
-    import {TypeAndTime} from '@/views/report/interface';
-    import {handleInitTypeAndTime} from '@/views/report/setup';
-    import {
-        AreaExpourseReportReq,
-        Ermcp3ExpourseReport,
-        QryAreaExpourseHedgeplanDetailReq
-    } from '@/services/go/ermcp/report/interface';
-    import {
-        qryAreaExpourseContractDetail,
-        qryAreaExpourseFutuDetail,
-        qryAreaExpourseHedgeplanDetail,
-        qryAreaExpourseParamChLogDetail,
-        qryAreaExpourseReport
-    } from '@/services/go/ermcp/report';
-    import {ComposeTableDetailParam, handleComposeTable_detail} from '@/common/setup/table/compose';
-    import Description from '@/common/components/description/index.vue';
-    import {watchEffect} from 'vue';
-    import {queryResultLoadingAndInfo} from '@/common/methods/request/resultInfo';
-    import {TabList} from '@/common/components/description/interface';
-    import {getContractTypeName} from "@/common/constants/enumsName";
+import Filter from '../../components/filterTable/index.vue';
+import { defineComponent, queryTableList } from '@/common/export/table';
+import { TypeAndTime } from '@/views/report/interface';
+import { handleInitTypeAndTime } from '@/views/report/setup';
+import { AreaExpourseReportReq, Ermcp3ExpourseReport, QryAreaExpourseHedgeplanDetailReq } from '@/services/go/ermcp/report/interface';
+import { qryAreaExpourseContractDetail, qryAreaExpourseFutuDetail, qryAreaExpourseHedgeplanDetail, qryAreaExpourseParamChLogDetail, qryAreaExpourseReport } from '@/services/go/ermcp/report';
+import { ComposeTableDetailParam, handleComposeTable_detail } from '@/common/setup/table/compose';
+import Description from '@/common/components/description/index.vue';
+import { watchEffect } from 'vue';
+import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { TabList } from '@/common/components/description/interface';
+import { getContractTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
-    export default defineComponent({
-        name: 'exposure-report',
-        components: {
-            Filter,
-            Description,
-        },
-        setup() {
-            let cycletime = '';
-            // 表格列表数据
-            const {loading, tableList, queryTable} = queryTableList<Ermcp3ExpourseReport>();
-            // 获取列表数据
-            const queryTableAction = () => {
-                const {getInitTime, getInitType} = handleInitTypeAndTime();
-                cycletime = getInitTime();
-                const param: AreaExpourseReportReq = {
-                    cycletype: getInitType(),
-                    cycletime,
-                    querytype: 1,
-                };
-                // 获取列表数据
-                queryTable(qryAreaExpourseReport, param);
-            };
-            const param: ComposeTableDetailParam = {
-                queryFn: queryTableAction, // 查询表格数据
-                tableName: 'table_pcweb_exposure_report', // 表头key
-                tableFilterKey: [], // 表格过滤字段
-                menuType: 'exposure_report_exposure', // 当前tab页对应的code
+export default defineComponent({
+    name: EnumRouterName.exposure_report_exposure,
+    components: {
+        Filter,
+        Description,
+    },
+    setup() {
+        let cycletime = '';
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3ExpourseReport>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const { getInitTime, getInitType } = handleInitTypeAndTime();
+            cycletime = getInitTime();
+            const param: AreaExpourseReportReq = {
+                cycletype: getInitType(),
+                cycletime,
+                querytype: 1,
             };
-            const {
-                visible,
-                closeDrawer, // 控制 drawer 组件是否显示
-                columns,
-                updateColumn, //  表头数据
-                columnsDetail,
-                registerColumnDetail,
-                detailTableList, // 明细表头数据
-                expandedRowKeys,
-                selectedRow,
-                Rowclick, // 表格事件
-                tabList,
-            } = handleComposeTable_detail<Ermcp3ExpourseReport>(param);
+            // 获取列表数据
+            queryTable(qryAreaExpourseReport, param);
+        };
+        const param: ComposeTableDetailParam = {
+            queryFn: queryTableAction, // 查询表格数据
+            tableName: 'table_pcweb_exposure_report', // 表头key
+            tableFilterKey: [], // 表格过滤字段
+            menuType: EnumRouterName.exposure_report_exposure, // 当前tab页对应的code
+        };
+        const {
+            visible,
+            closeDrawer, // 控制 drawer 组件是否显示
+            columns,
+            updateColumn, //  表头数据
+            columnsDetail,
+            registerColumnDetail,
+            detailTableList, // 明细表头数据
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格事件
+            tabList,
+        } = handleComposeTable_detail<Ermcp3ExpourseReport>(param);
 
-            // 切换明细
-            function changeTab(index: number, current: TabList) {
-                const {code, lable} = current;
-                const data = selectedRow.value as Ermcp3ExpourseReport;
-                const {cycletype, middlegoodsid} = data;
-                const param: QryAreaExpourseHedgeplanDetailReq = {
-                    middlegoodsid,
-                    cycletype,
-                    cycletime,
-                };
-                let fn = null;
-                if (code === 'exposure_report_exposure_contract_changes') {
-                    // 现货合同变动量明细
-                    // 注册表头
-                    registerColumnDetail('table_pcweb_change_in_spot_contract', []);
-                    fn = qryAreaExpourseContractDetail;
-                } else if (code === 'exposure_report_exposure_hedging_plan') {
-                    // 套保计划变动量明细
-                    // 注册表头
-                    registerColumnDetail('table_pcweb_change_in_hedging_plan', []);
-                    fn = qryAreaExpourseHedgeplanDetail;
-                } else if (code === 'exposure_report_exposure_futures_changes') {
-                    // 期货变动量明细
-                    // 注册表头
-                    registerColumnDetail('table_pcweb_change_in_future', []);
-                    fn = qryAreaExpourseFutuDetail;
-                } else if (code === 'exposure_report_exposure_parameter_adjustment_changes') {
-                    // 参数调整变动量明细
-                    // 注册表头
-                    registerColumnDetail('table_pcweb_change_in_parameter_adjustment', []);
-                    fn = qryAreaExpourseParamChLogDetail;
-                } else {
-                    console.error(`${lable}没有配置对应的code: ${code},`);
-                    return;
-                }
-                // 查询明细数据
-                queryResultLoadingAndInfo(fn, loading, param).then((res) => {
-                    detailTableList.value = res;
-                });
+        // 切换明细
+        function changeTab(index: number, current: TabList) {
+            const { code, lable } = current;
+            const data = selectedRow.value as Ermcp3ExpourseReport;
+            const { cycletype, middlegoodsid } = data;
+            const param: QryAreaExpourseHedgeplanDetailReq = {
+                middlegoodsid,
+                cycletype,
+                cycletime,
+            };
+            let fn = null;
+            if (code === 'exposure_report_exposure_contract_changes') {
+                // 现货合同变动量明细
+                // 注册表头
+                registerColumnDetail('table_pcweb_change_in_spot_contract', []);
+                fn = qryAreaExpourseContractDetail;
+            } else if (code === 'exposure_report_exposure_hedging_plan') {
+                // 套保计划变动量明细
+                // 注册表头
+                registerColumnDetail('table_pcweb_change_in_hedging_plan', []);
+                fn = qryAreaExpourseHedgeplanDetail;
+            } else if (code === 'exposure_report_exposure_futures_changes') {
+                // 期货变动量明细
+                // 注册表头
+                registerColumnDetail('table_pcweb_change_in_future', []);
+                fn = qryAreaExpourseFutuDetail;
+            } else if (code === 'exposure_report_exposure_parameter_adjustment_changes') {
+                // 参数调整变动量明细
+                // 注册表头
+                registerColumnDetail('table_pcweb_change_in_parameter_adjustment', []);
+                fn = qryAreaExpourseParamChLogDetail;
+            } else {
+                console.error(`${lable}没有配置对应的code: ${code},`);
+                return;
             }
-
-            watchEffect(() => {
-                if (visible.value) {
-                    if (tabList.value.length) {
-                        changeTab(0, tabList.value[0]);
-                    }
-                }
+            // 查询明细数据
+            queryResultLoadingAndInfo(fn, loading, param).then((res) => {
+                detailTableList.value = res;
             });
+        }
 
-            function search(value: TypeAndTime) {
-                cycletime = value.cycletime;
-                const obj = Object.assign(value, {querytype: 1});
-                queryTable(qryAreaExpourseReport, obj);
+        watchEffect(() => {
+            if (visible.value) {
+                if (tabList.value.length) {
+                    changeTab(0, tabList.value[0]);
+                }
             }
+        });
 
-            return {
-                loading,
-                tableList,
-                visible,
-                closeDrawer,
-                columns,
-                updateColumn,
-                search,
-                columnsDetail,
-                detailTableList,
-                expandedRowKeys,
-                selectedRow,
-                Rowclick,
-                tabList,
-                changeTab,
-                getContractTypeName
-            };
-        },
-    });
+        function search(value: TypeAndTime) {
+            cycletime = value.cycletime;
+            const obj = Object.assign(value, { querytype: 1 });
+            queryTable(qryAreaExpourseReport, obj);
+        }
+
+        return {
+            loading,
+            tableList,
+            visible,
+            closeDrawer,
+            columns,
+            updateColumn,
+            search,
+            columnsDetail,
+            detailTableList,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            tabList,
+            changeTab,
+            getContractTypeName,
+        };
+    },
+});
 </script>
 
 <style lang="less">

src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -34,6 +34,7 @@ import Description from '@/common/components/description/index.vue';
 import { TabList } from '@/common/components/description/interface';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { watchEffect } from 'vue';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
     name: 'finance-report',
@@ -61,7 +62,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_finance_report', // 表头key
             tableFilterKey: [], // 表格过滤字段
-            menuType: 'finance_report_finance', // 当前tab页对应的code
+            menuType: EnumRouterName.finance_report_finance, // 当前tab页对应的code
         };
         const {
             visible,

src/views/report/future_report/list/future_report/index.vue

@@ -34,6 +34,7 @@ import { qryTaFutureDataReport } from '@/services/go/ermcp/report';
 import { Ermcp3TaFutuReDataReport, QryTaFutureDataReportReq } from '@/services/go/ermcp/report/interface';
 import { TypeAndTime } from '@/views/report/interface';
 import { TabList } from '@/common/components/description/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
     name: 'inventory_report_inventory_category',
@@ -61,7 +62,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_futures_report', // 表头key
             tableFilterKey: [], // 表格过滤字段
-            menuType: 'future_report_future', // 当前tab页对应的code
+            menuType: EnumRouterName.future_report_future, // 当前tab页对应的code
         };
         const {
             visible,

src/views/report/inventory-report/list/category/index.vue

@@ -34,6 +34,7 @@ import { qryAreaStockReport } from '@/services/go/ermcp/report';
 import { AreaStockReportReq, Ermcp3AreaStockReport } from '@/services/go/ermcp/report/interface';
 import { TypeAndTime } from '@/views/report/interface';
 import { TabList } from '@/common/components/description/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
     name: 'inventory_report_inventory_category',
@@ -62,7 +63,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_warehouse_category_report', // 表头key
             tableFilterKey: [], // 表格过滤字段
-            menuType: 'inventory_report_inventory_category', // 当前tab页对应的code
+            menuType: EnumRouterName.inventory_report_inventory_category, // 当前tab页对应的code
         };
 
         const {

src/views/report/inventory-report/list/warehouse/index.vue

@@ -34,6 +34,7 @@ import { qryAreaStockReport } from '@/services/go/ermcp/report';
 import { AreaStockReportReq, Ermcp3AreaStockReport } from '@/services/go/ermcp/report/interface';
 import { TypeAndTime } from '@/views/report/interface';
 import { TabList } from '@/common/components/description/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
     name: 'inventory_report_warehouse',
@@ -62,7 +63,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_warehouse_report', // 表头key
             tableFilterKey: [], // 表格过滤字段
-            menuType: 'inventory_report_warehouse', // 当前tab页对应的code
+            menuType: EnumRouterName.inventory_report_warehouse, // 当前tab页对应的code
         };
         const {
             visible,

src/views/report/spot-report/list/spot_report/index.vue

@@ -34,6 +34,7 @@ import Description from '@/common/components/description/index.vue';
 import { watchEffect } from 'vue';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { TabList } from '@/common/components/description/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
     name: 'spot-report',
@@ -61,7 +62,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_spot_report', // 表头key
             tableFilterKey: [], // 表格过滤字段
-            menuType: 'spot_report_spot', // 当前tab页对应的code
+            menuType: EnumRouterName.spot_report_spot, // 当前tab页对应的code
         };
         const {
             visible,

src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -34,6 +34,7 @@ import { handleInitTypeAndTime } from '@/views/report/setup';
 import { Ermcp3ArealSumPL, QryAreaSumPLReq } from '@/services/go/ermcp/report/interface';
 import { qryAreaSumPL } from '@/services/go/ermcp/report';
 import { TabList } from '@/common/components/description/interface';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 export default defineComponent({
     name: 'sum_pl_report',
     components: {
@@ -60,7 +61,7 @@ export default defineComponent({
             queryFn: queryTableAction, // 查询表格数据
             tableName: 'table_pcweb_aggregate_profit_and_loss', // 表头key
             tableFilterKey: [], // 表格过滤字段
-            menuType: 'sum_pl_report_sum_pl', // 当前tab页对应的code
+            menuType: EnumRouterName.sum_pl_report_sum_pl, // 当前tab页对应的code
         };
         const {
             visible,