Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

generate-code/pc_menu_企业风管.json

@@ -3089,7 +3089,7 @@
                 "code": "search_spot_warrant_warehouse_receipt_details",
                 "title": "仓单明细",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_spot_warrant_warehouse_receipt_details",
                 "isshow": true,
                 "url": "",
@@ -3101,7 +3101,7 @@
                 "code": "search_spot_warrant_listing_record",
                 "title": "挂牌记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_spot_warrant_listing_record",
                 "isshow": true,
                 "url": "",
@@ -3113,7 +3113,7 @@
                 "code": "search_spot_warrant_transaction_record",
                 "title": "成交记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_spot_warrant_transaction_record",
                 "isshow": true,
                 "url": "",
@@ -3125,7 +3125,7 @@
                 "code": "search_spot_warrant_protocol_specified_record",
                 "title": "协议指定记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_spot_warrant_protocol_specified_record",
                 "isshow": true,
                 "url": "",
@@ -3149,7 +3149,7 @@
                 "code": "search_pre_sale_warehouse_receipt_order_summary",
                 "title": "订单汇总",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_order_summary",
                 "isshow": true,
                 "url": "",
@@ -3161,7 +3161,7 @@
                 "code": "search_pre_sale_warehouse_receipt_commission_record",
                 "title": "委托记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_commission_record",
                 "isshow": true,
                 "url": "",
@@ -3173,7 +3173,7 @@
                 "code": "search_pre_sale_warehouse_receipt_transaction_record",
                 "title": "成交记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_transaction_record",
                 "isshow": true,
                 "url": "",
@@ -3185,7 +3185,7 @@
                 "code": "search_pre_sale_warehouse_receipt_protocol_specified_record",
                 "title": "协议指定记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_protocol_specified_record",
                 "isshow": true,
                 "url": "",
