Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/services/go/wrtrade/index.ts

generate-code/pc_menu_企业风管.json

@@ -64,12 +64,25 @@
             "url": "",
             "remark": "",
             "children": [
+
+            ]
+          },
+          {
+            "code": "spot_warrant_spot_details",
+            "title": "现货明细",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
               {
-                "code": "spot_warrant_inventory_summary_listed",
+                "code": "spot_warrant_spot_details_listed",
                 "title": "挂牌",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_warehouse_listed_btn",
+                "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -77,11 +90,11 @@
                 ]
               },
               {
-                "code": "spot_warrant_inventory_summar_pick_up",
+                "code": "spot_warrant_spot_details_pick_up",
                 "title": "提货",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_summary_warehouse_pick_up_btn",
+                "rulekey": "client_pc_web_spot_production_bottom_spot_details_pick_up",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -619,7 +632,7 @@
                     "title": "买大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_price_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -629,7 +642,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_price_buy_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -643,7 +656,7 @@
                     "title": "卖大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_price_sell_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -653,7 +666,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_price_sell_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -703,7 +716,7 @@
                     "title": "买大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -713,7 +726,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -727,7 +740,7 @@
                     "title": "卖大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_floating_price_sell_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -737,7 +750,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_floating_price_sell_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -799,7 +812,7 @@
                     "title": "买大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -809,7 +822,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -823,7 +836,7 @@
                     "title": "卖大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_sell_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -833,7 +846,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_sell_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -883,7 +896,7 @@
                     "title": "买大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -893,7 +906,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",
@@ -907,7 +920,7 @@
                     "title": "卖大厅",
                     "sort": 1,
                     "type": 1,
-                    "rulekey": "",
+                    "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_sell_hall",
                     "isshow": true,
                     "url": "",
                     "remark": "",
@@ -917,7 +930,7 @@
                         "title": "摘牌",
                         "sort": 1,
                         "type": 2,
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_sell_hall_delist",
                         "isshow": true,
                         "url": "",
                         "remark": "",

src/common/constants/enumOrderComponents.ts

@@ -10,14 +10,14 @@ export enum enumOrderComponents {
 						
 						funding_information = 'funding_information', // 资金信息
 						
-						spot_warrant_spot_summary = 'spot_warrant_spot_summary', // 现货汇总
-						
 						spot_warrant_inventory_summary = 'spot_warrant_inventory_summary', // 库存汇总
 						
 						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
 						
 						spot_warrant_deal = 'spot_warrant_deal', // 成交
 						
+						spot_warrant_spot_details = 'spot_warrant_spot_details', // 现货明细
+						
 						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
 						
 						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 出入库
@@ -38,6 +38,8 @@ export enum enumOrderComponents {
 						
 						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
 						
+						spot_warrant_spot_summary = 'spot_warrant_spot_summary', // 现货汇总
+						
 						pre_sale_warehouse_receipt_designated_deal_resell = 'pre_sale_warehouse_receipt_designated_deal_resell', // 撤销出售
 						
 		}

src/common/constants/enumRouterName.ts

@@ -4,17 +4,17 @@ export enum EnumRouterName {
 						
 						business = 'business', // 业务
 						
+						info = 'info', // 信息
+						
 						manage = 'manage', // 管理
 						
 						report = 'report', // 报表
 						
-						search = 'search', // 查询
-						
 						platinum = 'platinum', // 铂金宝
 						
 						remark = 'remark', // 
 						
-						info = 'info', // 信息
+						search = 'search', // 查询
 						
 						spot_trade = 'spot_trade', // 现货贸易
 						
@@ -24,17 +24,27 @@ export enum EnumRouterName {
 						
 						exposure = 'exposure', // 敞口
 						
+						sell = 'sell', // 销售
+						
 						plan = 'plan', // 计划
 						
-						sell = 'sell', // 销售
+						custom_info = 'custom_info', // 客户资料
+						
+						goods_info = 'goods_info', // 商品信息
+						
+						spot_contract = 'spot_contract', // 现货合同
+						
+						warehouse_info = 'warehouse_info', // 仓库信息
 						
 						business_review = 'business_review', // 业务审核
 						
+						finance_review = 'finance_review', // 财务审核
+						
 						inventory_review = 'inventory_review', // 库存审核
 						
-						finance_report = 'finance_report', // 财务报表
+						account_info = 'account_info', // 账户管理
 						
-						finance_review = 'finance_review', // 财务审核
+						finance_report = 'finance_report', // 财务报表
 						
 						exposure_report = 'exposure_report', // 敞口报表
 						
@@ -46,8 +56,6 @@ export enum EnumRouterName {
 						
 						future_report = 'future_report', // 期货报表
 						
-						outaccount_status = 'outaccount_status', // 账户状态
-						
 						platinum_customer_info = 'platinum_customer_info', // 客户资料
 						
 						platinum_pick_goods_management = 'platinum_pick_goods_management', // 提货商品管理
@@ -68,36 +76,28 @@ export enum EnumRouterName {
 						
 						platinum_contract_commodity_suspension = 'platinum_contract_commodity_suspension', // 合约商品停牌
 						
-						platinum_spot_and_price = 'platinum_spot_and_price', // 现货市价
-						
 						platinum_agents_and_stores = 'platinum_agents_and_stores', // 代理和门店
 						
-						platinum_agreement = 'platinum_agreement', // 协议管理
-						
-						custom_info = 'custom_info', // 客户资料
-						
-						goods_info = 'goods_info', // 商品信息
-						
-						spot_contract = 'spot_contract', // 现货合同
+						platinum_spot_and_price = 'platinum_spot_and_price', // 现货市价
 						
-						warehouse_info = 'warehouse_info', // 仓库信息
+						platinum_agreement = 'platinum_agreement', // 协议管理
 						
-						account_info = 'account_info', // 账户管理
+						outaccount_status = 'outaccount_status', // 账户状态
 						
 						warehouse_receipt_trade = 'warehouse_receipt_trade', // 仓单贸易
 						
 						warehouse_pre_sale = 'warehouse_pre_sale', // 仓单预售
 						
+						dominant_contract = 'dominant_contract', // 主力
+						
 						night_plate = 'night_plate', // 夜盘
 						
-						dominant_contract = 'dominant_contract', // 主力
+						main_contract = 'main_contract', // 主连
 						
 						position = 'position', // 持仓
 						
 						orderdetail = 'orderdetail', // 委托
 						
-						main_contract = 'main_contract', // 主连
-						
 						tradedetail = 'tradedetail', // 成交
 						
 						closedetail = 'closedetail', // 平仓
@@ -106,6 +106,8 @@ export enum EnumRouterName {
 						
 						purchase_performance = 'purchase_performance', // 履约交收
 						
+						purchase_all = 'purchase_all', // 全部
+						
 						exposure_realtime = 'exposure_realtime', // 实时敞口
 						
 						exposure_spot = 'exposure_spot', // 现货头寸
@@ -114,33 +116,63 @@ export enum EnumRouterName {
 						
 						exposure_history = 'exposure_history', // 历史敞口
 						
-						plan_uncommitted = 'plan_uncommitted', // 未提交
+						sell_pending = 'sell_pending', // 待点价
 						
-						plan_audit = 'plan_audit', // 待审核
+						sell_performance = 'sell_performance', // 履约交收
+						
+						sell_all = 'sell_all', // 全部
+						
+						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
 						
 						plan_running = 'plan_running', // 执行中
 						
-						purchase_all = 'purchase_all', // 全部
+						custom_info_checkpending = 'custom_info_checkpending', // 待审核
 						
-						sell_performance = 'sell_performance', // 履约交收
+						custom_info_disabled = 'custom_info_disabled', // 停用
 						
-						sell_all = 'sell_all', // 全部
+						goods_info_spot = 'goods_info_spot', // 现货品种
+						
+						goods_info_hedge = 'goods_info_hedge', // 套保品种
+						
+						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
+						
+						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
+						
+						spot_contract_performance = 'spot_contract_performance', // 履约中
+						
+						spot_contract_finished = 'spot_contract_finished', // 已完成
+						
+						plan_audit = 'plan_audit', // 待审核
+						
+						warehouse_info_normal = 'warehouse_info_normal', // 正常
+						
+						plan_uncommitted = 'plan_uncommitted', // 未提交
+						
+						custom_info_normal = 'custom_info_normal', // 正常
+						
+						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
 						
 						business_review_someprice = 'business_review_someprice', // 点价
 						
 						business_review_settlement = 'business_review_settlement', // 交收
 						
+						finance_review_funds = 'finance_review_funds', // 款项
+						
+						finance_review_invoice = 'finance_review_invoice', // 发票
+						
 						inventory_review_checkin = 'inventory_review_checkin', // 入库
 						
 						inventory_review_checkout = 'inventory_review_checkout', // 出库
 						
-						sell_pending = 'sell_pending', // 待点价
+						account_info_business = 'account_info_business', // 业务账户
 						
-						finance_report_finance = 'finance_report_finance', // 财务报表
+						account_info_trade = 'account_info_trade', // 交易账户
 						
-						finance_review_funds = 'finance_review_funds', // 款项
+						account_info_manager = 'account_info_manager', // 管理账户
 						
-						finance_review_invoice = 'finance_review_invoice', // 发票
+						account_info_futures = 'account_info_futures', // 期货账户
+						
+						finance_report_finance = 'finance_report_finance', // 财务报表
 						
 						exposure_report_exposure = 'exposure_report_exposure', // 敞口报表
 						
@@ -150,15 +182,9 @@ export enum EnumRouterName {
 						
 						inventory_report_warehouse = 'inventory_report_warehouse', // 库存报表(仓库)
 						
-						future_report_future = 'future_report_future', // 期货报表
-						
 						sum_pl_report_sum_pl = 'sum_pl_report_sum_pl', // 汇总损益报表
 						
-						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
-						
-						inventory_current = 'inventory_current', // 当前库存
-						
-						outaccount_status_status = 'outaccount_status_status', // 账户状态
+						future_report_future = 'future_report_future', // 期货报表
 						
 						platinum_custom_info_normal = 'platinum_custom_info_normal', // 正常
 						
@@ -170,84 +196,60 @@ export enum EnumRouterName {
 						
 						platinum_pick_query_tab = 'platinum_pick_query_tab', // 提货查询
 						
-						platinum_withdrawal_review_tab = 'platinum_withdrawal_review_tab', // 提现审核
+						platinum_recharge_review_tab = 'platinum_recharge_review_tab', // 充值审核
 						
-						platinum_fixed_investment_price_query_tab = 'platinum_fixed_investment_price_query_tab', // 定投价查询
+						platinum_withdrawal_review_tab = 'platinum_withdrawal_review_tab', // 提现审核
 						
 						platinum_fixed_investment_plan_query = 'platinum_fixed_investment_plan_query', // 定投计划查询
 						
 						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', // 委托单
 						
-						platinum_document_query_success = 'platinum_document_query_success', // 成交单
-						
 						platinum_document_query_waiting = 'platinum_document_query_waiting', // 待付单
 						
+						platinum_document_query_success = 'platinum_document_query_success', // 成交单
+						
 						platinum_financing_information_tab = 'platinum_financing_information_tab', // 融资信息
 						
-						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
+						platinum_fixed_investment_price_query_tab = 'platinum_fixed_investment_price_query_tab', // 定投价查询
 						
 						platinum_contract_commodity_suspension_tab = 'platinum_contract_commodity_suspension_tab', // 合约商品停牌
 						
-						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
+						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
 						
 						platinum_agents_and_stores_tab = 'platinum_agents_and_stores_tab', // 代理和门店
 						
-						platinum_agreement_tab = 'platinum_agreement_tab', // 协议管理
-						
-						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
-						
-						custom_info_checkpending = 'custom_info_checkpending', // 待审核
-						
-						custom_info_disabled = 'custom_info_disabled', // 停用
-						
-						goods_info_spot = 'goods_info_spot', // 现货品种
-						
-						goods_info_hedge = 'goods_info_hedge', // 套保品种
-						
-						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
-						
-						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
-						
-						spot_contract_performance = 'spot_contract_performance', // 履约中
-						
-						spot_contract_finished = 'spot_contract_finished', // 已完成
-						
-						warehouse_info_normal = 'warehouse_info_normal', // 正常
-						
-						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
+						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
 						
-						account_info_business = 'account_info_business', // 业务账户
+						outaccount_status_status = 'outaccount_status_status', // 账户状态
 						
-						account_info_trade = 'account_info_trade', // 交易账户
+						inventory_current = 'inventory_current', // 当前库存
 						
-						account_info_futures = 'account_info_futures', // 期货账户
+						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
 						
-						account_info_manager = 'account_info_manager', // 管理账户
+						platinum_agreement_tab = 'platinum_agreement_tab', // 协议管理
 						
 						warehouse_receipt_trade_price = 'warehouse_receipt_trade_price', // 一口价挂牌
 						
 						warehouse_receipt_trade_floating_price = 'warehouse_receipt_trade_floating_price', // 浮动价挂牌
 						
-						warehouse_pre_sale_price = 'warehouse_pre_sale_price', // 一口价预售
-						
 						warehouse_pre_sale_floating_price = 'warehouse_pre_sale_floating_price', // 浮动价预售
 						
-						goods_info_spot_normal = 'goods_info_spot_normal', // 正常
+						warehouse_pre_sale_price = 'warehouse_pre_sale_price', // 一口价预售
 						
 						goods_info_spot_disable = 'goods_info_spot_disable', // 停用
 						
+						goods_info_spot_normal = 'goods_info_spot_normal', // 正常
+						
 						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', // 卖大厅
 						
+						spot_trade_warehouse_buy_hall = 'spot_trade_warehouse_buy_hall', // 买大厅
+						
 		}

src/common/constants/modalNameEnum.ts

@@ -4,80 +4,80 @@ export enum ModalEnum {
     commomOrder = 'commom-order', // 下单通用界面
 
     detail = 'detail', // 详情
-						spot_warrant_inventory_summar_pick_up = 'spot_warrant_inventory_summar_pick_up', // 提货
-						
 						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
-						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
+						
+						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
 						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						
 						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
-						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
+						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
-						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
+						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_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
-						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
+						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
+						
+						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
 						
 						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
 						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
 						
+						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
+						
 						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
+						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
 						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
-						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
-						
 						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
-						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
+						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
 						
 						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
 						
-						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
-						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
-						
-						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 发布求购
+						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
 						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
 						
-						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
-						
-						open = 'open', // 开仓
+						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
 						
-						close = 'close', // 平仓
+						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
 						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 发布求购
 						
-						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
+						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
 						
-						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
+						open = 'open', // 开仓
 						
 						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
 						
-						spot_warrant_inventory_summary_listed = 'spot_warrant_inventory_summary_listed', // 挂牌
+						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
 						
 						custom_info_btn_check = 'custom_info_btn_check', // 审核
 						
+						close = 'close', // 平仓
+						
 						custom_info_btn_add = 'custom_info_btn_add', // 新增
 						
 						custom_info_btn_disable = 'custom_info_btn_disable', // 停用
 						
-						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
-						
 						goods_info_spot_normal_add = 'goods_info_spot_normal_add', // 新增
 						
+						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
+						
 						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
 						
 						goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
@@ -108,18 +108,22 @@ export enum ModalEnum {
 						
 						plan_btn_add = 'plan_btn_add', // 新增
 						
+						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+						
 						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
 						
+						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
+						
 						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
 						
 						business_review_settlement_cancel = 'business_review_settlement_cancel', // 撤销
 						
 						finance_review_funds_audit = 'finance_review_funds_audit', // 审核
 						
-						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
-						
 						finance_review_invoice_audit = 'finance_review_invoice_audit', // 审核
 						
+						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
+						
 						finance_review_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
 						
 						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
@@ -136,69 +140,65 @@ export enum ModalEnum {
 						
 						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
 						
-						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
-						
 						platinum_pick_query_upload_logistics = 'platinum_pick_query_upload_logistics', // 上传物流
 						
 						platinum_pick_query_receipt = 'platinum_pick_query_receipt', // 确认收货
 						
+						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
+						
 						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_contract_goods_add = 'platinum_contract_goods_add', // 新增
 						
 						platinum_withdrawal_review_refuse = 'platinum_withdrawal_review_refuse', // 审核拒绝
 						
 						platinum_financing_information_detail = 'platinum_financing_information_detail', // 融资明细
 						
-						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
-						
 						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_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
-						
-						platinum_agreement_add = 'platinum_agreement_add', // 新增
-						
 						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
 						
+						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
+						
 						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
+						platinum_agreement_add = 'platinum_agreement_add', // 新增
 						
 						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
 						
+						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
+						
 						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
 						
 						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
 						
 						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 						
-						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
-						
-						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
 						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
 						
-						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
+						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
+						
+						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
 						
 						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
 						
-						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
+						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
 						
 						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
@@ -206,17 +206,21 @@ export enum ModalEnum {
 						
 						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 						
-						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
+						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
+						
+						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
+						sell_pending_funds = 'sell_pending_funds', // 款项登记
 						
-						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
+						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+						
+						sell_pending_storage = 'sell_pending_storage', // 出库登记
 						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
@@ -228,13 +232,7 @@ 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', // 款项登记
+						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
 						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
 						
@@ -248,14 +246,22 @@ export enum ModalEnum {
 						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
-						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
-						
 						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_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+						
 						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
+						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
+						
+						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
+						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
 						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
@@ -264,31 +270,21 @@ export enum ModalEnum {
 						
 						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
 						
-						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
-						
-						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_business_btn_modify = 'account_info_business_btn_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_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_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
 						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
-						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
-						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
 						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
 						
@@ -296,6 +292,10 @@ export enum ModalEnum {
 						
 						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
 						
+						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+						
+						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+						
 						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
 						
 		}

src/common/methods/table/interface.ts

@@ -16,8 +16,7 @@
 		render?: Function;
 		customRender?: Function;
 	}
-	export interface TableKey {table_pcweb_delivery:string, // 现货合同
-table_pcweb_userinfo:string, // 客户资料
+	export interface TableKey {table_pcweb_userinfo:string, // 客户资料
 table_pcweb_warehouse:string, // 仓库信息
 table_pcweb_purchase_pointprice:string, // 采购_待点价
 table_pcweb_purchase_settle:string, // 采购_履约交收
@@ -72,25 +71,38 @@ table_pcweb_financial_statement_brand_details:string, // 报表-财务报表-品
 table_pcweb_futures_statement_account_details:string, // 报表-期货报表-账户明细
 table_pcweb_inventory_commodity_report_brand_details:string, // 报表-库存（商品）报表-品牌明细
 table_pcweb_inventory_commodity_report_warehouse_details:string, // 报表-库存（商品）报表-仓库明细
+table_pcweb_delivery:string, // 现货合同
 table_pcweb_inventory_warehouse_report_warehouse_details:string, // 报表-库存（仓库）报表-仓库明细
 table_pcweb_inventory_summary_profit_and_loss_details:string, // 报表-汇总损益报表-损益明细
 table_pcweb_qhj_recharge_review:string, // 铂金宝-充值提现审核-充值审核
 table_pcweb_qhj_withdrawal_review:string, // 铂金宝-充值提现审核-提现审核
-table_pcweb_qhj_pickup_query:string, // 铂金宝-提货查询
-table_pcweb_qhj_fixed_investment_price_query:string, // 铂金宝-定投价查询
 table_pcweb_qhj_fixed_investment_plan_query:string, // 铂金宝-定投查询-定投计划查询
 table_pcweb_qhj_fixed_investment_flow_query:string, // 铂金宝-定投查询-定投流水查询
 table_pcweb_qhj_fixed_financing_information:string, // 铂金宝-融资信息
 table_pcweb_qhj_customer_info:string, // 铂金宝-客户资料
 table_pcweb_qhj_holder_order:string, // 铂金宝-单据查询-持仓单
 table_pcweb_qhj_order:string, // 铂金宝-单据查询-委托单
+table_pcweb_qhj_pay_bill:string, // 铂金宝-单据查询-待付单
+table_pcweb_qhj_deal_order:string, // 铂金宝-单据查询-成交单
+table_pcweb_spot_and_price:string, // 铂金宝-现货市价
 table_pcweb_agreement:string, // 铂金宝-协议管理
 table_pcweb_spot_trade_warehouse_price:string, // 现货贸易-仓单贸易-一口价
 table_pcweb_spot_trade_warehouse_float:string, // 现货贸易-仓单贸易
 table_pcweb_spot_trade_warehouse_sale_price:string, // 现货贸易-仓单预售
 table_pcweb_spot_trade_warehouse_sale_float:string, // 现货贸易-仓单预售
+table_pcweb_spot_trade_warehouse_price_trading_hall_sale:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_spot_trade_warehouse_price_trading_hall_buy:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_spot_trade_warehouse_float_trading_hall_sale:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_qhj_pickup_query:string, // 铂金宝-提货查询
+table_pcweb_qhj_fixed_investment_price_query:string, // 铂金宝-定投价查询
+table_pcweb_spot_trade_warehouse_float_trading_hall_buy:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_price_trading_hall_sale:string, // 现货贸易-仓单预售-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_price_trading_hall_buy:string, // 现货贸易-仓单预售-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_float_trading_hall_sale:string, // 现货贸易-仓单预售-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_float_trading_hall_buy:string, // 现货贸易-仓单预售-买卖大厅
 table_pcweb_spot_trade_bottom_spot_warrant_spot_summary:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_inventory_summary:string, // 底部栏-现货仓单
+table_pcweb_spot_trade_bottom_spot_warrant_spot_detail:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_pending_order:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_deal:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_designated_deal:string, // 底部栏-现货仓单
@@ -104,8 +116,5 @@ table_pcweb_spot_trade_bottom_commodity_contract_settlement:string, // 底部栏
 table_pcweb_spot_trade_bottom_performance_info_buy:string, // 底部栏-履约信息
 table_pcweb_spot_trade_bottom_performance_info_sale:string, // 底部栏-履约信息
 table_pcweb_spot_trade_bottom_funding_info_summary:string, // 底部栏-资金信息
-table_pcweb_spot_trade_bottom_funding_info_log:string, // 底部栏-资金信息
-table_pcweb_qhj_pay_bill:string, // 铂金宝-单据查询-待付单
-table_pcweb_qhj_deal_order:string, // 铂金宝-单据查询-成交单
-table_pcweb_spot_and_price:string, // 铂金宝-现货市价 
+table_pcweb_spot_trade_bottom_funding_info_log:string, // 底部栏-资金信息 
  }

src/layout/components/bottom.vue

@@ -42,10 +42,10 @@ export default defineComponent({
         firstMenu,
         quoteTable,
         thirdMenu,
-        [enumOrderComponents.spot_warrant]: defineAsyncComponent(() => import('@/views/business/order/spot_warran/index.vue')),
-        [enumOrderComponents.funding_information]: defineAsyncComponent(() => import('@/views/business/order/funding_information/index.vue')),
-        [enumOrderComponents.performance_information]: defineAsyncComponent(() => import('@/views/business/order/performance_information/index.vue')),
-        [enumOrderComponents.pre_sale_warehouse_receipt]: defineAsyncComponent(() => import('@/views/business/order/pre_sale_warehouse_receipt/index.vue')),
+        [enumOrderComponents.spot_warrant]: defineAsyncComponent(() => import('@/views/order/spot_warran/index.vue')),
+        [enumOrderComponents.funding_information]: defineAsyncComponent(() => import('@/views/order/funding_information/index.vue')),
+        [enumOrderComponents.performance_information]: defineAsyncComponent(() => import('@/views/order/performance_information/index.vue')),
+        [enumOrderComponents.pre_sale_warehouse_receipt]: defineAsyncComponent(() => import('@/views/order/pre_sale_warehouse_receipt/index.vue')),
     },
     setup() {
         // 控制底部展开逻辑

src/services/go/wrtrade/index.ts

@@ -1,5 +1,6 @@
 /** ================================= 仓单贸易v2 ================================**/
 
+import { getSelectedAccountId } from "@/services/bus/account";
 import { getUsrId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
@@ -57,7 +58,7 @@ export function queryOrderQuoteDetail(req: QueryOrderQuoteDetailReq): Promise<Wr
  * @param req
  */
 export function queryWrGoodsInfo(req: QueryWrGoodsInfoReq): Promise<WrGoodsInfo[]> {
-    return commonSearch_go('/WrTrade2/QueryWrGoodsInfo', req ).catch((err) => {
+    return commonSearch_go('/WrTrade2/QueryWrGoodsInfo', req).catch((err) => {
         throw new Error(`查询仓单商品信息: ${err}`);
     });
 }
@@ -91,7 +92,7 @@ export function queryWrPosition(req: QueryWrPositionReq): Promise<WrPosition[]>
  * 页面 现货仓单 | 预售仓单 -> 指定成交
  */
 export function queryWrSpecialMatchOrder(req: QueryWrSpecialMatchOrderReq): Promise<WrSpecialMatchOrder[]> {
-    return commonSearch_go('/WrTrade2/QueryWrSpecialMatchOrder',  req ).catch((err) => {
+    return commonSearch_go('/WrTrade2/QueryWrSpecialMatchOrder', req).catch((err) => {
         throw new Error(`查询指定成交: ${err}`);
     });
 }
@@ -110,8 +111,9 @@ export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeD
  * 页面 现货仓单 -> 现货明细
  * @param req
  */
-export function queryHoldLB(req: QueryHoldLBReq): Promise<WrHoldLB[]> {
-    return commonSearch_go('/WrTrade2/QueryHoldLB', req).catch((err) => {
+export function queryHoldLB(): Promise<WrHoldLB[]> {
+    const accountid = Number(getSelectedAccountId())
+    return commonSearch_go('/WrTrade2/QueryHoldLB', { accountid }).catch((err) => {
         throw new Error(`查询仓单持有记录: ${err}`);
     });
 }

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

@@ -1,21 +0,0 @@
-<template>
-  <!-- 现货明细 -->
-  <section class="spot_warrant_spot_details">
-    现货明细
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.spot_warrant_spot_details,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

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

@@ -1,9 +1,6 @@
 <template>
   <!-- 买卖大厅 -->
   <div class="buy-sell-market">
-    <!--<div>
-             <button @click="cancel">关闭</button>
-        </div>-->
     <div class="buy-sell-market-title">
       <a class="backIcon"
          @click="cancel">
@@ -47,23 +44,32 @@
         <div class="last red">6291.0</div>
         <LineChartOutlined />
       </div>
-      <a-button class="publishBuy">发布求购</a-button>
-      <a-button class="detailBtn">详情</a-button>
+      <BtnList :btnList="firstBtn"
+               :record="selectedRow"
+               @click="openComponent" />
+      <!-- <a-button class="publishBuy">发布求购</a-button>
+      <a-button class="detailBtn">详情</a-button> -->
     </div>
     <a-row>
-      <a-col :span="12">
+      <a-col :span="12"
+             v-if="buyMarket.isMarket">
         <Buy />
       </a-col>
-      <a-col :span="12">
+      <a-col :span="12"
+             v-if="sellMarket.isMarket">
         <Sell />
       </a-col>
     </a-row>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
   </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { ComposeTableParam, defineComponent, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
+import { ComposeTableParam, defineAsyncComponent, defineComponent, BtnList, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { queryOrderQuoteDetail } from '@/services/go/wrtrade';
 import { QueryOrderQuoteDetailReq, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
@@ -72,6 +78,10 @@ import { handleBuyAndSellList } from './setup';
 import Buy from './components/buy/index.vue';
 import Sell from './components/sell/index.vue';
 import { LineChartOutlined } from '@ant-design/icons-vue';
+// import { getBuyAndSellMarketData } from '../../setup';
+import { handleModalComponent } from '@/common/setup/asyncComponent';
+import { PropType, ref } from 'vue';
+import { handleSpotBtnList } from '../../setup';
 
 export default defineComponent({
     emits: ['cancel'],
@@ -86,19 +96,40 @@ export default defineComponent({
             default: 0, // 是否有仓单 0-没有 1-有(仓单贸易填1,仓单预售填0)
             type: Number,
         },
+        selectedRow: {
+            type: Object as PropType<any>,
+            default: {},
+        },
+        enumName: {
+            default: '',
+            type: String as PropType<EnumRouterName>,
+        },
     },
     components: {
         Buy,
         Sell,
+        BtnList,
         LeftOutlined,
         LineChartOutlined,
+        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../detail/index.vue')),
+        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../post_buying/index.vue')),
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
-
+        // 买卖大厅 配置数据
+        // 表格操作按钮列表
+        const { firstBtn, buyMarket, sellMarket } = handleSpotBtnList(props.enumName);
+        function init() {}
+        const { componentId, closeComponent, openComponent } = handleModalComponent(init, ref({}));
         return {
             cancel,
             visible,
+            firstBtn,
+            buyMarket,
+            sellMarket,
+            componentId,
+            closeComponent,
+            openComponent,
         };
     },
 });

src/views/market/spot_trade/components/buy-sell-market/setup.ts

@@ -1,22 +1,18 @@
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { TableKey } from '@/common/methods/table/interface';
 import { getTableColumns, getTableEvent, queryTableList } from "@/common/setup/table";
-import { getBtnList_ } from '@/common/setup/table/button';
-import { WrOrderQuoteDetail } from "@/services/go/wrtrade/interface";
 
 
 export function handleBuyAndSellList<T>(menuType: EnumRouterName, isDetail: boolean, tableName: keyof TableKey) {
     // 表格列表数据
-    const { loading, tableList, queryTable } = queryTableList<WrOrderQuoteDetail>();
+    const { loading, tableList, queryTable } = queryTableList<T>();
     // 表头数据
     const { columns, registerColumn } = getTableColumns();
     // 表格事件
     const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>({});
-    // 表格操作按钮列表
-    const [firstBtn, secondBtn] = getBtnList_(menuType, isDetail).value;
     // 注册表头信息 过滤
     registerColumn(tableName, []);
     return {
-        loading, tableList, columns, expandedRowKeys, selectedRow, Rowclick, firstBtn, secondBtn, queryTable
+        loading, tableList, columns, expandedRowKeys, selectedRow, Rowclick, queryTable
     }
 }

src/views/market/spot_trade/setup.ts

@@ -9,49 +9,21 @@ import { OperationTabMenu } from '@/services/go/commonService/interface';
 import { onUnmounted, ref } from "vue";
 import { BuyAndSellMarket } from './interface';
 
-// 报价大厅操作按钮列表
-const priceBtnList = ref<BtnList[]>([])
+const buyAndSellEunm = 'buyAndSell'
 
-// 买大厅数据
-const buyMarket: BuyAndSellMarket = {
-    isMarket: true,
-    btnList: []
-}
-
-// 卖大厅数据
-const sellMarket: BuyAndSellMarket = {
-    isMarket: true,
-    btnList: []
-}
-
-
-// 表格 + 表头 + 右键 + 单击表格 + 按钮列表 通用处理逻辑
-export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName, tableFilterKey }: ComposeTableParam) {
-    // 右键逻辑
-    const { contextMenu, openContext, closeContext: closeContextAction } = handleContextMenu();
-    // 表头数据
-    const { columns, registerColumn, updateColumn } = getTableColumns();
-    // 控制异步组件
-    const componentId = ref<string>('');
-    // 关闭组件
-    function closeComponent(isRefresh: boolean) {
-        componentId.value = '';
-        if (isRefresh) {
-            queryFn()
-        }
+export function handleSpotBtnList(menuType: EnumRouterName) {
+    let firstBtn: BtnList[] = []
+    // 买大厅数据
+    const buyMarket: BuyAndSellMarket = {
+        isMarket: true,
+        btnList: []
     }
-    // 右键回调函数
-    const eventsCB: TableEventCB = {
-        contextmenuCB: (record: T, value: ContextMenuTemp) => {
-            // 控制打开右键
-            contextMenu.value = value
-        },
-        clickCB: (record: T) => {
-            componentId.value = 'warehouse_receipt_trade_floating_price_delisting'
-        }
+
+    // 卖大厅数据
+    const sellMarket: BuyAndSellMarket = {
+        isMarket: true,
+        btnList: []
     }
-    // 表格事件
-    const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
     // 表格操作按钮列表
     const list = findChildList(menuType);
     if (list) {
@@ -63,8 +35,7 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         }
         // 过滤报价大厅按钮列表
         const temp = list.children.filter(e => e.type === 2)
-        priceBtnList.value = fnMap(temp)
-        priceBtnList.value.push({ lable: '买卖大厅', code: 'buyAndSell', className: 'btnPrimary' })
+        firstBtn = fnMap(temp)
 
         const fn = (code: EnumRouterName) => {
             const findResult = list.children.find(e => e.code === code)
@@ -82,6 +53,39 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         // 处理卖大厅
         Object.assign(sellMarket, fn(EnumRouterName.spot_trade_warehouse_sell_hall))
     }
+    return { firstBtn, buyMarket, sellMarket }
+}
+
+// 表格 + 表头 + 右键 + 单击表格 + 按钮列表 通用处理逻辑
+export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName, tableFilterKey }: ComposeTableParam) {
+    // 右键逻辑
+    const { contextMenu, openContext, closeContext: closeContextAction } = handleContextMenu();
+    // 表头数据
+    const { columns, registerColumn, updateColumn } = getTableColumns();
+    // 控制异步组件
+    const componentId = ref<string>('');
+    // 关闭组件
+    function closeComponent(isRefresh: boolean) {
+        componentId.value = '';
+        if (isRefresh) {
+            queryFn()
+        }
+    }
+    // 右键回调函数
+    const eventsCB: TableEventCB = {
+        contextmenuCB: (record: T, value: ContextMenuTemp) => {
+            // 控制打开右键
+            contextMenu.value = value
+        },
+        clickCB: (record: T) => {
+            componentId.value = buyAndSellEunm
+        }
+    }
+    // 表格事件
+    const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
+    // 表格操作按钮列表
+    const { firstBtn } = handleSpotBtnList(menuType)
+    firstBtn.push({ lable: '买卖大厅', code: buyAndSellEunm, className: 'btnPrimary' })
 
     // 关闭右键
     function closeContext(value: BtnList | null) {
@@ -104,10 +108,6 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         columns, registerColumn, updateColumn,  // 表头
         expandedRowKeys, selectedRow, Rowclick, // 表格折腾面板数据与单击、双击事件
         componentId, closeComponent,  // 控制异步组件
-        firstBtn: priceBtnList, // 表格按钮
+        firstBtn, // 表格按钮
     }
 }
-
-export function getBuyAndSellMarketData() {
-    return { buyMarket, sellMarket }
-}

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

@@ -16,6 +16,7 @@
                  :list="firstBtn"></contextMenu>
     <component :is="componentId"
                v-if="componentId"
+               :enumName="name"
                :selectedRow="selectedRow"
                @cancel="closeComponent"></component>
   </div>
@@ -59,6 +60,7 @@ export default defineComponent({
         };
         return {
             ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_receipt_trade_floating_price,
             loading,
             tableList,
         };

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

@@ -16,6 +16,7 @@
                  :list="firstBtn"></contextMenu>
     <component :is="componentId"
                v-if="componentId"
+               :enumName="name"
                :selectedRow="selectedRow"
                @cancel="closeComponent"></component>
   </div>
@@ -59,6 +60,7 @@ export default defineComponent({
         };
         return {
             ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_receipt_trade_price,
             loading,
             tableList,
         };

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 库存汇总 -->
-  <section class="spot_warrant_inventory_summary">
+  <section>
     <a-table :columns="columns"
              class="srcollYTable"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
@@ -38,7 +38,7 @@ export default defineComponent({
     name: enumOrderComponents.spot_warrant_inventory_summary,
     components: {
         BtnList,
-        [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
+        // [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
     },
     setup() {
         // 表格列表数据

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

@@ -0,0 +1,249 @@
+<template>
+  <!-- 挂单 -->
+  <Drawer :title="'挂牌'"
+          :placement="'bottom'"
+          :visible="visible">
+    <!-- 挂牌 -->
+    <div class="listed">
+      <div class="condition">
+        <a-button class="conditionBtn">螺纹钢</a-button>
+        <a-button class="conditionBtn">12</a-button>
+        <a-button class="conditionBtn">江铜</a-button>
+        <a-button class="conditionBtn">华南仓库</a-button>
+      </div>
+      <div class="formBar">
+        <a-form class="inlineForm"
+                :form="form"
+                @submit="handleSearch">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="挂牌方式">
+                <a-select class="inlineFormSelect"
+                          default-value="1"
+                          style="width: 140px">
+                  <a-select-option value="1">
+                    一口价
+                  </a-select-option>
+                  <a-select-option value="2">
+                    一口价2
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="挂牌价">
+                <a-input class="commonInput"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="挂牌数量">
+                <a-input class="commonInput"
+                         suffix="吨"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="起摘数量"
+                           class="relative">
+                <a-input class="commonInput"
+                         suffix="吨"
+                         style="width: 140px" />
+                <div class="tip">最小单位：1吨</div>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item>
+                <a-progress class="formProgress"
+                            :percent="30" />
+                <div class="unit"><span>0</span><span>300吨</span></div>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24"
+                 type="flex"
+                 justify="center">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn">挂牌</a-button>
+                <a-button class="ml10 cancelBtn">取消</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import Drawer from '@/common/components/drawer/index.vue';
+import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { hdWROrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_pending_order,
+    components: { Drawer },
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPosition>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const data = props.selectedRow;
+        const loading = ref<boolean>(false);
+        const param = {
+            AccountID: data.accountid.toString(),
+            ClientSerialNo: uuidv4(), // 客户端流水号
+            // OperateSrc: 2,
+            ClientType: 4,
+            // MarketID: 17201,
+            LadingBillId: '2081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            TradeDate: moment('20210725').format('YYYYMMDD'), // 交易日 string
+            SubNum: '0', // 提单子单号
+            WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
+            // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
+            OrderQty: 1, // 委托数量(可挂部分数据量) ======
+            DeliveryGoodsID: data.deliverygoodsid, // 交割商品商品ID
+            WRPriceType: 1, // 价格方式 1：固定价 2：浮动价
+            FixedPrice: 10, // 固定价格
+            PriceFactor: 0, // 价格系数(浮动价时填写)
+            PriceMove: 0, // 升贴水(浮动价时填写)
+            TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
+            // ValidTime: moment('2021-08-25 00:00:00').format('YYYY-MM-DD HH:mm:ss'), // 有效期限
+            ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+            FirstRatio: 0, // 首付比例
+            PerformanceTemplateID: 0, // 履约计划模板ID
+            UserID: getUserId(),
+            OperatorID: getUserId(), // 操作员账号ID
+            BuyOrSell: 1, // 买卖方向 0买1卖
+            PriceDisplayMode: 1, // 浮动价显示方式 1：合并显示 2：分开显示
+            CanBargain: 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
+            Attachment1: '', // 附件1
+            Attachment2: '', // 附件2
+            Remark: '222', // 备注
+            ApplyID: 0, // 申请ID
+            CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
+            WRTradeGoods: [],
+            wrstandardid: 1,
+            HasWr: 1,
+        };
+        console.log(param);
+        requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+            // cancel(true);
+        });
+        return {
+            visible: true,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
+    }
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 80px;
+    .ant-progress-outer {
+        margin-right: 0;
+        padding-right: 0;
+        .ant-progress-inner {
+            background: @m-grey14;
+            .rounded-corners(2px);
+            .ant-progress-bg {
+                height: 3px !important;
+                border-radius: 2px !important;
+                background-color: @m-blue0;
+            }
+        }
+    }
+    .ant-progress-text {
+        display: none;
+    }
+}
+.unit {
+    margin-left: 80px;
+    .flex;
+    justify-content: space-between;
+    font-size: 14px;
+    color: @m-grey1;
+    height: 14px;
+    line-height: 14px;
+}
+.listedBtn {
+    width: 120px;
+    height: 30px;
+    line-height: 30px;
+    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+    border-radius: 3px;
+    color: @m-white0;
+    font-size: 14px;
+    text-align: center;
+    border: 0;
+    &:hover {
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
+        color: @m-white0-hover;
+    }
+}
+.cancelBtn:extend(.listedBtn) {
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
+    &:hover {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
+        color: @m-white0-hover;
+    }
+}
+.ml10 {
+    margin-left: 10px;
+}
+</style>;

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

@@ -0,0 +1,65 @@
+<template>
+  <!-- 现货明细 -->
+  <section>
+    <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">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 :record="record"
+                 @click="openComponent" />
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam, handleComposeTable } from '@/common/export/commonTable';
+import { queryHoldLB, queryWrOrderDetail, queryWrPosition } from '@/services/go/wrtrade';
+import { QueryHoldLBReq, QueryWrOrderDetailReq, QueryWrPositionReq, WrHoldLB, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_spot_details,
+    components: {
+        BtnList,
+        [ModalEnum.spot_warrant_spot_details_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrHoldLB>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryHoldLB);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_spot_detail',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrHoldLB>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/business/order/spot_warran/index.vue → src/views/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) };