update

src/common/constants/enumOrderComponents.ts

@@ -8,11 +8,11 @@ export enum enumOrderComponents {
 						
 						commodity_contract = 'commodity_contract', // 商品合约
 						
-						performance_information = 'performance_information', // 履约信息
+						financing_manager = 'financing_manager', // 融资管理
 						
 						funding_information = 'funding_information', // 资金信息
 						
-						financing_manager = 'financing_manager', // 融资管理
+						performance_information = 'performance_information', // 履约信息
 						
 						spot_warrant_spot_summary = 'spot_warrant_spot_summary', // 现货汇总
 						
@@ -26,6 +26,8 @@ export enum enumOrderComponents {
 						
 						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
 						
+						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
+						
 						pre_sale_warehouse_receipt_order_summary = 'pre_sale_warehouse_receipt_order_summary', // 订单汇总
 						
 						pre_sale_warehouse_receipt_pending_order = 'pre_sale_warehouse_receipt_pending_order', // 挂单
@@ -34,27 +36,25 @@ export enum enumOrderComponents {
 						
 						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
 						
-						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
-						
 						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
 						
-						commodity_contract_commission = 'commodity_contract_commission', // 委托
-						
 						commodity_contract_make_deal = 'commodity_contract_make_deal', // 成交
 						
+						commodity_contract_commission = 'commodity_contract_commission', // 委托
+						
 						commodity_contract_settlement = 'commodity_contract_settlement', // 交收
 						
-						performance_information_buy_performance = 'performance_information_buy_performance', // 买履约
+						financing_manager_apply_order = 'financing_manager_apply_order', // 申请单
 						
-						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
+						financing_manager_contract = 'financing_manager_contract', // 合同
 						
-						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
+						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
 						
 						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
 						
-						financing_manager_apply_order = 'financing_manager_apply_order', // 申请单
+						performance_information_buy_performance = 'performance_information_buy_performance', // 买履约
 						
-						financing_manager_contract = 'financing_manager_contract', // 合同
+						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
 						
 						pre_sale_warehouse_receipt_designated_deal_resell = 'pre_sale_warehouse_receipt_designated_deal_resell', // 撤销出售
 						

src/common/constants/enumRouterName.ts

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

src/common/constants/modalNameEnum.ts

@@ -6,66 +6,72 @@ export enum ModalEnum {
     detail = 'detail', // 详情
 						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
+						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
+						
 						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
 						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
-						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
-						
 						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
-						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
+						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
-						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
+						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
+						
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
 						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
-						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
+						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
 						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', // 确定购买
 						
-						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', // 交收
 						
 						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
 						
-						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
+						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
+						
+						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
 						
 						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', // 支付欠款
 						
 						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
 						
-						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
+						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
-						performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
+						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
+						performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
 						
 						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
-						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
+						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
-						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
+						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
 						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
 						
-						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
-						
-						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
+						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
-						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
+						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
 						
 						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
 						
 						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
 						
+						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
+						
+						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
+						
 						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
 						
 						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
@@ -120,13 +126,11 @@ export enum ModalEnum {
 						
 						account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
 						
-						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
-						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
-						
 						plan_btn_add = 'plan_btn_add', // 新增
 						
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
+						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+						
+						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
 						
 						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
 						
@@ -192,61 +196,59 @@ export enum ModalEnum {
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
-						
-						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
-						
 						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
 						
 						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
 						
+						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
+						
 						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
 						
 						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 						
-						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
-						
 						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
 						
+						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+						
 						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
 						
-						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
-						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
+						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
 						
-						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_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
 						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
 						
-						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
+						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 						
 						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
-						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
-						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
-						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
+						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
-						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
-						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', // 出库登记
 						
-						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
+						
+						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
 						
 						plan_audit_audit = 'plan_audit_audit', // 审核
 						
@@ -258,48 +260,46 @@ export enum ModalEnum {
 						
 						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_stop_delete = 'platinum_customer_info_stop_delete', // 删除
+						
 						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
 						
-						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
+						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
 						
-						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
 						
 						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
-						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
+						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
 						
-						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
-						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
+						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
 						
 						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
 						
-						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
-						
-						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
+						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
 						
 						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
-						
-						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
+						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
 						
-						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
+						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
 						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
 						
-						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
-						
 						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
 						
-						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
-						
 						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
+						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
+						
 						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
 						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码

src/common/methods/table/interface.ts

@@ -109,6 +109,7 @@ table_pcweb_spot_trade_bottom_spot_warrant_spot_detail:string, // 底部栏-现
 table_pcweb_spot_trade_bottom_spot_warrant_pending_order:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_deal:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_designated_deal:string, // 底部栏-现货仓单
+table_pcweb_spot_trade_bottom_spot_warrant_pick_up:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_pre_sale_order_summary:string, // 底部栏-预售仓单
 table_pcweb_spot_trade_bottom_pre_sale_pending_order:string, // 底部栏-预售仓单
 table_pcweb_spot_trade_bottom_pre_sale_make_deal:string, // 底部栏-预售仓单

src/common/setup/table/compose.ts

@@ -127,6 +127,7 @@ export function handleComposeOrderTable<T>({ queryFn, recordList, isDetail, tabl
     const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
     // 表格操作按钮列表
     const btnList = getOrderBtnList(recordList, isDetail).value;
+    console.log('表格操作按钮列表', btnList)
     // 控制异步组件
     const { componentId, closeComponent, openComponent } = handleModalComponent(queryFn, selectedRow);
     // 关闭右键

src/services/go/wrtrade/index.ts

@@ -13,8 +13,7 @@ import {
     QueryWrBuybackDetailReq,
     QueryWrFactorTypeInfoReq, QueryWrGoodsInfoReq,
     QueryWrMarketTradeConfigReq,
-    QueryWrOrderDetailReq, QueryWrOutInApplyReq,
-    QueryWrPerformancePlanStepReq,
+    QueryWrOrderDetailReq, QueryWrPerformancePlanStepReq,
     QueryWrPositionReq, QueryWrScfContractInterestReq, QueryWrSpecialMatchOrderReq,
     QueryWrStandardFactoryItemReq,
     QueryWrTradeDetailReq, WrBuybackDetail,
@@ -261,8 +260,9 @@ export function queryWrScfContractInterest(req: QueryWrScfContractInterestReq):
 /**
  * 查询提货申请 /WrTrade2/QueryWrOutInApply
  */
-export function queryWrOutInApply(req: QueryWrOutInApplyReq): Promise<WrOutInApply[]> {
-    return commonSearch_go('/WrTrade2/QueryWrOutInApply', req).catch((err) => {
+export function queryWrOutInApply(): Promise<WrOutInApply[]> {
+    const userid = getUsrId()
+    return commonSearch_go('/WrTrade2/QueryWrOutInApply', { userid }).catch((err) => {
         throw new Error(`查询提货申请: ${err}`);
     });
 }

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

@@ -0,0 +1,62 @@
+<template>
+  <!-- 撤销-->
+  <div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { Modal } from 'ant-design-vue';
+import { WRTradeFinanceBuyCancel } from '@/services/proto/warehousetrade';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { WRTradeFinanceBuyCancelReq } from '@/services/proto/warehousetrade/interface';
+import { getSelectedAccountId } from '@/services/bus/account';
+import { v4 as uuidv4 } from 'uuid';
+import Long from 'long';
+
+export default defineComponent({
+    name: ModalEnum.financing_manager_apply_cancel,
+    components: { Drawer },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrFinanceBuyApply>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+        Modal.confirm({
+            title: '撤销',
+            content: '是否确认撤销提货申请！',
+            onOk: submit,
+            onCancel: cancel,
+        });
+        function submit() {
+            // 挂牌撤单请求
+            // const paramReq: WRTradeFinanceBuyCancelReq = {
+            //     AccountID: getSelectedAccountId(), // uint64 资金账号
+            //     FinanceApplyID : Long.fromString(props.selectedRow.financeapplyid), // uint64 融资申请单ID
+            //     ClientSerialNo: uuidv4(), // 客户端流水号 // string 客户端流水号
+            // };
+            // requestResultLoadingAndInfo(WRTradeFinanceBuyCancel, paramReq, loading, ['撤销成功', '撤销失败:']).then(() => {
+            //     cancel(true);
+            // });
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

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

@@ -0,0 +1,62 @@
+<template>
+  <!-- 确认提货-->
+  <div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { Modal } from 'ant-design-vue';
+import { WRTradeFinanceBuyCancel } from '@/services/proto/warehousetrade';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { WRTradeFinanceBuyCancelReq } from '@/services/proto/warehousetrade/interface';
+import { getSelectedAccountId } from '@/services/bus/account';
+import { v4 as uuidv4 } from 'uuid';
+import Long from 'long';
+
+export default defineComponent({
+    name: ModalEnum.financing_manager_apply_cancel,
+    components: { Drawer },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrFinanceBuyApply>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+        Modal.confirm({
+            title: '确认提货',
+            content: '是否确认提货！',
+            onOk: submit,
+            onCancel: cancel,
+        });
+        function submit() {
+            // 挂牌撤单请求
+            // const paramReq: WRTradeFinanceBuyCancelReq = {
+            //     AccountID: getSelectedAccountId(), // uint64 资金账号
+            //     FinanceApplyID : Long.fromString(props.selectedRow.financeapplyid), // uint64 融资申请单ID
+            //     ClientSerialNo: uuidv4(), // 客户端流水号 // string 客户端流水号
+            // };
+            // requestResultLoadingAndInfo(WRTradeFinanceBuyCancel, paramReq, loading, ['撤销成功', '撤销失败:']).then(() => {
+            //     cancel(true);
+            // });
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

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

@@ -1,18 +1,80 @@
 <template>
-  <!-- 出入库 -->
-  <section class="spot_warrant_in_and_out_warehouse">
-    出入库
+  <!-- 提货 -->
+  <section>
+    <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 #expandedRowRender="{ record }">
+        <BtnList :btnList="handleBtnList(btnList, record)"
+                 :record="record"
+                 class="btn-list-sticky"
+                 @click="openComponent" />
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
   </section>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrOutInApply } from '@/services/go/wrtrade';
+import { WrOutInApply } from '@/services/go/wrtrade/interface';
+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';
+
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_in_and_out_warehouse,
-    components: {},
+    components: {
+        BtnList,
+        [ModalEnum.spot_warrant_in_and_out_warehouse_sure_pick_up]: defineAsyncComponent(() => import('./components/pick_up/index.vue')),
+        [ModalEnum.spot_warrant_in_and_out_warehouse_revoke]: defineAsyncComponent(() => import('./components/cancel/index.vue')),
+    },
     setup() {
-        return {};
+        // 表格列表数据
+        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(),
+        };
+        function handleBtnList(btnList: BtnListType[], item: WrOutInApply) {
+            const { applystatus, applytype } = item;
+            if (applystatus === 0 && applytype === 4) {
+                return btnList.filter((e) => e.code === ModalEnum.spot_warrant_in_and_out_warehouse_sure_pick_up);
+            } else if (applystatus === 1 && applytype === 2) {
+                return btnList.filter((e) => e.code === ModalEnum.spot_warrant_in_and_out_warehouse_revoke);
+            } else {
+                return [];
+            }
+        }
+        return {
+            ...handleComposeOrderTable<WrOutInApply>(param),
+            loading,
+            tableList,
+            expandIcon,
+            handleBtnList,
+        };
     },
 });
 </script>