update

generate-code/pc_menu_企业风管.json

@@ -46,7 +46,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_spot_production_bottom_spot_summary_check_btn",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -157,7 +157,7 @@
             "sort": 1,
             "type": 4,
             "rulekey": "client_pc_web_spot_production_bottom_spot_designated_transaction",
-            "isshow": true,
+            "isshow": false,
             "url": "",
             "remark": "",
             "children": [
@@ -205,7 +205,7 @@
             "sort": 1,
             "type": 4,
             "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse",
-            "isshow": true,
+            "isshow": false,
             "url": "",
             "remark": "",
             "children": [
@@ -395,7 +395,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_pay",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -407,7 +407,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_extension",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -419,7 +419,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_breach_contract",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -431,7 +431,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_detail",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -455,7 +455,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_pay",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -467,7 +467,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_extension",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -479,7 +479,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_breach_contract",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -491,7 +491,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_detail",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -527,7 +527,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_funding_bottom_order_funding_summary_recharge",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -539,7 +539,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_funding_bottom_order_funding_summary_withdraw",
-                "isshow": true,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -605,7 +605,7 @@
                 "children": [
                   {
                     "code": "spot_trade_warehouse_post_buying",
-                    "title": "发布求购",
+                    "title": "挂牌求购",
                     "sort": 1,
                     "type": 2,
                     "rulekey": "client_pc_web_spot_warehouse_receipt_trade_buy_it_out_post_buying",
@@ -648,6 +648,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_price_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   },
@@ -689,7 +701,7 @@
                 "children": [
                   {
                     "code": "spot_trade_warehouse_post_buying",
-                    "title": "发布求购",
+                    "title": "挂牌求购",
                     "sort": 1,
                     "type": 2,
                     "rulekey": "client_pc_web_spot_warehouse_receipt_trade_floating_price_post_buying",
@@ -732,6 +744,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   },
@@ -785,11 +809,11 @@
                 "children": [
                   {
                     "code": "spot_trade_warehouse_post_buying",
-                    "title": "发布求购",
+                    "title": "挂牌求购",
                     "sort": 1,
                     "type": 2,
                     "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_post_buying",
-                    "isshow": true,
+                    "isshow": false,
                     "url": "",
                     "remark": "",
                     "children": [
@@ -828,6 +852,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   },
@@ -869,11 +905,11 @@
                 "children": [
                   {
                     "code": "spot_trade_warehouse_post_buying",
-                    "title": "发布求购",
+                    "title": "挂牌求购",
                     "sort": 1,
                     "type": 2,
                     "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_post_buying",
-                    "isshow": true,
+                    "isshow": false,
                     "url": "",
                     "remark": "",
                     "children": [
@@ -912,6 +948,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   },

src/common/constants/enumOrderComponents.ts

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

src/common/constants/enumRouterName.ts

@@ -1,33 +1,25 @@
 // 路由名 枚举
 export enum EnumRouterName {
-						market = 'market', // 市场
+						remark = 'remark', // 
 						
-						business = 'business', // 业务
+						market = 'market', // 市场
 						
 						info = 'info', // 信息
 						
+						business = 'business', // 业务
+						
 						manage = 'manage', // 管理
 						
+						search = 'search', // 查询
+						
 						report = 'report', // 报表
 						
 						platinum = 'platinum', // 铂金宝
 						
-						remark = 'remark', // 
-						
-						search = 'search', // 查询
-						
 						spot_trade = 'spot_trade', // 现货贸易
 						
 						futures = 'futures', // 期货
 						
-						purchase = 'purchase', // 采购
-						
-						exposure = 'exposure', // 敞口
-						
-						sell = 'sell', // 销售
-						
-						plan = 'plan', // 计划
-						
 						custom_info = 'custom_info', // 客户资料
 						
 						goods_info = 'goods_info', // 商品信息
@@ -36,13 +28,21 @@ export enum EnumRouterName {
 						
 						warehouse_info = 'warehouse_info', // 仓库信息
 						
-						business_review = 'business_review', // 业务审核
+						account_info = 'account_info', // 账户管理
+						
+						purchase = 'purchase', // 采购
+						
+						sell = 'sell', // 销售
+						
+						exposure = 'exposure', // 敞口
 						
 						finance_review = 'finance_review', // 财务审核
 						
 						inventory_review = 'inventory_review', // 库存审核
 						
-						account_info = 'account_info', // 账户管理
+						plan = 'plan', // 计划
+						
+						business_review = 'business_review', // 业务审核
 						
 						finance_report = 'finance_report', // 财务报表
 						
@@ -50,18 +50,18 @@ export enum EnumRouterName {
 						
 						spot_report = 'spot_report', // 现货报表
 						
-						inventory_report = 'inventory_report', // 库存报表
-						
 						sum_pl_report = 'sum_pl_report', // 汇总损益报表
 						
 						future_report = 'future_report', // 期货报表
 						
-						platinum_customer_info = 'platinum_customer_info', // 客户资料
-						
 						platinum_pick_goods_management = 'platinum_pick_goods_management', // 提货商品管理
 						
+						platinum_customer_info = 'platinum_customer_info', // 客户资料
+						
 						platinum_pick_query = 'platinum_pick_query', // 提货查询
 						
+						inventory_report = 'inventory_report', // 库存报表
+						
 						platinum_recharge_withdrawal_review = 'platinum_recharge_withdrawal_review', // 充值和提现审核
 						
 						platinum_fixed_investment_price_query = 'platinum_fixed_investment_price_query', // 定投价查询
@@ -102,59 +102,57 @@ export enum EnumRouterName {
 						
 						closedetail = 'closedetail', // 平仓
 						
-						purchase_pending = 'purchase_pending', // 待点价
-						
-						purchase_performance = 'purchase_performance', // 履约交收
+						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
 						
-						purchase_all = 'purchase_all', // 全部
+						custom_info_checkpending = 'custom_info_checkpending', // 待审核
 						
-						exposure_realtime = 'exposure_realtime', // 实时敞口
+						custom_info_normal = 'custom_info_normal', // 正常
 						
-						exposure_spot = 'exposure_spot', // 现货头寸
+						custom_info_disabled = 'custom_info_disabled', // 停用
 						
-						exposure_futures = 'exposure_futures', // 期货头寸
+						goods_info_spot = 'goods_info_spot', // 现货品种
 						
-						exposure_history = 'exposure_history', // 历史敞口
+						goods_info_hedge = 'goods_info_hedge', // 套保品种
 						
-						sell_pending = 'sell_pending', // 待点价
+						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
 						
-						sell_performance = 'sell_performance', // 履约交收
+						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
 						
-						sell_all = 'sell_all', // 全部
+						spot_contract_performance = 'spot_contract_performance', // 履约中
 						
-						custom_info_unsubmit = 'custom_info_unsubmit', // 未提交
+						spot_contract_finished = 'spot_contract_finished', // 已完成
 						
-						plan_running = 'plan_running', // 执行中
+						warehouse_info_normal = 'warehouse_info_normal', // 正常
 						
-						custom_info_checkpending = 'custom_info_checkpending', // 待审核
+						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
 						
-						custom_info_disabled = 'custom_info_disabled', // 停用
+						account_info_business = 'account_info_business', // 业务账户
 						
-						goods_info_spot = 'goods_info_spot', // 现货品种
+						account_info_trade = 'account_info_trade', // 交易账户
 						
-						goods_info_hedge = 'goods_info_hedge', // 套保品种
+						account_info_manager = 'account_info_manager', // 管理账户
 						
-						spot_contract_unsubmitted = 'spot_contract_unsubmitted', // 未提交
+						account_info_futures = 'account_info_futures', // 期货账户
 						
-						spot_contract_checkpending = 'spot_contract_checkpending', // 待审核
+						purchase_pending = 'purchase_pending', // 待点价
 						
-						spot_contract_performance = 'spot_contract_performance', // 履约中
+						purchase_performance = 'purchase_performance', // 履约交收
 						
-						spot_contract_finished = 'spot_contract_finished', // 已完成
+						purchase_all = 'purchase_all', // 全部
 						
-						plan_audit = 'plan_audit', // 待审核
+						sell_pending = 'sell_pending', // 待点价
 						
-						warehouse_info_normal = 'warehouse_info_normal', // 正常
+						sell_performance = 'sell_performance', // 履约交收
 						
-						plan_uncommitted = 'plan_uncommitted', // 未提交
+						sell_all = 'sell_all', // 全部
 						
-						custom_info_normal = 'custom_info_normal', // 正常
+						exposure_realtime = 'exposure_realtime', // 实时敞口
 						
-						warehouse_info_disabled = 'warehouse_info_disabled', // 停用
+						exposure_spot = 'exposure_spot', // 现货头寸
 						
-						business_review_someprice = 'business_review_someprice', // 点价
+						exposure_futures = 'exposure_futures', // 期货头寸
 						
-						business_review_settlement = 'business_review_settlement', // 交收
+						exposure_history = 'exposure_history', // 历史敞口
 						
 						finance_review_funds = 'finance_review_funds', // 款项
 						
@@ -164,13 +162,19 @@ export enum EnumRouterName {
 						
 						inventory_review_checkout = 'inventory_review_checkout', // 出库
 						
-						account_info_business = 'account_info_business', // 业务账户
+						plan_audit = 'plan_audit', // 待审核
 						
-						account_info_trade = 'account_info_trade', // 交易账户
+						plan_uncommitted = 'plan_uncommitted', // 未提交
 						
-						account_info_manager = 'account_info_manager', // 管理账户
+						plan_running = 'plan_running', // 执行中
 						
-						account_info_futures = 'account_info_futures', // 期货账户
+						business_review_someprice = 'business_review_someprice', // 点价
+						
+						business_review_settlement = 'business_review_settlement', // 交收
+						
+						inventory_current = 'inventory_current', // 当前库存
+						
+						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
 						
 						finance_report_finance = 'finance_report_finance', // 财务报表
 						
@@ -178,28 +182,30 @@ export enum EnumRouterName {
 						
 						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', // 期货报表
 						
+						platinum_pick_goods_management_tab = 'platinum_pick_goods_management_tab', // 提货商品管理
+						
 						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_goods_management_tab = 'platinum_pick_goods_management_tab', // 提货商品管理
-						
 						platinum_pick_query_tab = 'platinum_pick_query_tab', // 提货查询
 						
+						inventory_report_inventory_category = 'inventory_report_inventory_category', // 库存报表(品类)
+						
+						inventory_report_warehouse = 'inventory_report_warehouse', // 库存报表(仓库)
+						
 						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', // 定投流水查询
@@ -214,42 +220,36 @@ export enum EnumRouterName {
 						
 						platinum_financing_information_tab = 'platinum_financing_information_tab', // 融资信息
 						
-						platinum_fixed_investment_price_query_tab = 'platinum_fixed_investment_price_query_tab', // 定投价查询
+						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
 						
 						platinum_contract_commodity_suspension_tab = 'platinum_contract_commodity_suspension_tab', // 合约商品停牌
 						
-						platinum_contract_goods_tab = 'platinum_contract_goods_tab', // 合约商品
-						
 						platinum_agents_and_stores_tab = 'platinum_agents_and_stores_tab', // 代理和门店
 						
 						platinum_spot_and_price_tab = 'platinum_spot_and_price_tab', // 现货市价
 						
-						outaccount_status_status = 'outaccount_status_status', // 账户状态
-						
-						inventory_current = 'inventory_current', // 当前库存
-						
-						inventory_applyrecord = 'inventory_applyrecord', // 申请记录
-						
 						platinum_agreement_tab = 'platinum_agreement_tab', // 协议管理
 						
+						outaccount_status_status = 'outaccount_status_status', // 账户状态
+						
 						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', // 浮动价预售
-						
 						warehouse_pre_sale_price = 'warehouse_pre_sale_price', // 一口价预售
 						
-						goods_info_spot_disable = 'goods_info_spot_disable', // 停用
+						warehouse_pre_sale_floating_price = 'warehouse_pre_sale_floating_price', // 浮动价预售
 						
 						goods_info_spot_normal = 'goods_info_spot_normal', // 正常
 						
+						goods_info_spot_disable = 'goods_info_spot_disable', // 停用
+						
 						goods_info_hedge_normal = 'goods_info_hedge_normal', // 正常
 						
 						goods_info_hedge_disable = 'goods_info_hedge_disable', // 停用
 						
-						spot_trade_warehouse_sell_hall = 'spot_trade_warehouse_sell_hall', // 卖大厅
-						
 						spot_trade_warehouse_buy_hall = 'spot_trade_warehouse_buy_hall', // 买大厅
 						
+						spot_trade_warehouse_sell_hall = 'spot_trade_warehouse_sell_hall', // 卖大厅
+						
 		}

src/common/constants/modalNameEnum.ts

@@ -4,80 +4,78 @@ export enum ModalEnum {
     commomOrder = 'commom-order', // 下单通用界面
 
     detail = 'detail', // 详情
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
-						
-						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
-						
 						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
-						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
-						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
+						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
 						
 						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
-						
-						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
+						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_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
-						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
 						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
 						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
 						
-						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
+						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
-						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
+						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
+						
+						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
 						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
 						
 						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
-						
-						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
+						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
 						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
 						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
 						
-						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
+						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', // 违约
 						
-						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
+						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
 						
-						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
+						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
 						
-						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
+						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
 						
-						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 发布求购
+						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
 						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
+						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
+						
+						spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
 						
 						open = 'open', // 开仓
 						
-						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
+						close = 'close', // 平仓
+						
+						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
 						
 						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
 						
-						custom_info_btn_check = 'custom_info_btn_check', // 审核
+						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
 						
-						close = 'close', // 平仓
+						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_add = 'goods_info_spot_normal_add', // 新增
+						
 						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
 						
 						goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
@@ -112,18 +110,16 @@ export enum ModalEnum {
 						
 						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
 						
-						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
-						
 						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
 						
 						business_review_settlement_cancel = 'business_review_settlement_cancel', // 撤销
 						
 						finance_review_funds_audit = 'finance_review_funds_audit', // 审核
 						
-						finance_review_invoice_audit = 'finance_review_invoice_audit', // 审核
-						
 						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
 						
+						finance_review_invoice_audit = 'finance_review_invoice_audit', // 审核
+						
 						finance_review_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
 						
 						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
@@ -140,12 +136,12 @@ export enum ModalEnum {
 						
 						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
 						
+						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
+						
 						platinum_pick_query_upload_logistics = 'platinum_pick_query_upload_logistics', // 上传物流
 						
 						platinum_pick_query_receipt = 'platinum_pick_query_receipt', // 确认收货
 						
-						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
-						
 						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
 						
 						platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
@@ -154,91 +150,95 @@ export enum ModalEnum {
 						
 						platinum_withdrawal_review_confirm_withdrawal = 'platinum_withdrawal_review_confirm_withdrawal', // 确认提现
 						
-						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
-						
 						platinum_withdrawal_review_refuse = 'platinum_withdrawal_review_refuse', // 审核拒绝
 						
 						platinum_financing_information_detail = 'platinum_financing_information_detail', // 融资明细
 						
+						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
+						
 						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
 						
 						platinum_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
 						
+						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
+						
 						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
 						
 						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
 						
-						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
+						platinum_agreement_add = 'platinum_agreement_add', // 新增
 						
-						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
+						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
 						
 						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						platinum_agreement_add = 'platinum_agreement_add', // 新增
+						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
-						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
+						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
-						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
+						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
 						
 						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
 						
-						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
+						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
+						
+						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
 						
 						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 						
-						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
+						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
 						
-						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
+						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
 						
-						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
+						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
 						
-						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
+						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
 						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+						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_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
 						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
 						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
 						
 						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
-						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
-						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
+						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
 						
-						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
-						sell_pending_funds = 'sell_pending_funds', // 款项登记
+						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
 						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
 						
-						sell_pending_storage = 'sell_pending_storage', // 出库登记
+						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
+						sell_pending_funds = 'sell_pending_funds', // 款项登记
+						
 						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
 						
-						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
+						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						plan_audit_audit = 'plan_audit_audit', // 审核
+						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
 						
 						plan_audit_cancel = 'plan_audit_cancel', // 撤销
 						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
-						
-						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
-						
 						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
 						
-						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
+						plan_audit_audit = 'plan_audit_audit', // 审核
+						
+						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
 						
 						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
 						
@@ -248,30 +248,32 @@ export enum ModalEnum {
 						
 						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
 						
-						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
+						sell_pending_storage = 'sell_pending_storage', // 出库登记
 						
-						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
+						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
 						
 						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
 						
 						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
 						
+						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
+						
 						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
-						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
+						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
 						
-						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
+						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
+						
+						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
 						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
-						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
+						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
 						
-						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
+						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
 						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
 						
-						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
-						
 						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
 						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
@@ -280,17 +282,11 @@ export enum ModalEnum {
 						
 						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
-						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
-						
 						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
-						
-						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
-						
-						account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改
+						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
-						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
+						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
 						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
@@ -298,4 +294,10 @@ export enum ModalEnum {
 						
 						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
 						
+						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
+						
+						account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改
+						
+						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
+						
 		}

src/services/bus/account.ts

@@ -124,8 +124,8 @@ export function getSelectedAccountId(): number {
 
 // 获取冻结资金
 export function getFreeze(value: AccountListItem, isFixed2 = false) {
-    const { freezecharge, freezemargin, orifreezecharge, orifreezemargin, oriotherfreezemargin, otherfreezemargin, outamountfreeze } = value;
-    const freeze = freezecharge + freezemargin + orifreezecharge + orifreezemargin + oriotherfreezemargin + otherfreezemargin + outamountfreeze;
+    const { freezecharge, freezemargin, otherfreezemargin, outamountfreeze } = value;
+    const freeze = freezecharge + freezemargin + otherfreezemargin + outamountfreeze;
     return isFixed2 ? freeze.toFixed(2) : freeze
 }
 

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

@@ -56,6 +56,7 @@ export default defineComponent({
     components: {
         BtnList,
         [ModalEnum.spot_trade_warehouse_delisting]: defineAsyncComponent(() => import('../delisting/index.vue')),
+        [ModalEnum.spot_trade_warehouse_financing_delisting]: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
     },
     setup(props, context) {
         // 表格列表数据

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

@@ -254,7 +254,7 @@ import { ListingForm } from './interface';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 export default defineComponent({
-    name: ModalEnum.spot_trade_warehouse_delisting,
+    name: ModalEnum.spot_trade_warehouse_financing_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
     emits: ['cancel'],
     props: {

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

@@ -0,0 +1,472 @@
+<template>
+  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+  <Drawer :title="'摘牌'"
+          :placement="'top'"
+          :visible="visible"
+          width="486px"
+          height="479px"
+          @cancel="cancel"
+          class="top">
+    <div class="delisting">
+      <div class="formBar">
+        <a-form class="inlineForm dialogForm"
+                ref="formRef"
+                :model="formState"
+                :rules="rules">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="交易账户"
+                           name="accountid">
+                <a-select class="inlineFormSelect"
+                          style="width: 260px"
+                          v-model:value="formState.accountid"
+                          placeholder="请选择">
+                  <a-select-option v-for="item in accountList"
+                                   :value="item.accountid"
+                                   :key="item.accountid">{{item.accountid}}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="挂牌方">
+                <span class="white">{{selectedRow.username}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="挂牌价格">
+                <span class="yellow">{{selectedRow.fixedprice}}</span>
+              </a-form-item>
+              <a-row :gutter="24">
+                <a-col :span="24"></a-col>
+              </a-row>
+              <a-form-item label="挂牌数量">
+                <span class="white">{{selectedRow.orderqty}}吨</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="现货仓单"
+                           name>
+                <a-select class="inlineFormSelect"
+                          style="width: 260px"
+                          placeholder="请选择">
+                  <a-select-option value="8271930000-01(120吨)">8271930000-01(120吨)</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="摘牌数量"
+                           name="num">
+                <a-input-number class="dialogInput"
+                                style="width: 260px"
+                                v-model:value="formState.num"
+                                suffix="吨" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item>
+                <a-slider ::min="0"
+                          v-model:value="formState.num"
+                          :max="selectedRow.orderqty"
+                          class="formSlider" />
+                <div class="unit">
+                  <span>1</span>
+                  <span>{{selectedRow.orderqty}}</span>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item label="挂牌金额">
+                <span class="white">50400.00</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn"
+                          @click="submit">卖出</a-button>
+                <a-button class="ml10 cancelBtn"
+                          @click="cancel">取消</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
+  <!-- 仓单贸易  一口价    摘牌 -->
+  <Drawer :title="'摘牌'"
+          :placement="'top'"
+          :visible="visible"
+          width="486px"
+          height="479px"
+          @cancel="cancel"
+          class="top">
+    <div class="delisting">
+      <div class="formBar">
+        <a-form class="inlineForm dialogForm"
+                ref="formRef"
+                :model="formState"
+                :rules="rules">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="交易账户"
+                           name="accountid">
+                <a-select class="inlineFormSelect"
+                          style="width: 260px"
+                          v-model:value="formState.accountid"
+                          placeholder="请选择">
+                  <a-select-option v-for="item in accountList"
+                                   :value="item.accountid"
+                                   :key="item.accountid">
+                    {{item.accountid}}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="挂牌方">
+                <span class="white">{{selectedRow.username}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="基差"
+                           v-if="isFloat()">
+                <span class="yellow">{{selectedRow.pricemove}}</span>
+              </a-form-item>
+              <a-form-item label="挂牌价格"
+                           v-if="!isFloat()">
+                <span class="yellow">{{selectedRow.fixedprice}}</span>
+              </a-form-item>
+              <a-row :gutter="24">
+                <a-col :span="24"></a-col>
+              </a-row>
+              <a-form-item label="挂牌数量">
+                <span class="white">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24"
+                 v-if="isBuy() && !isSale()">
+            <a-col :span="24">
+              <a-form-item label="现货仓单"
+                           name="LadingBillId">
+                <a-select class="inlineFormSelect"
+                          style="width: 260px"
+                          v-model:value="formState.LadingBillId"
+                          placeholder="请选择">
+                  <a-select-option v-for="item in wrHoldList"
+                                   :value="item.id"
+                                   :key="item.id">
+                    {{item.name}}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="摘牌数量"
+                           name="num">
+                <a-input-number class="dialogInput"
+                                style="width: 260px"
+                                :min="0"
+                                v-model:value="formState.num"
+                                :suffix="selectedRow.enumdicname" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item>
+                <a-slider ::min="0"
+                          v-model:value="formState.num"
+                          :max="selectedRow.orderqty"
+                          class="formSlider" />
+                <div class="unit">
+                  <span>1</span>
+                  <span>{{selectedRow.orderqty}}</span>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item label="挂牌金额">
+                <span class="white">--</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn"
+                          @click="submit">{{isBuy() ? '卖' : '买'}}出</a-button>
+                <a-button class="ml10 cancelBtn"
+                          @click="cancel">取消</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
+import { getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { HdWRDealOrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { HdWRDealOrderReq } from '@/services/proto/warehousetrade/interface';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { handleForm, handleIs, handleSpotWarrant } from './setup';
+import { validateAction } from '@/common/setup/form';
+import { ListingForm } from './interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+export default defineComponent({
+    name: ModalEnum.spot_trade_warehouse_delisting,
+    components: { Drawer, PlusOutlined, MinusOutlined },
+    emits: ['cancel'],
+    props: {
+        enumName: {
+            default: '',
+            type: String as PropType<EnumRouterName>,
+        },
+        selectedRow: {
+            type: Object as PropType<WrOrderQuoteDetail>,
+            default: {},
+        },
+        parantSelectedRow: {
+            type: Object as PropType<WrOrderQuote>,
+            default: {},
+        },
+        buyOrSell: {
+            type: Number as PropType<BuyOrSell>,
+            default: BuyOrSell.buy,
+        },
+    },
+
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const accountList = getAccountTypeList([2]);
+        const { rules, formState, formRef } = handleForm(props.selectedRow);
+        if (accountList.length) {
+            formState.accountid = accountList[0].accountid;
+        }
+        const loading = ref<boolean>(false);
+        const { isSale, isBuy, isFloat } = handleIs(props.enumName, props.buyOrSell);
+        const { wrHoldList } = handleSpotWarrant(props.enumName, props.buyOrSell, props.parantSelectedRow, loading);
+
+        function submit() {
+            // validateAction<ListingForm>(formRef, formState).then((res) => {
+            //     // 首先确定  这是仓单贸易的有仓单挂摘牌 HasWr = 1
+            //     // 其次判断  摘牌 1。摘买 （需要通过自己的仓单进行摘买）  2。摘卖 （不需要通过仓单）
+            //     const param: HdWRDealOrderReq = {
+            //         UserID: getUserId(), // uint32 用户ID
+            //         AccountID: getSelectedAccountId(), // uint64 资金账号
+            //         RelatedWRTradeOrderID: props.selectedRow.wrtradeorderid, // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
+            //         WRTransferUserID: props.selectedRow.userid, // uint32 仓单受让用户
+            //         OrderQty: res.num as number, // uint64 委托数量
+            //         OrderSrc: 0, // uint32 委托来源
+            //         ClientSerialNo: uuidv4(), // string 客户端流水号
+            //         ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
+            //         ClientType: 4, // uint32 终端类型
+            //         OperatorID: getUserId(), // uint64 操作员账号ID
+            //         BuyOrSell: 0, // uint32 买卖方向
+            //         ApplyID: 0, // uint64 申请ID
+            //         // LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
+            //         SubNum: 0, // uint64 提单子单号(wrholdlb的SubNum字段),卖的时候填写
+            //         WRFactorTypeId: props.parantSelectedRow.wrfactortypeid, // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
+            //         TradeDate: moment().format('YYYYMMDD'), // string 交易日
+            //         DeliveryMonth: '', // string 交收月
+            //         HasWr: isSale() ? 0 : 1, // uint32 是否有仓单-0:没有仓单 1:有仓单
+            //     };
+            //     // 摘买方向
+            //     if (isBuy()) {
+            //         param.BuyOrSell = 1;
+            //         param.LadingBillId = res.LadingBillId;
+            //     } else {
+            //         param.BuyOrSell = 0;
+            //     }
+            //     requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
+            //         cancel(true);
+            //     });
+            // });
+        }
+
+        return {
+            visible,
+            cancel,
+            accountList,
+            wrHoldList,
+            submit,
+            isSale,
+            isBuy,
+            isFloat,
+            rules,
+            formState,
+            formRef,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.delisting {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        margin: 0 16px;
+        padding: 10px 0;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            min-width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
+    }
+}
+::v-deep.ant-slider.formSlider {
+    width: 260px;
+}
+::v-deep.ant-input-suffix {
+    position: absolute;
+    right: -25px;
+}
+.unit {
+    margin-left: 70px;
+    width: 260px;
+    .flex;
+    justify-content: space-between;
+    font-size: 14px;
+    color: @m-grey1;
+    height: 14px;
+    line-height: 14px;
+}
+.listedBtn:first-child {
+    margin-left: -35px;
+}
+.listedBtn {
+    width: 120px;
+    height: 30px;
+    line-height: 30px;
+    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+    border-radius: 3px;
+    color: @m-white0;
+    font-size: 14px;
+    text-align: center;
+    border: 0;
+    &:hover {
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
+        color: @m-white0-hover;
+    }
+}
+.cancelBtn:extend(.listedBtn) {
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%) !important;
+    &:hover {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%) !important;
+        color: @m-white0-hover;
+    }
+}
+.ml10 {
+    margin-left: 10px;
+}
+.ant-form.dialogForm .ant-row.ant-form-item {
+    margin-bottom: 14px;
+}
+.mt20 {
+    margin-top: 20px;
+}
+.mt-20 {
+    margin-top: -20px;
+}
+.labelTip {
+    font-size: 14px;
+    color: @m-blue16;
+    position: absolute;
+    top: 15px;
+    left: -80px;
+}
+.minusBtn,
+.plusBtn {
+    width: 15px;
+    height: 32px;
+    line-height: 32px;
+    font-size: 15px;
+    color: @m-blue15;
+    cursor: pointer;
+}
+.minusBtn {
+    position: absolute;
+    top: -6px;
+    left: 14px;
+    z-index: 1;
+}
+.plusBtn {
+    position: absolute;
+    top: -6px;
+    right: 14px;
+    z-index: 1;
+}
+.stepper {
+    padding-left: 30px;
+    padding-right: 30px;
+    text-align: center;
+    color: @m-yellow1;
+    font-size: 16px;
+}
+</style>;

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/interface.ts

@@ -0,0 +1,10 @@
+export interface ListingForm {
+    accountid: undefined | number,
+    num: number,
+    LadingBillId: string,
+}
+
+export interface Wrhold {
+    id: string,
+    name: string,
+}

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

@@ -0,0 +1,68 @@
+import { BuyOrSell } from "@/common/constants/enumCommon";
+import { EnumRouterName } from "@/common/constants/enumRouterName";
+import { queryResultLoadingAndInfo } from "@/common/methods/request/resultInfo";
+import { queryHoldLB } from '@/services/go/wrtrade';
+import { WrHoldLB, WrOrderQuote, WrOrderQuoteDetail } from "@/services/go/wrtrade/interface";
+import { reactive, Ref, ref, UnwrapRef } from "vue";
+import { ListingForm, Wrhold } from "./interface";
+
+export function handleForm(data: WrOrderQuoteDetail) {
+    const formRef = ref();
+    const formState: UnwrapRef<ListingForm> = reactive({
+        accountid: undefined,
+        num: 0,
+        LadingBillId: '',
+    })
+    const rules = {
+        accountid: [{ required: true, message: '请选择交易账户' }],
+        LadingBillId: [{ required: true, message: '请选择现货仓单' }],
+        num: [{ required: true, message: '请输入摘牌数量', trigger: 'blur', type: 'number', min: 1, ma: data.orderqty }],
+
+    }
+    return { rules, formState, formRef }
+}
+
+
+export function handleIs(enumName: EnumRouterName, buyOrSell: BuyOrSell) {
+    /**
+     *
+     * @returns true => 仓单预售; false => 仓单贸易
+     */
+    function isSale(): boolean {
+        return enumName === EnumRouterName.warehouse_pre_sale_price ||
+            enumName === EnumRouterName.warehouse_pre_sale_floating_price
+    }
+    /**
+     *
+     * @returns true => 买； false =>卖
+     */
+    function isBuy() {
+        return buyOrSell === BuyOrSell.buy
+    }
+    /**
+     *
+     * @returns  true => 浮动价； false =>一口价
+     */
+    function isFloat() {
+        return enumName === EnumRouterName.warehouse_receipt_trade_floating_price ||
+            enumName === EnumRouterName.warehouse_pre_sale_floating_price
+    }
+    return { isSale, isBuy, isFloat }
+}
+
+// 处理现货仓单
+export function handleSpotWarrant(enumName: EnumRouterName, buyOrSell: BuyOrSell, selectedRow: WrOrderQuote, loading: Ref<boolean>) {
+    const { isSale, isBuy } = handleIs(enumName, buyOrSell)
+    const wrHoldList = ref<Wrhold[]>([])
+    if (isBuy()) {
+        if (!isSale()) {
+            queryResultLoadingAndInfo(queryHoldLB, loading).then(res => {
+                wrHoldList.value = res.filter((e: WrHoldLB) => e.wrfactortypeid === String(selectedRow.wrfactortypeid)).map((e: WrHoldLB) => {
+                    const { wrholdeno, enableqty, ladingbillid } = e
+                    return { id: ladingbillid, name: `${wrholdeno}(${enableqty})` }
+                })
+            })
+        }
+    }
+    return { wrHoldList }
+}