update

generate-code/pc_menu_企业风管.json

@@ -69,7 +69,7 @@
                 "title": "挂牌",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
+                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_warehouse_listed_btn",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -77,47 +77,11 @@
                 ]
               },
               {
-                "code": "spot_warrant_inventory_summary_detail",
-                "title": "仓单明细",
-                "sort": 1,
-                "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_warehouse_detail_btn",
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": [
-                ]
-              }
-            ]
-          },
-          {
-            "code": "spot_warrant_spot_details",
-            "title": "现货明细",
-            "sort": 1,
-            "type": 4,
-            "rulekey": "client_pc_web_spot_production_bottom_spot_details",
-            "isshow": true,
-            "url": "",
-            "remark": "",
-            "children": [
-              {
-                "code": "spot_warrant_spot_details_listed",
-                "title": "挂牌",
-                "sort": 1,
-                "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": [
-                ]
-              },
-              {
-                "code": "spot_warrant_spot_details_pick_up",
+                "code": "spot_warrant_inventory_summar_pick_up",
                 "title": "提货",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_details_pick_up",
+                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_warehouse_pick_up_btn",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -627,7 +591,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "warehouse_receipt_trade_price_post_buying",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -639,7 +603,7 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_price_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -651,15 +615,51 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_price_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out_delist",
+                    "type": 1,
+                    "rulekey": "",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]
@@ -675,7 +675,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "warehouse_receipt_trade_floating_price_post_buying",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -687,7 +687,7 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_floating_price_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -699,15 +699,51 @@
                     ]
                   },
                   {
-                    "code": "warehouse_receipt_trade_floating_price_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price_delist",
+                    "type": 1,
+                    "rulekey": "",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]
@@ -735,7 +771,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "capacity_pre_sale_purchase",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -747,7 +783,7 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -759,15 +795,51 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_delist",
+                    "type": 1,
+                    "rulekey": "",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]
@@ -783,7 +855,7 @@
                 "remark": "",
                 "children": [
                   {
-                    "code": "capacity_pre_sale_purchase",
+                    "code": "spot_trade_warehouse_post_buying",
                     "title": "发布求购",
                     "sort": 1,
                     "type": 2,
@@ -795,7 +867,7 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_detail",
+                    "code": "spot_trade_warehouse_detail",
                     "title": "详情",
                     "sort": 1,
                     "type": 2,
@@ -807,15 +879,51 @@
                     ]
                   },
                   {
-                    "code": "capacity_pre_sale_delisting",
-                    "title": "摘牌",
+                    "code": "spot_trade_warehouse_buy_hall",
+                    "title": "买大厅",
                     "sort": 1,
-                    "type": 2,
-                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_delist",
+                    "type": 1,
+                    "rulekey": "",
+                    "isshow": true,
+                    "url": "",
+                    "remark": "",
+                    "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "code": "spot_trade_warehouse_sell_hall",
+                    "title": "卖大厅",
+                    "sort": 1,
+                    "type": 1,
+                    "rulekey": "",
                     "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
+                      }
                     ]
                   }
                 ]

src/common/constants/enumOrderComponents.ts