@@ -3196,7 +3196,7 @@
             ]
           },
           {
-            "code": "search_document_records",
+            "code": "search_commodity_contract",
             "title": "商品合约",
             "sort": 1,
             "type": 1,
@@ -3209,7 +3209,7 @@
                 "code": "search_document_records_contract_summary",
                 "title": "合约汇总",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_commodity_contract_contract_summary",
                 "isshow": true,
                 "url": "",
@@ -3221,7 +3221,7 @@
                 "code": "search_document_records_commission_record",
                 "title": "委托记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_commodity_contract_commission_record",
                 "isshow": true,
                 "url": "",
@@ -3233,7 +3233,7 @@
                 "code": "search_document_records_transaction_record",
                 "title": "成交记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_commodity_contract_transaction_record",
                 "isshow": true,
                 "url": "",
@@ -3245,7 +3245,7 @@
                 "code": "search_document_records_delivery_record",
                 "title": "交收记录",
                 "sort": 1,
-                "type": 3,
+                "type": 1,
                 "rulekey": "client_pc_web_inquire_document_record_commodity_contract_delivery_record",
                 "isshow": true,
                 "url": "",

src/common/constants/enumOrderComponents.ts

@@ -20,26 +20,26 @@ export enum enumOrderComponents {
 						
 						spot_warrant_spot_details = 'spot_warrant_spot_details', // 现货明细
 						
-						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
-						
-						spot_warrant_deal = 'spot_warrant_deal', // 成交
-						
 						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
 						
-						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
+						spot_warrant_deal = 'spot_warrant_deal', // 成交
 						
 						pre_sale_warehouse_receipt_order_summary = 'pre_sale_warehouse_receipt_order_summary', // 订单汇总
 						
 						pre_sale_warehouse_receipt_pending_order = 'pre_sale_warehouse_receipt_pending_order', // 挂单
 						
+						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
+						
 						pre_sale_warehouse_receipt_deal = 'pre_sale_warehouse_receipt_deal', // 成交
 						
-						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
+						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
 						
-						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
+						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
 						
 						commodity_contract_commission = 'commodity_contract_commission', // 委托
 						
+						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
+						
 						commodity_contract_make_deal = 'commodity_contract_make_deal', // 成交
 						
 						commodity_contract_settlement = 'commodity_contract_settlement', // 交收

src/common/constants/enumRouterName.ts

@@ -2,27 +2,21 @@
 export enum EnumRouterName {
 						remark = 'remark', // 
 						
-						manage = 'manage', // 管理
-						
 						market = 'market', // 市场
 						
 						business = 'business', // 业务
 						
-						platinum = 'platinum', // 铂金宝
-						
-						search = 'search', // 查询
-						
 						info = 'info', // 信息
 						
 						report = 'report', // 报表
 						
-						business_review = 'business_review', // 业务审核
+						platinum = 'platinum', // 铂金宝
 						
-						inventory_review = 'inventory_review', // 库存审核
+						manage = 'manage', // 管理
 						
-						spot_trade = 'spot_trade', // 现货贸易
+						search = 'search', // 查询
 						
-						inventory_manager = 'inventory_manager', // 库存管理
+						spot_trade = 'spot_trade', // 现货贸易
 						
 						futures = 'futures', // 期货
 						
@@ -32,96 +26,90 @@ export enum EnumRouterName {
 						
 						exposure = 'exposure', // 敞口
 						
+						custom_info = 'custom_info', // 客户资料
+						
 						plan = 'plan', // 计划
 						
-						finance_review = 'finance_review', // 财务审核
+						goods_info = 'goods_info', // 商品信息
 						
-						platinum_customer_info = 'platinum_customer_info', // 客户资料
+						spot_contract = 'spot_contract', // 现货合同
 						
-						platinum_pick_goods_management = 'platinum_pick_goods_management', // 提货商品管理
+						warehouse_info = 'warehouse_info', // 仓库信息
 						
-						platinum_pick_query = 'platinum_pick_query', // 提货查询
+						account_info = 'account_info', // 账户管理
 						
-						platinum_recharge_withdrawal_review = 'platinum_recharge_withdrawal_review', // 充值和提现审核
+						finance_report = 'finance_report', // 财务报表
 						
-						platinum_fixed_investment_price_query = 'platinum_fixed_investment_price_query', // 定投价查询
+						exposure_report = 'exposure_report', // 敞口报表
 						
-						platinum_document_query = 'platinum_document_query', // 单据查询
+						spot_report = 'spot_report', // 现货报表
 						
-						platinum_fixed_investment_query = 'platinum_fixed_investment_query', // 定投查询
+						inventory_report = 'inventory_report', // 库存报表
 						
-						platinum_agents_and_stores = 'platinum_agents_and_stores', // 代理和门店
+						sum_pl_report = 'sum_pl_report', // 汇总损益报表
 						
-						platinum_spot_and_price = 'platinum_spot_and_price', // 现货市价
+						future_report = 'future_report', // 期货报表
 						
-						platinum_agreement = 'platinum_agreement', // 协议管理
+						platinum_pick_goods_management = 'platinum_pick_goods_management', // 提货商品管理
 						
-						platinum_financing_information = 'platinum_financing_information', // 融资信息
+						platinum_pick_query = 'platinum_pick_query', // 提货查询
 						
-						search_document_records = 'search_document_records', // 单据记录
+						platinum_customer_info = 'platinum_customer_info', // 客户资料
 						
-						search_capital_flow = 'search_capital_flow', // 资金流水
+						platinum_recharge_withdrawal_review = 'platinum_recharge_withdrawal_review', // 充值和提现审核
 						
-						search_financing_inquiry = 'search_financing_inquiry', // 融资查询
+						platinum_fixed_investment_price_query = 'platinum_fixed_investment_price_query', // 定投价查询
 						
-						outaccount_status = 'outaccount_status', // 账户状态
+						platinum_fixed_investment_query = 'platinum_fixed_investment_query', // 定投查询
 						
-						search_performance_query = 'search_performance_query', // 履约查询
+						platinum_document_query = 'platinum_document_query', // 单据查询
 						
-						platinum_contract_goods = 'platinum_contract_goods', // 合约商品
+						platinum_financing_information = 'platinum_financing_information', // 融资信息
 						
-						search_pickup_query = 'search_pickup_query', // 提货查询
+						platinum_contract_goods = 'platinum_contract_goods', // 合约商品
 						
 						platinum_contract_commodity_suspension = 'platinum_contract_commodity_suspension', // 合约商品停牌
 						
-						search_login_log = 'search_login_log', // 登录日志
-						
-						custom_info = 'custom_info', // 客户资料
-						
-						spot_contract = 'spot_contract', // 现货合同
-						
-						warehouse_info = 'warehouse_info', // 仓库信息
+						platinum_spot_and_price = 'platinum_spot_and_price', // 现货市价
 						
-						account_info = 'account_info', // 账户管理
+						platinum_agents_and_stores = 'platinum_agents_and_stores', // 代理和门店
 						
-						goods_info = 'goods_info', // 商品信息
+						platinum_agreement = 'platinum_agreement', // 协议管理
 						
-						finance_report = 'finance_report', // 财务报表
+						business_review = 'business_review', // 业务审核
 						
-						exposure_report = 'exposure_report', // 敞口报表
+						inventory_review = 'inventory_review', // 库存审核
 						
-						spot_report = 'spot_report', // 现货报表
+						finance_review = 'finance_review', // 财务审核
 						
-						inventory_report = 'inventory_report', // 库存报表
+						inventory_manager = 'inventory_manager', // 库存管理
 						
-						sum_pl_report = 'sum_pl_report', // 汇总损益报表
+						outaccount_status = 'outaccount_status', // 账户状态
 						
-						future_report = 'future_report', // 期货报表
+						search_document_records = 'search_document_records', // 单据记录
 						
-						business_review_someprice = 'business_review_someprice', // 点价
+						search_capital_flow = 'search_capital_flow', // 资金流水
 						
-						business_review_settlement = 'business_review_settlement', // 交收
+						search_financing_inquiry = 'search_financing_inquiry', // 融资查询
 						
-						inventory_review_checkin = 'inventory_review_checkin', // 入库
+						search_performance_query = 'search_performance_query', // 履约查询
 						
-						inventory_review_checkout = 'inventory_review_checkout', // 出库
+						search_pickup_query = 'search_pickup_query', // 提货查询
 						
-						warehouse_receipt_trade = 'warehouse_receipt_trade', // 仓单贸易
+						search_login_log = 'search_login_log', // 登录日志
 						
 						warehouse_pre_sale = 'warehouse_pre_sale', // 仓单预售
 						
-						inventory_manager_tab = 'inventory_manager_tab', // 库存管理
-						
 						dominant_contract = 'dominant_contract', // 主力
 						
 						night_plate = 'night_plate', // 夜盘
 						
 						main_contract = 'main_contract', // 主连
 						
-						position = 'position', // 持仓
-						
 						orderdetail = 'orderdetail', // 委托
 						
+						tradedetail = 'tradedetail', // 成交
+						
 						closedetail = 'closedetail', // 平仓
 						
 						sell_pending = 'sell_pending', // 待点价
@@ -130,9 +118,11 @@ export enum EnumRouterName {
 						
 						sell_all = 'sell_all', // 全部
 						
-						purchase_performance = 'purchase_performance', // 履约交收
+						warehouse_receipt_trade = 'warehouse_receipt_trade', // 仓单贸易
 						
-						purchase_all = 'purchase_all', // 全部
+						position = 'position', // 持仓
+						
+						purchase_performance = 'purchase_performance', // 履约交收
 						
 						exposure_realtime = 'exposure_realtime', // 实时敞口
 						
@@ -140,136 +130,150 @@ export enum EnumRouterName {
 						
 						exposure_futures = 'exposure_futures', // 期货头寸
 						
-						tradedetail = 'tradedetail', // 成交
+						exposure_history = 'exposure_history', // 历史敞口
+						
+						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
+						
+						custom_info_checkpending = 'custom_info_checkpending', // 待审核
+						
+						custom_info_normal = 'custom_info_normal', // 正常
+						
+						custom_info_disabled = 'custom_info_disabled', // 停用
 						
 						plan_uncommitted = 'plan_uncommitted', // 未提交
 						
 						plan_audit = 'plan_audit', // 待审核
 						
+						purchase_all = 'purchase_all', // 全部
+						
 						plan_running = 'plan_running', // 执行中
 						
-						finance_review_funds = 'finance_review_funds', // 款项
+						purchase_pending = 'purchase_pending', // 待点价
 						
-						finance_review_invoice = 'finance_review_invoice', // 发票
+						goods_info_spot = 'goods_info_spot', // 现货品种
 						
-						exposure_history = 'exposure_history', // 历史敞口
+						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
 						
-						purchase_pending = 'purchase_pending', // 待点价
+						goods_info_hedge = 'goods_info_hedge', // 套保品种
 						
-						platinum_customer_info_unsubmit = 'platinum_customer_info_unsubmit', // 待审核
+						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
 						
-						platinum_customer_info_stop = 'platinum_customer_info_stop', // 停用
+						spot_contract_performance = 'spot_contract_performance', // 履约中
 						
-						platinum_custom_info_normal = 'platinum_custom_info_normal', // 正常
+						spot_contract_finished = 'spot_contract_finished', // 已完成
 						
-						platinum_pick_goods_management_tab = 'platinum_pick_goods_management_tab', // 提货商品管理
+						warehouse_info_normal = 'warehouse_info_normal', // 正常
 						
-						platinum_pick_query_tab = 'platinum_pick_query_tab', // 提货查询
+						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
 						
-						platinum_withdrawal_review_tab = 'platinum_withdrawal_review_tab', // 提现审核
+						account_info_business = 'account_info_business', // 业务账户
 						
-						platinum_recharge_review_tab = 'platinum_recharge_review_tab', // 充值审核
+						account_info_manager = 'account_info_manager', // 管理账户
 						
-						platinum_fixed_investment_price_query_tab = 'platinum_fixed_investment_price_query_tab', // 定投价查询
+						account_info_trade = 'account_info_trade', // 交易账户
 						
-						platinum_document_query_position = 'platinum_document_query_position', // 持仓
+						account_info_futures = 'account_info_futures', // 期货账户
 						
-						platinum_document_query_waiting = 'platinum_document_query_waiting', // 待付单
+						spot_report_spot = 'spot_report_spot', // 现货报表
 						
-						platinum_document_query_success = 'platinum_document_query_success', // 成交单
+						finance_report_finance = 'finance_report_finance', // 财务报表
 						
-						platinum_fixed_investment_plan_query = 'platinum_fixed_investment_plan_query', // 定投计划查询
+						inventory_report_inventory_category = 'inventory_report_inventory_category', // 库存报表(品类)
 						
-						platinum_fixed_investment_flow_query = 'platinum_fixed_investment_flow_query', // 定投流水查询
+						sum_pl_report_sum_pl = 'sum_pl_report_sum_pl', // 汇总损益报表
 						
-						platinum_agents_and_stores_tab = 'platinum_agents_and_stores_tab', // 代理和门店
+						future_report_future = 'future_report_future', // 期货报表
 						
-						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
+						inventory_report_warehouse = 'inventory_report_warehouse', // 库存报表(仓库)
 						
-						platinum_document_query_order = 'platinum_document_query_order', // 委托单
+						platinum_pick_goods_management_tab = 'platinum_pick_goods_management_tab', // 提货商品管理
 						
-						platinum_agreement_tab = 'platinum_agreement_tab', // 协议管理
+						platinum_custom_info_normal = 'platinum_custom_info_normal', // 正常
 						
-						platinum_financing_information_tab = 'platinum_financing_information_tab', // 融资信息
+						exposure_report_exposure = 'exposure_report_exposure', // 敞口报表
 						
-						inventory_current = 'inventory_current', // 当前库存
+						platinum_pick_query_tab = 'platinum_pick_query_tab', // 提货查询
 						
-						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
+						platinum_customer_info_unsubmit = 'platinum_customer_info_unsubmit', // 待审核
 						
-						search_spot_warrant = 'search_spot_warrant', // 现货仓单
+						platinum_customer_info_stop = 'platinum_customer_info_stop', // 停用
 						
-						search_pre_sale_warehouse_receipt = 'search_pre_sale_warehouse_receipt', // 预售仓单
+						platinum_recharge_review_tab = 'platinum_recharge_review_tab', // 充值审核
 						
-						search_capital_flow_tab = 'search_capital_flow_tab', // 资金流水
+						platinum_withdrawal_review_tab = 'platinum_withdrawal_review_tab', // 提现审核
 						
-						search_financing_inquiry_contract = 'search_financing_inquiry_contract', // 合同
+						platinum_fixed_investment_price_query_tab = 'platinum_fixed_investment_price_query_tab', // 定投价查询
 						
-						outaccount_status_status = 'outaccount_status_status', // 账户状态
+						platinum_fixed_investment_plan_query = 'platinum_fixed_investment_plan_query', // 定投计划查询
 						
-						search_performance_query_buy_performance = 'search_performance_query_buy_performance', // 买履约
+						platinum_fixed_investment_flow_query = 'platinum_fixed_investment_flow_query', // 定投流水查询
 						
-						search_performance_query_sell_performance = 'search_performance_query_sell_performance', // 卖履约
+						platinum_document_query_position = 'platinum_document_query_position', // 持仓
 						
-						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
+						platinum_document_query_order = 'platinum_document_query_order', // 委托单
 						
-						search_pickup_query_tab = 'search_pickup_query_tab', // 提货查询
+						platinum_document_query_waiting = 'platinum_document_query_waiting', // 待付单
 						
-						platinum_contract_commodity_suspension_tab = 'platinum_contract_commodity_suspension_tab', // 合约商品停牌
+						platinum_document_query_success = 'platinum_document_query_success', // 成交单
 						
-						search_financing_inquiry_apply_order = 'search_financing_inquiry_apply_order', // 申请单
+						platinum_financing_information_tab = 'platinum_financing_information_tab', // 融资信息
 						
-						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
+						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
 						
-						custom_info_checkpending = 'custom_info_checkpending', // 待审核
+						platinum_contract_commodity_suspension_tab = 'platinum_contract_commodity_suspension_tab', // 合约商品停牌
 						
-						custom_info_disabled = 'custom_info_disabled', // 停用
+						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
 						
-						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
+						platinum_agents_and_stores_tab = 'platinum_agents_and_stores_tab', // 代理和门店
 						
-						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
+						platinum_agreement_tab = 'platinum_agreement_tab', // 协议管理
 						
-						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_disabled = 'warehouse_info_disabled', // 停用
+						inventory_review_checkin = 'inventory_review_checkin', // 入库
 						
-						warehouse_info_normal = 'warehouse_info_normal', // 正常
+						inventory_review_checkout = 'inventory_review_checkout', // 出库
 						
-						account_info_business = 'account_info_business', // 业务账户
+						finance_review_funds = 'finance_review_funds', // 款项
 						
-						account_info_trade = 'account_info_trade', // 交易账户
+						finance_review_invoice = 'finance_review_invoice', // 发票
 						
-						account_info_manager = 'account_info_manager', // 管理账户
+						inventory_manager_tab = 'inventory_manager_tab', // 库存管理
 						
-						account_info_futures = 'account_info_futures', // 期货账户
+						inventory_current = 'inventory_current', // 当前库存
 						
-						goods_info_spot = 'goods_info_spot', // 现货品种
+						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
 						
-						goods_info_hedge = 'goods_info_hedge', // 套保品种
+						outaccount_status_status = 'outaccount_status_status', // 账户状态
 						
-						finance_report_finance = 'finance_report_finance', // 财务报表
+						search_spot_warrant = 'search_spot_warrant', // 现货仓单
 						
-						exposure_report_exposure = 'exposure_report_exposure', // 敞口报表
+						search_pre_sale_warehouse_receipt = 'search_pre_sale_warehouse_receipt', // 预售仓单
 						
-						spot_report_spot = 'spot_report_spot', // 现货报表
+						search_commodity_contract = 'search_commodity_contract', // 商品合约
 						
-						inventory_report_inventory_category = 'inventory_report_inventory_category', // 库存报表(品类)
+						search_capital_flow_tab = 'search_capital_flow_tab', // 资金流水
 						
-						sum_pl_report_sum_pl = 'sum_pl_report_sum_pl', // 汇总损益报表
+						search_financing_inquiry_apply_order = 'search_financing_inquiry_apply_order', // 申请单
 						
-						inventory_report_warehouse = 'inventory_report_warehouse', // 库存报表(仓库)
+						search_financing_inquiry_contract = 'search_financing_inquiry_contract', // 合同
 						
-						future_report_future = 'future_report_future', // 期货报表
+						search_performance_query_sell_performance = 'search_performance_query_sell_performance', // 卖履约
 						
-						warehouse_receipt_trade_price = 'warehouse_receipt_trade_price', // 一口价挂牌
+						search_performance_query_buy_performance = 'search_performance_query_buy_performance', // 买履约
 						
-						warehouse_receipt_trade_floating_price = 'warehouse_receipt_trade_floating_price', // 浮动价挂牌
+						search_pickup_query_tab = 'search_pickup_query_tab', // 提货查询
 						
 						warehouse_pre_sale_price = 'warehouse_pre_sale_price', // 一口价预售
 						
 						warehouse_pre_sale_floating_price = 'warehouse_pre_sale_floating_price', // 浮动价预售
 						
+						warehouse_receipt_trade_price = 'warehouse_receipt_trade_price', // 一口价挂牌
+						
+						warehouse_receipt_trade_floating_price = 'warehouse_receipt_trade_floating_price', // 浮动价挂牌
+						
 						goods_info_spot_normal = 'goods_info_spot_normal', // 正常
 						
 						goods_info_spot_disable = 'goods_info_spot_disable', // 停用
@@ -278,6 +282,30 @@ export enum EnumRouterName {
 						
 						goods_info_hedge_disable = 'goods_info_hedge_disable', // 停用
 						
+						search_spot_warrant_listing_record = 'search_spot_warrant_listing_record', // 挂牌记录
+						
+						search_spot_warrant_warehouse_receipt_details = 'search_spot_warrant_warehouse_receipt_details', // 仓单明细
+						
+						search_spot_warrant_transaction_record = 'search_spot_warrant_transaction_record', // 成交记录
+						
+						search_spot_warrant_protocol_specified_record = 'search_spot_warrant_protocol_specified_record', // 协议指定记录
+						
+						search_pre_sale_warehouse_receipt_order_summary = 'search_pre_sale_warehouse_receipt_order_summary', // 订单汇总
+						
+						search_pre_sale_warehouse_receipt_commission_record = 'search_pre_sale_warehouse_receipt_commission_record', // 委托记录
+						
+						search_pre_sale_warehouse_receipt_transaction_record = 'search_pre_sale_warehouse_receipt_transaction_record', // 成交记录
+						
+						search_pre_sale_warehouse_receipt_protocol_specified_record = 'search_pre_sale_warehouse_receipt_protocol_specified_record', // 协议指定记录
+						
+						search_document_records_contract_summary = 'search_document_records_contract_summary', // 合约汇总
+						
+						search_document_records_commission_record = 'search_document_records_commission_record', // 委托记录
+						
+						search_document_records_transaction_record = 'search_document_records_transaction_record', // 成交记录
+						
+						search_document_records_delivery_record = 'search_document_records_delivery_record', // 交收记录
+						
 						spot_trade_warehouse_buy_hall = 'spot_trade_warehouse_buy_hall', // 买大厅
 						
 						spot_trade_warehouse_sell_hall = 'spot_trade_warehouse_sell_hall', // 卖大厅

src/common/constants/enumsName.ts

@@ -637,9 +637,10 @@ export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number) {
 
 /**
  * 履约类型 - 0:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 10:法币C2C 11:报价系统 12:挂牌系统
+ * /-仓单预售 1-仓单贸易
  * @param type
  */
-export function getPerformanceTypeName(type: number) {
+export function getPerformanceTypeName(type: number, haswr: number) {
     let result = '--'
     switch (type) {
         case 0:
@@ -649,16 +650,21 @@ export function getPerformanceTypeName(type: number) {
             result = '交割'
             break
         case 2:
-            result = '仓单贸易'
+            result = '预售仓单'
+            if(haswr === 1){
+                result = '仓单贸易'
+            }else{
+                result = '仓单预售'
+            }
             break
         case 3:
-            result = '预售集采'
+            result = '预售采集'
             break
         case 4:
-            result = '竞拍-降价式'
+            result = '竞拍-降价式 (无仓单)'
             break
         case 5:
-            result = '挂牌期权'
+            result = '挂牌期权 (无仓单)'
             break
         case 6:
             result = '竞拍-降价式'
@@ -670,7 +676,7 @@ export function getPerformanceTypeName(type: number) {
             result = '竞拍-大宗式'
             break
         case 9:
-            result = '荷兰式'
+            result = '竞拍-荷兰式'
             break
         case 10:
             result = '法币C2C'
@@ -841,6 +847,62 @@ export function getApplyStatusFinanceName(type: number) {
     return result
 }
 
+//:预约成功 1:待初审 2:初审通过 3:初审拒绝 4:初审失败 5复审通过 6:复审拒绝 7:复审失败 8:已撤销
+export function getPickUpTypeName(type: number) {
+    let result = "--"
+    switch (type) {
+        case 0:
+            result = "预约成功"
+            break;
+        case 1:
+            result = '待审核'
+            break
+        case 2:
+            result = '初审通过'
+            break
+        case 3:
+            result = '初审拒绝'
+            break
+        case 4:
+            result = '初审失败'
+            break
+        case 5:
+            result = '复审通过'
+            break
+        case 6:
+            result = '复审拒绝'
+            break
+        case 7:
+            result = '复审失败'
+            break
+        case 8:
+            result = '已撤销'
+            break
+    }
+    return result
+}
+
+//申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
+export function getPickUpStatusName(type: number) {
+    let result = "--"
+    switch (type) {
+        case 1:
+            result = '预约入库'
+            break
+        case 2:
+            result = '预约出库'
+            break
+        case 3:
+            result = '入库注册'
+            break
+        case 4:
+            result = '出库注销'
+            break
+    }
+    return result
+}
+
+
 /**
  * //合同状态 - 1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 1number;
  //:已注销 11:已关闭 99:未提交

src/common/constants/modalNameEnum.ts

@@ -4,49 +4,53 @@ export enum ModalEnum {
     commomOrder = 'commom-order', // 下单通用界面
 
     detail = 'detail', // 详情
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
-						
 						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
-						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
 						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
-						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
 						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
+						
+						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
 						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
 						
-						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
+						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', // 撤单
 						
-						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', // 确定购买
 						
-						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
-						
 						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
 						commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
 						
 						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
 						
-						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
+						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
 						
-						financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
+						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
 						
 						financing_manager_contract_pay_arrears = 'financing_manager_contract_pay_arrears', // 支付欠款
 						
+						financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
+						
+						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+						
+						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
+						
 						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
+						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
 						
-						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
+						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
 						performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
 						
@@ -54,30 +58,26 @@ export enum ModalEnum {
 						
 						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
-						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
-						
-						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
+						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
 						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
 						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
 						
-						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
+						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
 						
 						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', // 挂牌求购
 						
 						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
 						
 						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
 						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
-						
 						spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
 						
-						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
-						
 						open = 'open', // 开仓
 						
 						close = 'close', // 平仓
@@ -88,12 +88,16 @@ export enum ModalEnum {
 						
 						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
 						
+						custom_info_btn_check = 'custom_info_btn_check', // 审核
+						
 						custom_info_btn_add = 'custom_info_btn_add', // 新增
 						
 						custom_info_btn_disable = 'custom_info_btn_disable', // 停用
 						
 						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', // 停用
@@ -102,25 +106,21 @@ export enum ModalEnum {
 						
 						spot_contract_btn_add = 'spot_contract_btn_add', // 新增
 						
-						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
-						
 						none_btn = 'none_btn', // 按钮
 						
 						warehouse_info_btn_add = 'warehouse_info_btn_add', // 新增
 						
 						warehouse_info_btn_modify = 'warehouse_info_btn_modify', // 修改
 						
-						custom_info_btn_check = 'custom_info_btn_check', // 审核
-						
-						account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
-						
-						account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
-						
 						warehouse_info_btn_disable = 'warehouse_info_btn_disable', // 停用
 						
+						warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
+						
 						account_info_business_btn_add = 'account_info_business_btn_add', // 新增
 						
-						warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
+						account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
+						
+						account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
 						
 						account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
 						
@@ -132,16 +132,20 @@ export enum ModalEnum {
 						
 						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
 						
+						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_invoice_audit = 'finance_review_invoice_audit', // 审核
+						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
 						
-						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
+						finance_review_invoice_audit = 'finance_review_invoice_audit', // 审核
 						
 						finance_review_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
 						
+						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
+						
 						inventory_review_checkin_cancel = 'inventory_review_checkin_cancel', // 撤销
 						
 						inventory_review_checkout_audit = 'inventory_review_checkout_audit', // 审核
@@ -152,7 +156,7 @@ export enum ModalEnum {
 						
 						platinum_custom_info_add = 'platinum_custom_info_add', // 新增
 						
-						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
+						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
 						
 						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
 						
@@ -160,7 +164,7 @@ export enum ModalEnum {
 						
 						platinum_pick_query_receipt = 'platinum_pick_query_receipt', // 确认收货
 						
-						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
+						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
 						
 						platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
 						
@@ -168,13 +172,13 @@ export enum ModalEnum {
 						
 						platinum_withdrawal_review_confirm_withdrawal = 'platinum_withdrawal_review_confirm_withdrawal', // 确认提现
 						
-						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
-						
 						platinum_withdrawal_review_refuse = 'platinum_withdrawal_review_refuse', // 审核拒绝
 						
 						platinum_financing_information_detail = 'platinum_financing_information_detail', // 融资明细
 						
-						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
+						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
+						
+						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
 						
 						platinum_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
 						
@@ -182,7 +186,7 @@ export enum ModalEnum {
 						
 						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
 						
-						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
+						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
 						
 						platinum_agreement_add = 'platinum_agreement_add', // 新增
 						
@@ -190,82 +194,76 @@ export enum ModalEnum {
 						
 						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
 						
-						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
-						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
+						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', // 撤销
 						
-						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
-						
-						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
-						
-						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_modify = 'account_info_business_btn_modify', // 修改
 						
 						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
 						
+						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
+						
 						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
 						
 						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
 						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
 						
+						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_modify = 'account_info_futures_btn_modify', // 修改
+						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
-						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
-						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
+						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
-						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
-						
-						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
-						
 						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
-						sell_pending_funds = 'sell_pending_funds', // 款项登记
-						
 						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
 						
 						sell_pending_storage = 'sell_pending_storage', // 出库登记
 						
-						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
+						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
 						
-						plan_audit_cancel = 'plan_audit_cancel', // 撤销
+						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
 						
 						plan_audit_audit = 'plan_audit_audit', // 审核
 						
-						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
+						plan_audit_cancel = 'plan_audit_cancel', // 撤销
 						
 						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
 						
+						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
+						
+						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
+						
 						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
 						
 						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
 						
-						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
-						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
+						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
+						
 						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
 						
 						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
@@ -276,6 +274,10 @@ export enum ModalEnum {
 						
 						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
 						
+						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
+						
+						sell_pending_funds = 'sell_pending_funds', // 款项登记
+						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
 						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
@@ -288,27 +290,25 @@ export enum ModalEnum {
 						
 						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
-						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
-						
-						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
+						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
 						
-						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
+						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
-						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
+						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
 						
-						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
+						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
-						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
-						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
+						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
-						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
+						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
-						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
+						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
 						
 						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
 						

src/router/index.ts

@@ -1006,21 +1006,45 @@ const routes: Array<RouteRecordRaw> = [
                 // redirect: { name: EnumRouterName.search_document_records, },
                 children: [
                     {
-                        path: '/search_document_records/search_document_records',
-                        name: EnumRouterName.search_document_records,
-                        component: () => import('@/views/search/search_document_records/search_document_records/index.vue'),
+                        path: '/search_document_records/search_commodity_contract',
+                        name: EnumRouterName.search_commodity_contract,
+                        component: () => import('@/views/search/search_document_records/search_commodity_contract/index.vue'),
                         meta: {
                             requireAuth: true,
                         },
                         children: [
                             {
-                                path: '/search_document_records/search_document_records/search_spot_warrant_listing_record',
-                                // name: EnumRouterName.search_spot_warrant_listing_record,
-                                component: () => import('@/views/search/search_document_records/search_document_records/search_spot_warrant_listing_record/index.vue'),
+                                path: '/search_document_records/search_commodity_contract/search_document_records_contract_summary',
+                                name: EnumRouterName.search_document_records_contract_summary,
+                                component: () => import('@/views/search/search_document_records/search_commodity_contract/search_document_records_contract_summary/index.vue'),
                                 meta: {
                                     requireAuth: true,
                                 },
-                            }
+                            },
+                            {
+                                path: '/search_document_records/search_commodity_contract/search_document_records_commission_record',
+                                name: EnumRouterName.search_document_records_commission_record,
+                                component: () => import('@/views/search/search_document_records/search_commodity_contract/search_document_records_commission_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_commodity_contract/search_document_records_delivery_record',
+                                name: EnumRouterName.search_document_records_delivery_record,
+                                component: () => import('@/views/search/search_document_records/search_commodity_contract/search_document_records_delivery_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_document_records/search_document_records_transaction_record',
+                                name: EnumRouterName.search_document_records_transaction_record,
+                                component: () => import('@/views/search/search_document_records/search_commodity_contract/search_document_records_transaction_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
                         ]
                     },
                     {
@@ -1031,7 +1055,38 @@ const routes: Array<RouteRecordRaw> = [
                             requireAuth: true,
                         },
                         children: [
-
+                            {
+                                path: '/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_commission_record',
+                                name: EnumRouterName.search_pre_sale_warehouse_receipt_commission_record,
+                                component: () => import('@/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_commission_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_order_summary',
+                                name: EnumRouterName.search_pre_sale_warehouse_receipt_order_summary,
+                                component: () => import('@/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_order_summary/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_protocol_specified_record',
+                                name: EnumRouterName.search_pre_sale_warehouse_receipt_protocol_specified_record,
+                                component: () => import('@/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_protocol_specified_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_transaction_record',
+                                name: EnumRouterName.search_pre_sale_warehouse_receipt_transaction_record,
+                                component: () => import('@/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_transaction_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
                         ]
                     },
                     {
@@ -1042,11 +1097,130 @@ const routes: Array<RouteRecordRaw> = [
                             requireAuth: true,
                         },
                         children: [
-
+                            {
+                                path: '/search_document_records/search_spot_warrant/search_spot_warrant_transaction_record',
+                                name: EnumRouterName.search_spot_warrant_transaction_record,
+                                component: () => import('@/views/search/search_document_records/search_spot_warrant/search_spot_warrant_transaction_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_spot_warrant/search_spot_warrant_protocol_specified_record',
+                                name: EnumRouterName.search_spot_warrant_protocol_specified_record,
+                                component: () => import('@/views/search/search_document_records/search_spot_warrant/search_spot_warrant_protocol_specified_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_spot_warrant/search_spot_warrant_listing_record',
+                                name: EnumRouterName.search_spot_warrant_listing_record,
+                                component: () => import('@/views/search/search_document_records/search_spot_warrant/search_spot_warrant_listing_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_document_records/search_spot_warrant/search_spot_warrant_warehouse_receipt_details',
+                                name: EnumRouterName.search_spot_warrant_warehouse_receipt_details,
+                                component: () => import('@/views/search/search_document_records/search_spot_warrant/search_spot_warrant_warehouse_receipt_details/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
                         ]
                     },
                 ]
-            }
+            },
+            {
+                path: '/search_capital_flow',
+                name: EnumRouterName.search_capital_flow,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_capital_flow/search_capital_flow_tab',
+                        name: EnumRouterName.search_capital_flow_tab,
+                        component: () => import('@/views/search/search_capital_flow/search_capital_flow_tab/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/search_financing_inquiry',
+                name: EnumRouterName.search_financing_inquiry,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_financing_inquiry/search_financing_inquiry_apply_order',
+                        name: EnumRouterName.search_financing_inquiry_apply_order,
+                        component: () => import('@/views/search/search_financing_inquiry/search_financing_inquiry_apply_order/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                    {
+                        path: '/search_financing_inquiry/search_financing_inquiry_contract',
+                        name: EnumRouterName.search_financing_inquiry_contract,
+                        component: () => import('@/views/search/search_financing_inquiry/search_financing_inquiry_contract/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/search_performance_query',
+                name: EnumRouterName.search_performance_query,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_performance_query/search_performance_query_buy_performance',
+                        name: EnumRouterName.search_performance_query_buy_performance,
+                        component: () => import('@/views/search/search_performance_query/search_performance_query_buy_performance/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                    {
+                        path: '/search_performance_query/search_performance_query_sell_performance',
+                        name: EnumRouterName.search_performance_query_sell_performance,
+                        component: () => import('@/views/search/search_performance_query/search_performance_query_sell_performance/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/search_pickup_query',
+                name: EnumRouterName.search_pickup_query,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_pickup_query/search_pickup_query_tab',
+                        name: EnumRouterName.search_pickup_query_tab,
+                        component: () => import('@/views/search/search_pickup_query/search_pickup_query_tab/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
         ],
     },
     {

src/views/order/financing_manager/components/financing_manager_contract/components/buyback/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 付款-->
+  <!-- 回购仓单 -->
   <Drawer :title="'回购仓单'"
           :placement="'right'"
           :visible="visible"
@@ -29,17 +29,17 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="购买数量">
-                <span class="white ml10">1000吨</span>
+                <span class="white ml10">{{ selectedRow.wrqty + " " + selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="已回购数量">
-                <span class="white ml10">1000吨</span>
+                <span class="white ml10">{{ selectedRow.buybackwrpositionqty + " " + selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="待回购数量">
-                <span class="white ml10">1000吨</span>
+                <span class="white ml10">{{ selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -52,17 +52,19 @@
                                 style="width: 200px" />
 
                 <div class="day">吨</div>
-                <div class="tip">本次可回购数量30吨</div>
+                  <!-- 本次可回购数量=min{资金方对应仓单头寸可用数量，融资合同剩余待回购数量} -->
+                <div class="tip">{{ "本次可回购数量" + selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</div>
               </a-form-item>
             </a-col>
             <a-col :span="12">
+                <!--（回购数量/合同剩余数量） * 合同剩余金额 -->
               <a-form-item label="本次回购金额">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ (((formState.num ===  0 ? 1 : formState.num) * selectedRow.remainamount) / selectedRow.remainwrpositionqty).toFixed(2) + " 元" }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="剩余保证金">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.initmargin + " 元" }}</span>
               </a-form-item>
             </a-col>
           </a-row>

src/views/order/financing_manager/components/financing_manager_contract/components/pay/index.vue

@@ -12,22 +12,22 @@
           <a-row :gutter="24">
             <a-col :span="12">
               <a-form-item label="借款金额">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.lenderamount + " 元"}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="剩余金额">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.remainamount + " 元"}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="已计费用">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.totalinterest + " 元"}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="费用欠款">
-                <span class="red ml10">100.00</span>
+                <span class="red ml10">{{ selectedRow.interestdebt + " 元"}}</span>
               </a-form-item>
             </a-col>
           </a-row>

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

@@ -21,7 +21,7 @@
       </template>
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr) }}</a>
       </template>
 
       <!-- 付款方式 -->

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

@@ -22,7 +22,7 @@
       </template>
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr)}}</a>
       </template>
 
       <!-- 付款方式 -->

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

@@ -18,7 +18,7 @@
                  class="btn-list-sticky"
                  :record="record"
                  @click="openComponent"
-                 v-if="record.enalbeqty > 0" />
+                 v-if="record.creditenableqty > 0" />
       </template>
     </a-table>
     <component :is="componentId"

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

@@ -19,6 +19,17 @@
                  class="btn-list-sticky"
                  @click="openComponent" />
       </template>
+
+        <!-- applytype 类型-->
+        <template #applytype="{ record }">
+            <span>{{ getPickUpStatusName(record.applytype) }}</span>
+        </template>
+
+        <!-- applystatus 状态 -->
+        <template #applystatus="{ record }">
+            <span>{{ getPickUpTypeName(record.applystatus) }}</span>
+        </template>
+
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -37,6 +48,7 @@ import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { BtnList as BtnListType } from '@/common/components/btnList/interface';
+import {getPickUpStatusName, getPickUpTypeName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_in_and_out_warehouse,
@@ -74,6 +86,8 @@ export default defineComponent({
             tableList,
             expandIcon,
             handleBtnList,
+            getPickUpStatusName,
+            getPickUpTypeName
         };
     },
 });

src/views/search/search_capital_flow/search_capital_flow_tab/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <!-- 资金流水 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)'}"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <template #createtime="{ record }">
+        <a>{{ formatTime(record.createtime) }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
+import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { queryAmountLog } from '@/services/go/TaAccount';
+import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
+import { getSelectedAccountId } from '@/services/bus/account';
+import { formatTime } from '@/common/methods';
+import Bus from '@/utils/eventBus/index';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_capital_flow_tab,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryAmountLogReq = {
+                accountID: getSelectedAccountId().toString(),
+            };
+
+            queryTable(queryAmountLog, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_funding_info_log',
+            recordList: getRecordItemTab(),
+        };
+        // 资金变化，重新加载数据
+        Bus.$on('moneyChangedNtf_UI', () => {
+            queryTableAction();
+        });
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+            formatTime,
+            expandIcon,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_document_records/index.vue → src/views/search/search_document_records/search_commodity_contract/index.vue

@@ -16,12 +16,12 @@ import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleMartketThirdRouter } from '@/common/setup/matket/router';
 
 export default defineComponent({
-    name: EnumRouterName.search_document_records,
+    name: EnumRouterName.search_commodity_contract,
     components: {
         ThridMenu,
     },
     setup() {
-        return { ...handleMartketThirdRouter(EnumRouterName.search_document_records) };
+        return { ...handleMartketThirdRouter(EnumRouterName.search_commodity_contract) };
     },
 });
 </script>

src/views/search/search_document_records/search_document_records/search_spot_warrant_listing_record/index.vue → src/views/search/search_document_records/search_commodity_contract/search_document_records_commission_record/index.vue

@@ -22,7 +22,7 @@ import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 
 export default defineComponent({
-    name: EnumRouterName.search_document_records,
+    name: EnumRouterName.search_document_records_commission_record,
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
@@ -45,7 +45,6 @@ export default defineComponent({
 
         return {
             ...handleComposeTable<WrOrderQuote>(param),
-            name: EnumRouterName.warehouse_pre_sale_price,
             loading,
             tableList,
         };

src/views/search/search_document_records/search_document_records/search_spot_warrant_protocol_specified_record/index.vue → src/views/search/search_document_records/search_commodity_contract/search_document_records_contract_summary/index.vue

@@ -22,7 +22,7 @@ import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 
 export default defineComponent({
-    name: EnumRouterName.search_document_records,
+    name: EnumRouterName.search_document_records_contract_summary,
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
@@ -45,7 +45,6 @@ export default defineComponent({
 
         return {
             ...handleComposeTable<WrOrderQuote>(param),
-            name: EnumRouterName.warehouse_pre_sale_price,
             loading,
             tableList,
         };

src/views/search/search_document_records/search_document_records/search_spot_warrant_transaction_record/index.vue → src/views/search/search_document_records/search_commodity_contract/search_document_records_delivery_record/index.vue

@@ -22,7 +22,7 @@ import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 
 export default defineComponent({
-    name: EnumRouterName.search_document_records,
+    name: EnumRouterName.search_document_records_delivery_record,
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
@@ -45,7 +45,6 @@ export default defineComponent({
 
         return {
             ...handleComposeTable<WrOrderQuote>(param),
-            name: EnumRouterName.warehouse_pre_sale_price,
             loading,
             tableList,
         };

src/views/search/search_document_records/search_commodity_contract/search_document_records_transaction_record/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <!-- 单据记录 商品合约-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, defineComponent, ComposeTableParam } from '@/common/export/commonTable';
+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.search_document_records_transaction_record,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 0,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_pre_sale_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_commission_record/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <!--  单据记录 预售仓单 委托记录 -->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!--  委托状态-->
+      <template #wrtradeorderstatus="{ record }">
+        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+      </template>
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrOrderDetail } from '@/services/go/wrtrade';
+import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { BtnList as btnType } from '@/common/components/btnList/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_pre_sale_warehouse_receipt_commission_record,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrOrderDetailReq = {
+                haswr: 0,
+            };
+            queryTable(queryWrOrderDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_pending_order',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrOrderDetail>(param),
+            loading,
+            tableList,
+            expandIcon,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_order_summary/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <!-- 单据记录 预售仓单 订单汇总 -->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrPosition } from '@/services/go/wrtrade';
+import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+export default defineComponent({
+    name: EnumRouterName.search_pre_sale_warehouse_receipt_order_summary,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPosition>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrPositionReq = {
+                haswr: 0,
+                querytype: 2,
+            };
+            queryTable(queryWrPosition, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_order_summary',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPosition>(param),
+            loading,
+            tableList,
+            expandIcon,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_protocol_specified_record/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <!-- 单据记录 商品合约-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, defineComponent, ComposeTableParam } from '@/common/export/commonTable';
+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.search_pre_sale_warehouse_receipt_protocol_specified_record,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 0,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_pre_sale_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_transaction_record/index.vue

@@ -0,0 +1,60 @@
+<template>
+  <!--  单据记录 预售仓单 成交记录 -->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_pre_sale_warehouse_receipt_transaction_record,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 0,
+            };
+            queryTable(queryWrTradeDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_make_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
+            loading,
+            tableList,
+            expandIcon,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_listing_record/index.vue

@@ -0,0 +1,73 @@
+<template>
+  <!-- 单据记录 现货仓单 挂牌记录 -->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!--  委托状态-->
+      <template #wrtradeorderstatus="{ record }">
+        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+      </template>
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+      <!-- 挂牌价格 -->
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrOrderDetail } from '@/services/go/wrtrade';
+import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { BtnList as btnType } from '@/common/components/btnList/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_spot_warrant_listing_record,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrOrderDetailReq = {
+                haswr: 1,
+            };
+            queryTable(queryWrOrderDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_pending_order',
+            recordList: getRecordItemTab(),
+        };
+
+        return {
+            ...handleComposeOrderTable<WrOrderDetail>(param),
+            loading,
+            tableList,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
+            expandIcon,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_document_records/search_spot_warrant_warehouse_receipt_details/index.vue → src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_protocol_specified_record/index.vue

@@ -22,7 +22,7 @@ import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 
 export default defineComponent({
-    name: EnumRouterName.search_document_records,
+    name: EnumRouterName.search_spot_warrant_protocol_specified_record,
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_transaction_record/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <!-- 单据记录 现货仓单 成交记录 -->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y:'calc(100vh - 163px)'}"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+
+      <!-- 成交金额 -->
+      <template #amount="{ record }">
+        <a>{{ record.tradeqty * record.tradeprice }}</a>
+      </template>
+
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getWrOrderTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_spot_warrant_transaction_record,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 1,
+            };
+            queryTable(queryWrTradeDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
+            loading,
+            tableList,
+            expandIcon,
+            getWrOrderTypeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_warehouse_receipt_details/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <!-- 单据记录 现货仓单 现货明细 -->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</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';
+import { expandIcon } from '@/common/setup/table/clolumn';
+export default defineComponent({
+    name: EnumRouterName.search_spot_warrant_warehouse_receipt_details,
+    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,
+            expandIcon,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_financing_inquiry/search_financing_inquiry_apply_order/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <!-- 融资查询 申请单 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 类型 -->
+      <template #financetype="{ record }">
+        <a>{{ getFinanceTypeName(record.financetype) }}</a>
+      </template>
+
+      <!-- 状态 -->
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusFinanceName(text) }}</a>
+      </template>
+
+      <template #createtime="{ record }">
+        <a>{{ formatTime(record.createtime) }}</a>
+      </template>
+
+      <!-- 结算方式 1:按日结息 3:按月结息-->
+      <template #interestsettlemode="{ record }">
+        <a>{{ getInterestSettleModeName(record.interestsettlemode) }}</a>
+      </template>
+      <!-- 费用 -->
+      <template #interestsettlevalue="{ record }">
+        <a>{{ getInterestrateModeName(record.interestratemode, record.interestrate) }}</a>
+      </template>
+
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { queryWrFinanceBuyApply } from '@/services/go/wrtrade';
+import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { formatTime } from '@/common/methods';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getApplyStatusFinanceName, getFinanceTypeName, getInterestrateModeName, getInterestSettleModeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_financing_inquiry_apply_order,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrFinanceBuyApply>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryWrFinanceBuyApply);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_financing_manage_bottom_apply_order',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrFinanceBuyApply>(param),
+            loading,
+            tableList,
+            formatTime,
+            expandIcon,
+            getFinanceTypeName,
+            getApplyStatusFinanceName,
+            getInterestrateModeName,
+            getInterestSettleModeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_financing_inquiry/search_financing_inquiry_contract/index.vue

@@ -0,0 +1,77 @@
+<template>
+  <!-- 融资查询 合同 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)'}"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 类型 -->
+      <template #financetype="{ record }">
+        <a>{{ getFinanceTypeName(record.financetype) }}</a>
+      </template>
+
+      <!-- 状态 -->
+      <template #scfcontractstatus="{ text }">
+        <a>{{ getContractName(text) }}</a>
+      </template>
+      <template #createtime="{ record }">
+        <a>{{ formatTime(record.createtime) }}</a>
+      </template>
+      <template #scfcontracttype="{ record }">
+        <a>{{ getScfContractTypeName(record.scfcontracttype) }}</a>
+      </template>
+
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { queryWrScfContract } from '@/services/go/wrtrade';
+import { WrScfContract } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { formatTime } from '@/common/methods';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getContractName, getFinanceTypeName, getScfContractTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_financing_inquiry_contract,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrScfContract>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryWrScfContract);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_financing_manage_bottom_contract',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrScfContract>(param),
+            loading,
+            tableList,
+            formatTime,
+            expandIcon,
+            getContractName,
+            getFinanceTypeName,
+            getScfContractTypeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_performance_query/search_performance_query_buy_performance/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <!-- 履约查询 买履约 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)'}"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { BtnList as BtnListType } from '@/common/components/btnList/interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+export default defineComponent({
+    name: EnumRouterName.search_performance_query_buy_performance,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 0,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+            recordList: getRecordItemTab(),
+        };
+
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+            getPerformanceTypeName,
+            getPerformanceStatusName,
+            getPaymentTypeName,
+            expandIcon,
+            BuyOrSell,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;
+

src/views/search/search_performance_query/search_performance_query_sell_performance/index.vue

@@ -0,0 +1,83 @@
+<template>
+  <!-- 履约查询 卖履约 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)'}"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_performance_query_sell_performance,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 1,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_sale',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+            getPerformanceTypeName,
+            getPaymentTypeName,
+            getPerformanceStatusName,
+            expandIcon,
+            BuyOrSell,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_pickup_query/search_pickup_query_tab/index.vue

@@ -0,0 +1,68 @@
+<template>
+  <!-- 提货查询 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- applytype 类型-->
+      <template #applytype="{ record }">
+        <span>{{ getPickUpStatusName(record.applytype) }}</span>
+      </template>
+
+      <!-- applystatus 状态 -->
+      <template #applystatus="{ record }">
+        <span>{{ getPickUpTypeName(record.applystatus) }}</span>
+      </template>
+
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { queryWrOutInApply } from '@/services/go/wrtrade';
+import { WrOutInApply } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getPickUpStatusName, getPickUpTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_pickup_query_tab,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOutInApply>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryWrOutInApply);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_pick_up',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrOutInApply>(param),
+            loading,
+            tableList,
+            expandIcon,
+            getPickUpStatusName,
+            getPickUpTypeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;