@@ -6,16 +6,14 @@ export enum enumOrderComponents {
 						
 						pre_sale_warehouse_receipt = 'pre_sale_warehouse_receipt', // 预售仓单
 						
-						funding_information = 'funding_information', // 资金信息
-						
 						performance_information = 'performance_information', // 履约信息
 						
+						funding_information = 'funding_information', // 资金信息
+						
 						spot_warrant_spot_summary = 'spot_warrant_spot_summary', // 现货汇总
 						
 						spot_warrant_inventory_summary = 'spot_warrant_inventory_summary', // 库存汇总
 						
-						spot_warrant_spot_details = 'spot_warrant_spot_details', // 现货明细
-						
 						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
 						
 						spot_warrant_deal = 'spot_warrant_deal', // 成交
@@ -28,18 +26,18 @@ export enum enumOrderComponents {
 						
 						pre_sale_warehouse_receipt_pending_order = 'pre_sale_warehouse_receipt_pending_order', // 挂单
 						
-						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
-						
-						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
-						
-						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
-						
 						pre_sale_warehouse_receipt_deal = 'pre_sale_warehouse_receipt_deal', // 成交
 						
+						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
+						
 						performance_information_buy_performance = 'performance_information_buy_performance', // 买履约
 						
 						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
 						
+						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
+						
+						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
+						
 						pre_sale_warehouse_receipt_designated_deal_resell = 'pre_sale_warehouse_receipt_designated_deal_resell', // 撤销出售
 						
 		}

src/common/constants/enumRouterName.ts

@@ -1,12 +1,10 @@
 // 路由名 枚举
 export enum EnumRouterName {
-						remark = 'remark', // 
-						
-						manage = 'manage', // 管理
+						market = 'market', // 市场
 						
 						business = 'business', // 业务
 						
-						info = 'info', // 信息
+						manage = 'manage', // 管理
 						
 						report = 'report', // 报表
 						
@@ -14,38 +12,34 @@ export enum EnumRouterName {
 						
 						platinum = 'platinum', // 铂金宝
 						
-						market = 'market', // 市场
+						remark = 'remark', // 
 						
-						business_review = 'business_review', // 业务审核
+						info = 'info', // 信息
 						
-						finance_review = 'finance_review', // 财务审核
+						spot_trade = 'spot_trade', // 现货贸易
 						
-						inventory_review = 'inventory_review', // 库存审核
+						futures = 'futures', // 期货
 						
 						purchase = 'purchase', // 采购
 						
 						exposure = 'exposure', // 敞口
 						
-						sell = 'sell', // 销售
-						
 						plan = 'plan', // 计划
 						
-						custom_info = 'custom_info', // 客户资料
-						
-						goods_info = 'goods_info', // 商品信息
-						
-						spot_contract = 'spot_contract', // 现货合同
+						sell = 'sell', // 销售
 						
-						warehouse_info = 'warehouse_info', // 仓库信息
+						business_review = 'business_review', // 业务审核
 						
-						account_info = 'account_info', // 账户管理
+						inventory_review = 'inventory_review', // 库存审核
 						
 						finance_report = 'finance_report', // 财务报表
 						
-						spot_report = 'spot_report', // 现货报表
+						finance_review = 'finance_review', // 财务审核
 						
 						exposure_report = 'exposure_report', // 敞口报表
 						
+						spot_report = 'spot_report', // 现货报表
+						
 						inventory_report = 'inventory_report', // 库存报表
 						
 						sum_pl_report = 'sum_pl_report', // 汇总损益报表
@@ -68,10 +62,10 @@ export enum EnumRouterName {
 						
 						platinum_document_query = 'platinum_document_query', // 单据查询
 						
-						platinum_contract_goods = 'platinum_contract_goods', // 合约商品
-						
 						platinum_financing_information = 'platinum_financing_information', // 融资信息
 						
+						platinum_contract_goods = 'platinum_contract_goods', // 合约商品
+						
 						platinum_contract_commodity_suspension = 'platinum_contract_commodity_suspension', // 合约商品停牌
 						
 						platinum_spot_and_price = 'platinum_spot_and_price', // 现货市价
@@ -80,41 +74,45 @@ export enum EnumRouterName {
 						
 						platinum_agreement = 'platinum_agreement', // 协议管理
 						
-						spot_trade = 'spot_trade', // 现货贸易
+						custom_info = 'custom_info', // 客户资料
 						
-						futures = 'futures', // 期货
+						goods_info = 'goods_info', // 商品信息
 						
-						business_review_someprice = 'business_review_someprice', // 点价
+						spot_contract = 'spot_contract', // 现货合同
 						
-						business_review_settlement = 'business_review_settlement', // 交收
+						warehouse_info = 'warehouse_info', // 仓库信息
 						
-						finance_review_funds = 'finance_review_funds', // 款项
+						account_info = 'account_info', // 账户管理
 						
-						finance_review_invoice = 'finance_review_invoice', // 发票
+						warehouse_receipt_trade = 'warehouse_receipt_trade', // 仓单贸易
 						
-						inventory_review_checkin = 'inventory_review_checkin', // 入库
+						warehouse_pre_sale = 'warehouse_pre_sale', // 仓单预售
 						
-						inventory_review_checkout = 'inventory_review_checkout', // 出库
+						night_plate = 'night_plate', // 夜盘
 						
-						purchase_pending = 'purchase_pending', // 待点价
+						dominant_contract = 'dominant_contract', // 主力
 						
-						purchase_all = 'purchase_all', // 全部
+						position = 'position', // 持仓
 						
-						purchase_performance = 'purchase_performance', // 履约交收
+						orderdetail = 'orderdetail', // 委托
 						
-						exposure_realtime = 'exposure_realtime', // 实时敞口
+						main_contract = 'main_contract', // 主连
 						
-						exposure_futures = 'exposure_futures', // 期货头寸
+						tradedetail = 'tradedetail', // 成交
 						
-						exposure_history = 'exposure_history', // 历史敞口
+						closedetail = 'closedetail', // 平仓
 						
-						exposure_spot = 'exposure_spot', // 现货头寸
+						purchase_pending = 'purchase_pending', // 待点价
 						
-						sell_pending = 'sell_pending', // 待点价
+						purchase_performance = 'purchase_performance', // 履约交收
 						
-						sell_performance = 'sell_performance', // 履约交收
+						exposure_realtime = 'exposure_realtime', // 实时敞口
 						
-						sell_all = 'sell_all', // 全部
+						exposure_spot = 'exposure_spot', // 现货头寸
+						
+						exposure_futures = 'exposure_futures', // 期货头寸
+						
+						exposure_history = 'exposure_history', // 历史敞口
 						
 						plan_uncommitted = 'plan_uncommitted', // 未提交
 						
@@ -122,57 +120,45 @@ export enum EnumRouterName {
 						
 						plan_running = 'plan_running', // 执行中
 						
-						custom_info_checkpending = 'custom_info_checkpending', // 待审核
-						
-						custom_info_disabled = 'custom_info_disabled', // 停用
-						
-						custom_info_normal = 'custom_info_normal', // 正常
-						
-						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
-						
-						goods_info_spot = 'goods_info_spot', // 现货品种
-						
-						goods_info_hedge = 'goods_info_hedge', // 套保品种
+						purchase_all = 'purchase_all', // 全部
 						
-						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
+						sell_performance = 'sell_performance', // 履约交收
 						
-						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
+						sell_all = 'sell_all', // 全部
 						
-						spot_contract_performance = 'spot_contract_performance', // 履约中
+						business_review_someprice = 'business_review_someprice', // 点价
 						
-						spot_contract_finished = 'spot_contract_finished', // 已完成
+						business_review_settlement = 'business_review_settlement', // 交收
 						
-						warehouse_info_normal = 'warehouse_info_normal', // 正常
+						inventory_review_checkin = 'inventory_review_checkin', // 入库
 						
-						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
+						inventory_review_checkout = 'inventory_review_checkout', // 出库
 						
-						account_info_business = 'account_info_business', // 业务账户
+						sell_pending = 'sell_pending', // 待点价
 						
-						account_info_trade = 'account_info_trade', // 交易账户
+						finance_report_finance = 'finance_report_finance', // 财务报表
 						
-						account_info_manager = 'account_info_manager', // 管理账户
+						finance_review_funds = 'finance_review_funds', // 款项
 						
-						account_info_futures = 'account_info_futures', // 期货账户
+						finance_review_invoice = 'finance_review_invoice', // 发票
 						
-						finance_report_finance = 'finance_report_finance', // 财务报表
+						exposure_report_exposure = 'exposure_report_exposure', // 敞口报表
 						
 						spot_report_spot = 'spot_report_spot', // 现货报表
 						
-						exposure_report_exposure = 'exposure_report_exposure', // 敞口报表
-						
 						inventory_report_inventory_category = 'inventory_report_inventory_category', // 库存报表(品类)
 						
 						inventory_report_warehouse = 'inventory_report_warehouse', // 库存报表(仓库)
 						
-						sum_pl_report_sum_pl = 'sum_pl_report_sum_pl', // 汇总损益报表
-						
 						future_report_future = 'future_report_future', // 期货报表
 						
-						outaccount_status_status = 'outaccount_status_status', // 账户状态
+						sum_pl_report_sum_pl = 'sum_pl_report_sum_pl', // 汇总损益报表
+						
+						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
 						
 						inventory_current = 'inventory_current', // 当前库存
 						
-						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
+						outaccount_status_status = 'outaccount_status_status', // 账户状态
 						
 						platinum_custom_info_normal = 'platinum_custom_info_normal', // 正常
 						
@@ -184,7 +170,7 @@ export enum EnumRouterName {
 						
 						platinum_pick_query_tab = 'platinum_pick_query_tab', // 提货查询
 						
-						platinum_recharge_review_tab = 'platinum_recharge_review_tab', // 充值审核
+						platinum_withdrawal_review_tab = 'platinum_withdrawal_review_tab', // 提现审核
 						
 						platinum_fixed_investment_price_query_tab = 'platinum_fixed_investment_price_query_tab', // 定投价查询
 						
@@ -192,6 +178,8 @@ export enum EnumRouterName {
 						
 						platinum_fixed_investment_flow_query = 'platinum_fixed_investment_flow_query', // 定投流水查询
 						
+						platinum_recharge_review_tab = 'platinum_recharge_review_tab', // 充值审核
+						
 						platinum_document_query_position = 'platinum_document_query_position', // 持仓
 						
 						platinum_document_query_order = 'platinum_document_query_order', // 委托单
@@ -202,41 +190,45 @@ export enum EnumRouterName {
 						
 						platinum_financing_information_tab = 'platinum_financing_information_tab', // 融资信息
 						
+						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
+						
 						platinum_contract_commodity_suspension_tab = 'platinum_contract_commodity_suspension_tab', // 合约商品停牌
 						
-						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
+						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
 						
 						platinum_agents_and_stores_tab = 'platinum_agents_and_stores_tab', // 代理和门店
 						
 						platinum_agreement_tab = 'platinum_agreement_tab', // 协议管理
 						
-						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
+						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
 						
-						warehouse_receipt_trade = 'warehouse_receipt_trade', // 仓单贸易
+						custom_info_checkpending = 'custom_info_checkpending', // 待审核
 						
-						warehouse_pre_sale = 'warehouse_pre_sale', // 仓单预售
+						custom_info_disabled = 'custom_info_disabled', // 停用
 						
-						dominant_contract = 'dominant_contract', // 主力
+						goods_info_spot = 'goods_info_spot', // 现货品种
 						
-						main_contract = 'main_contract', // 主连
+						goods_info_hedge = 'goods_info_hedge', // 套保品种
 						
-						night_plate = 'night_plate', // 夜盘
+						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
 						
-						orderdetail = 'orderdetail', // 委托
+						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
 						
-						tradedetail = 'tradedetail', // 成交
+						spot_contract_performance = 'spot_contract_performance', // 履约中
 						
-						closedetail = 'closedetail', // 平仓
+						spot_contract_finished = 'spot_contract_finished', // 已完成
 						
-						platinum_withdrawal_review_tab = 'platinum_withdrawal_review_tab', // 提现审核
+						warehouse_info_normal = 'warehouse_info_normal', // 正常
 						
-						goods_info_spot_normal = 'goods_info_spot_normal', // 正常
+						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
 						
-						goods_info_hedge_normal = 'goods_info_hedge_normal', // 正常
+						account_info_business = 'account_info_business', // 业务账户
 						
-						goods_info_hedge_disable = 'goods_info_hedge_disable', // 停用
+						account_info_trade = 'account_info_trade', // 交易账户
 						
-						goods_info_spot_disable = 'goods_info_spot_disable', // 停用
+						account_info_futures = 'account_info_futures', // 期货账户
+						
+						account_info_manager = 'account_info_manager', // 管理账户
 						
 						warehouse_receipt_trade_price = 'warehouse_receipt_trade_price', // 一口价挂牌
 						
@@ -246,4 +238,16 @@ export enum EnumRouterName {
 						
 						warehouse_pre_sale_floating_price = 'warehouse_pre_sale_floating_price', // 浮动价预售
 						
+						goods_info_spot_normal = 'goods_info_spot_normal', // 正常
+						
+						goods_info_spot_disable = 'goods_info_spot_disable', // 停用
+						
+						goods_info_hedge_normal = 'goods_info_hedge_normal', // 正常
+						
+						goods_info_hedge_disable = 'goods_info_hedge_disable', // 停用
+						
+						spot_trade_warehouse_buy_hall = 'spot_trade_warehouse_buy_hall', // 买大厅
+						
+						spot_trade_warehouse_sell_hall = 'spot_trade_warehouse_sell_hall', // 卖大厅
+						
 		}

src/common/constants/modalNameEnum.ts

@@ -4,34 +4,24 @@ export enum ModalEnum {
     commomOrder = 'commom-order', // 下单通用界面
 
     detail = 'detail', // 详情
-						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
+						spot_warrant_inventory_summar_pick_up = 'spot_warrant_inventory_summar_pick_up', // 提货
 						
-						spot_warrant_inventory_summary_detail = 'spot_warrant_inventory_summary_detail', // 仓单明细
-						
-						spot_warrant_inventory_summary_listed = 'spot_warrant_inventory_summary_listed', // 挂牌
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
 						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
-						
 						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
+						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
-						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
+						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
 						
 						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
-						
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
+						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
 						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
 						
-						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
-						
-						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
-						
 						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
 						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
@@ -40,15 +30,15 @@ export enum ModalEnum {
 						
 						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
 						
-						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
+						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
 						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
 						
-						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
+						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
 						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
-						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
+						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
 						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
@@ -56,35 +46,27 @@ export enum ModalEnum {
 						
 						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
 						
-						warehouse_receipt_trade_price_post_buying = 'warehouse_receipt_trade_price_post_buying', // 发布求购
-						
 						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
 						
-						warehouse_receipt_trade_price_detail = 'warehouse_receipt_trade_price_detail', // 详情
-						
-						warehouse_receipt_trade_price_delisting = 'warehouse_receipt_trade_price_delisting', // 摘牌
-						
-						warehouse_receipt_trade_floating_price_post_buying = 'warehouse_receipt_trade_floating_price_post_buying', // 发布求购
-						
-						warehouse_receipt_trade_floating_price_detail = 'warehouse_receipt_trade_floating_price_detail', // 详情
-						
-						warehouse_receipt_trade_floating_price_delisting = 'warehouse_receipt_trade_floating_price_delisting', // 摘牌
+						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 发布求购
 						
-						capacity_pre_sale_purchase = 'capacity_pre_sale_purchase', // 发布求购
+						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
 						
-						capacity_pre_sale_detail = 'capacity_pre_sale_detail', // 详情
-						
-						capacity_pre_sale_delisting = 'capacity_pre_sale_delisting', // 摘牌
+						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
 						
 						open = 'open', // 开仓
 						
 						close = 'close', // 平仓
 						
-						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						
+						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
 						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
 						
-						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
+						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
+						
+						spot_warrant_inventory_summary_listed = 'spot_warrant_inventory_summary_listed', // 挂牌
 						
 						custom_info_btn_check = 'custom_info_btn_check', // 审核
 						
@@ -92,7 +74,7 @@ export enum ModalEnum {
 						
 						custom_info_btn_disable = 'custom_info_btn_disable', // 停用
 						
-						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
+						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
 						
 						goods_info_spot_normal_add = 'goods_info_spot_normal_add', // 新增
 						
@@ -132,12 +114,10 @@ export enum ModalEnum {
 						
 						business_review_settlement_cancel = 'business_review_settlement_cancel', // 撤销
 						
-						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+						finance_review_funds_audit = 'finance_review_funds_audit', // 审核
 						
 						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
 						
-						finance_review_funds_audit = 'finance_review_funds_audit', // 审核
-						
 						finance_review_invoice_audit = 'finance_review_invoice_audit', // 审核
 						
 						finance_review_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
@@ -164,12 +144,14 @@ export enum ModalEnum {
 						
 						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
 						
-						platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
-						
 						platinum_recharge_review_refuse = 'platinum_recharge_review_refuse', // 审核拒绝
 						
 						platinum_withdrawal_review_confirm_withdrawal = 'platinum_withdrawal_review_confirm_withdrawal', // 确认提现
 						
+						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
+						
+						platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
+						
 						platinum_withdrawal_review_refuse = 'platinum_withdrawal_review_refuse', // 审核拒绝
 						
 						platinum_financing_information_detail = 'platinum_financing_information_detail', // 融资明细
@@ -178,26 +160,28 @@ export enum ModalEnum {
 						
 						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
 						
+						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+						
 						platinum_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
 						
 						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
 						
 						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
 						
-						platinum_agreement_add = 'platinum_agreement_add', // 新增
-						
 						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
 						
+						platinum_agreement_add = 'platinum_agreement_add', // 新增
+						
 						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
 						
 						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
-						
 						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
 						
+						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
+						
 						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
 						
 						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
@@ -216,34 +200,26 @@ export enum ModalEnum {
 						
 						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
 						
-						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
-						
 						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
 						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
 						
 						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 						
-						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
+						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
 						
-						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
+						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+						
 						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
 						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
-						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
-						
-						sell_pending_funds = 'sell_pending_funds', // 款项登记
-						
-						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
-						
-						sell_pending_storage = 'sell_pending_storage', // 出库登记
-						
 						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
 						
 						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
@@ -252,6 +228,14 @@ export enum ModalEnum {
 						
 						plan_audit_cancel = 'plan_audit_cancel', // 撤销
 						
+						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+						
+						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+						
+						sell_pending_storage = 'sell_pending_storage', // 出库登记
+						
+						sell_pending_funds = 'sell_pending_funds', // 款项登记
+						
 						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
 						
 						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
@@ -264,15 +248,11 @@ export enum ModalEnum {
 						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
-						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
-						
 						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
 						
-						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
-						
-						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
 						
-						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
 						
 						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
@@ -288,25 +268,27 @@ export enum ModalEnum {
 						
 						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
+						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+						
+						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+						
 						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
 						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
 						
-						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
-						
 						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
+						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
+						
 						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
 						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
-						
 						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
-						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
-						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
+						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
 						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
 						
@@ -314,4 +296,6 @@ export enum ModalEnum {
 						
 						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
 						
+						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
+						
 		}

src/common/setup/table/button.ts

@@ -12,7 +12,7 @@ import { BtnClassName, BtnList, ButtonListKey } from './interface';
  * @param val
  * @returns
  */
-function getClassName(val: string): BtnClassName {
+export function getClassName(val: string): BtnClassName {
     let result: BtnClassName = 'btnDeafault'
     const btnDanger = ['disable', 'cancle', 'cancel', 'delete', 'logout', 'locked', 'refuse']
     const operBtn = ['add', 'modify', 'reset', 'credit', 'payment', 'confirm_withdrawal', 'complete_stocking', 'upload_logistics',
@@ -193,7 +193,12 @@ export function _getBtnList(menuType: keyof ButtonListKey, hasDetail: boolean):
     return _handleBtnList(list, hasDetail)
 }
 
-export function getBtnList_(menuType: EnumRouterName, hasDetail: boolean) {
+/**
+ * 根据当前tab页面的code 枚举查找对应的数据
+ * @param menuType
+ * @returns
+ */
+export function findChildList(menuType: EnumRouterName): OperationTabMenu | undefined {
     const data = getThirdMenuData()
     let list: OperationTabMenu | undefined = undefined
     // 这里处理有两层路由菜单
@@ -209,5 +214,10 @@ export function getBtnList_(menuType: EnumRouterName, hasDetail: boolean) {
         return null
     }
     findFn(data)
+    return list
+}
+// 处理有三级路由的特殊情况，例如仓单贸易
+export function getBtnList_(menuType: EnumRouterName, hasDetail: boolean) {
+    const list = findChildList(menuType)
     return _handleBtnList_(list, hasDetail)
 }

src/router/index.ts

@@ -935,12 +935,12 @@ const routes: Array<RouteRecordRaw> = [
             },
             {
                 path: '/spot_trade',
-                name: 'spot_trade',
+                name: EnumRouterName.spot_trade,
                 component: Main,
                 meta: {
                     requireAuth: true,
                 },
-                redirect: { name: EnumRouterName.spot_trade, },
+                redirect: { name: EnumRouterName.warehouse_receipt_trade, },
                 children: [
                     {
                         path: '/spot_trade/warehouse_receipt_trade',

src/services/proto/warehousetrade/index.ts

@@ -7,7 +7,6 @@ import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
  * @param param
  */
 export const hdWROrder = (param: HdWROrderReq): Promise<any> => {
-    debugger
     return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', 5)
 }
 

src/services/socket/protobuf/buildReq.ts

@@ -269,7 +269,6 @@ function lower(value: string): string {
  */
 export function protoMiddleware<T>(param: T, reqName: string, rspName: string, headerEnum: HeadEnum = 0): Promise<any> {
     return new Promise((resolve, reject) => {
-        debugger
         const params = {
             protobufName: reqName,
             funCodeName: reqName,
@@ -277,10 +276,8 @@ export function protoMiddleware<T>(param: T, reqName: string, rspName: string, h
             headerEnum,
         };
         const package50 = buildProtoReq50(params);
-        debugger
         APP.sendTradingServer(package50, undefined, {
             onSuccess: (res) => {
-                debugger
                 const { isSuccess, result } = parseProtoRsp50(res, rspName);
                 if (isSuccess) {
                     resolve(result);
@@ -289,7 +286,6 @@ export function protoMiddleware<T>(param: T, reqName: string, rspName: string, h
                 }
             },
             onFail: (err) => {
-                debugger
                 console.log(`proto:${reqName}错误消息：${err}`)
                 reject(err.message)
             },

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

@@ -141,7 +141,6 @@ export default defineComponent({
             HasWr: 1,
         };
         console.log(param);
-        debugger;
         requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
             // cancel(true);
         });

src/views/business/order/spot_warran/index.vue

@@ -26,7 +26,7 @@ export default defineComponent({
         [enumOrderComponents.spot_warrant_inventory_summary]: defineAsyncComponent(() => import('./components/spot_warrant_inventory_summary/index.vue')),
         [enumOrderComponents.spot_warrant_pending_order]: defineAsyncComponent(() => import('./components/spot_warrant_pending_order/index.vue')),
         [enumOrderComponents.spot_warrant_spot_summary]: defineAsyncComponent(() => import('./components/spot_warrant_spot_summary/index.vue')),
-        [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
+        // [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
     },
     setup() {
         return { ...handleOrderDetailList(enumOrderComponents.spot_warrant) };

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

@@ -75,7 +75,7 @@ import { LineChartOutlined } from '@ant-design/icons-vue';
 
 export default defineComponent({
     emits: ['cancel'],
-    name: ModalEnum.warehouse_receipt_trade_price_delisting,
+    name: 'buy-sell-market',
     props: {
         wrpricetype: {
             // 价格方式 - 1:固定价 2-浮动价

src/views/market/spot_trade/components/post_buying/index.vue

@@ -27,7 +27,7 @@ import { ModalEnum } from '@/common/constants/modalNameEnum';
 
 export default defineComponent({
     emits: ['cancel'],
-    name: ModalEnum.warehouse_receipt_trade_price_post_buying,
+    name: ModalEnum.spot_trade_warehouse_post_buying,
     components: { Des },
     props: {
         selectedRow: {

src/views/market/spot_trade/interface.ts

@@ -0,0 +1,5 @@
+import { BtnList } from '@/common/components/btnList/interface';
+export interface BuyAndSellMarket {
+    isMarket: boolean,
+    btnList: BtnList[],
+}

src/views/market/spot_trade/setup.ts

@@ -1,10 +1,29 @@
 import { BtnList } from '@/common/components/btnList/interface';
 import { ContextMenuTemp } from "@/common/components/contextMenu/interface";
 import { handleContextMenu } from "@/common/components/contextMenu/setup";
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableColumns, getTableEvent, initData } from "@/common/export/table";
-import { getBtnList_ } from "@/common/setup/table/button";
+import { findChildList, getClassName } from "@/common/setup/table/button";
 import { ComposeTableParam, TableEventCB } from "@/common/setup/table/interface";
+import { OperationTabMenu } from '@/services/go/commonService/interface';
 import { onUnmounted, ref } from "vue";
+import { BuyAndSellMarket } from './interface';
+
+// 报价大厅操作按钮列表
+const priceBtnList = ref<BtnList[]>([])
+
+// 买大厅数据
+const buyMarket: BuyAndSellMarket = {
+    isMarket: true,
+    btnList: []
+}
+
+// 卖大厅数据
+const sellMarket: BuyAndSellMarket = {
+    isMarket: true,
+    btnList: []
+}
+
 
 // 表格 + 表头 + 右键 + 单击表格 + 按钮列表 通用处理逻辑
 export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName, tableFilterKey }: ComposeTableParam) {
@@ -34,7 +53,36 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
     // 表格事件
     const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
     // 表格操作按钮列表
-    const [firstBtn, secondBtn] = getBtnList_(menuType, isDetail).value;
+    const list = findChildList(menuType);
+    if (list) {
+        const fnMap = (arr: OperationTabMenu[]) => {
+            return arr.map(e => {
+                const { code, title } = e;
+                return { lable: title, code, className: getClassName(code) }
+            })
+        }
+        // 过滤报价大厅按钮列表
+        const temp = list.children.filter(e => e.type === 2)
+        priceBtnList.value = fnMap(temp)
+        priceBtnList.value.push({ lable: '买卖大厅', code: 'buyAndSell', className: 'btnPrimary' })
+
+        const fn = (code: EnumRouterName) => {
+            const findResult = list.children.find(e => e.code === code)
+            const result: BuyAndSellMarket = { isMarket: false, btnList: [] }
+            if (findResult) {
+                result.isMarket = true
+                const arr = findResult.children.filter(e => e.type === 2)
+                result.btnList = fnMap(arr)
+            }
+            return result
+        }
+
+        // 处理买大厅
+        Object.assign(buyMarket, fn(EnumRouterName.spot_trade_warehouse_buy_hall))
+        // 处理卖大厅
+        Object.assign(sellMarket, fn(EnumRouterName.spot_trade_warehouse_sell_hall))
+    }
+
     // 关闭右键
     function closeContext(value: BtnList | null) {
         // 打开对应的弹窗组件
@@ -56,6 +104,10 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         columns, registerColumn, updateColumn,  // 表头
         expandedRowKeys, selectedRow, Rowclick, // 表格折腾面板数据与单击、双击事件
         componentId, closeComponent,  // 控制异步组件
-        firstBtn, secondBtn, // 表格按钮
+        firstBtn: priceBtnList, // 表格按钮
     }
 }
+
+export function getBuyAndSellMarketData() {
+    return { buyMarket, sellMarket }
+}

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 仓单贸易 浮动价挂牌-->
-  <div class="warehouse_receipt_trade_floating_price topTableHeight">
+  <div class="topTableHeight">
     <a-table :columns="columns"
              class="srcollYTable"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
@@ -33,9 +33,9 @@ export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_floating_price,
     components: {
         contextMenu,
-        [ModalEnum.warehouse_receipt_trade_floating_price_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
-        [ModalEnum.warehouse_receipt_trade_floating_price_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
-        [ModalEnum.warehouse_receipt_trade_floating_price_delisting]: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
+        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
     },
     setup() {
         // 表格列表数据

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

@@ -1,19 +1,69 @@
 <template>
   <!-- 仓单预售 一口价挂牌-->
-  <div class="warehouse_receipt_trade_price topTableHeight">一口价挂牌</div>
+  <div class="topTableHeight">
+    <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="firstBtn"></contextMenu>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { defineComponent } from '@/common/export/commonTable';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, 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';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_price,
+    components: {
+        contextMenu,
+        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
+    },
     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_price,
+            tableName: 'table_pcweb_agreement',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            loading,
+            tableList,
+        };
     },
 });
 </script>
 <style lang="less">
-
 </style>