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

generate-code/pc_menu_pingan.json

@@ -0,0 +1,124 @@
+[
+	{
+		"code": "hedging",
+		"title": "套期保值",
+		"sort": 1,
+		"type": 1,
+		"rulekey": "",
+		"remark": "",
+		"isshow": true,
+		"children": [
+			{
+				"code": "entry_of_spot_information",
+				"title": "现货信息录入",
+				"sort": 1,
+				"type": 1,
+				"rulekey": "",
+				"remark": "",
+				"isshow": true,
+				"children": []
+			},
+			{
+				"code": "spot_price_management",
+				"title": "现货点价管理",
+				"sort": 2,
+				"type": 1,
+				"rulekey": "",
+				"remark": "",
+				"isshow": true,
+				"children": [
+					{
+						"code": "spot_price_management_normal",
+						"title": "正常",
+						"sort": 1,
+						"type": 1,
+						"rulekey": "",
+						"remark": "",
+						"isshow": true,
+						"children": [
+							{
+                "code": "spot_price_management_normal_add",
+                "title": "新增",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+									{
+										"code": "spot_price_management_normal_modify",
+										"title": "修改",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "spot_price_management_normal_disable",
+										"title": "停用",
+										"sort": 2,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
+							}
+						]
+					},
+					{
+						"code": "spot_price_management_disable",
+						"title": "停用",
+						"sort": 2,
+						"type": 1,
+						"rulekey": "",
+						"remark": "",
+						"isshow": true,
+						"children": [
+							{
+                "code": "spot_price_management_disable_add",
+                "title": "新增",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+									{
+										"code": "spot_price_management_disable_modify",
+										"title": "恢复",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "spot_price_management_disable_disable",
+										"title": "删除",
+										"sort": 2,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
+							}
+						]
+					}
+				]
+			}
+		]
+	}
+]

generate-code/pc_menu_企业风管.json

@@ -1181,6 +1181,56 @@
                 ]
               }
             ]
+          },
+          {
+            "code": "spot_trade_order_transaction",
+            "title": "订单交易",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_spot_order_transaction",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "spot_trade_order_transaction_listing_transfer",
+                "title": "挂牌转让",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "client_pc_web_spot_order_transaction_listing_transfer",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+
+                ]
+              },          {
+                "code": "spot_trade_order_transaction_basis_difference",
+                "title": "基差点价",
+                "sort": 1,
+                "type": 1,
+                "rulekey": "client_pc_web_spot_order_transaction_basis_difference",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+
+                ]
+              }
+            ]
+          },
+          {
+            "code": "spot_trade_reference_market",
+            "title": "参考行情",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_spot_reference_market",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+
+            ]
           }
         ]
       },
@@ -4590,5 +4640,127 @@
         ]
       }
     ]
-  }
+  },
+  {
+		"code": "hedging",
+		"title": "套期保值",
+		"sort": 1,
+		"type": 1,
+		"rulekey": "",
+		"remark": "",
+		"isshow": true,
+		"children": [
+			{
+				"code": "entry_of_spot_information",
+				"title": "现货信息录入",
+				"sort": 1,
+				"type": 1,
+				"rulekey": "",
+				"remark": "",
+				"isshow": true,
+				"children": []
+			},
+			{
+				"code": "spot_price_management",
+				"title": "现货点价管理",
+				"sort": 2,
+				"type": 1,
+				"rulekey": "",
+				"remark": "",
+				"isshow": true,
+				"children": [
+					{
+						"code": "spot_price_management_normal",
+						"title": "正常",
+						"sort": 1,
+						"type": 1,
+						"rulekey": "",
+						"remark": "",
+						"isshow": true,
+						"children": [
+							{
+                "code": "spot_price_management_normal_add",
+                "title": "新增",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+									{
+										"code": "spot_price_management_normal_modify",
+										"title": "修改",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "spot_price_management_normal_disable",
+										"title": "停用",
+										"sort": 2,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
+							}
+						]
+					},
+					{
+						"code": "spot_price_management_disable",
+						"title": "停用",
+						"sort": 2,
+						"type": 1,
+						"rulekey": "",
+						"remark": "",
+						"isshow": true,
+						"children": [
+							{
+                "code": "spot_price_management_disable_add",
+                "title": "新增",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+									{
+										"code": "spot_price_management_disable_modify",
+										"title": "恢复",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "spot_price_management_disable_disable",
+										"title": "删除",
+										"sort": 2,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
+							}
+						]
+					}
+				]
+			}
+		]
+	}
 ]

src/common/constants/enumOrderComponents.ts

@@ -20,28 +20,28 @@ export enum enumOrderComponents {
 						
 						spot_warrant_spot_details = 'spot_warrant_spot_details', // 现货明细
 						
-						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
+						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
 						
 						spot_warrant_deal = 'spot_warrant_deal', // 成交
 						
+						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
+						
+						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
+						
 						pre_sale_warehouse_receipt_order_summary = 'pre_sale_warehouse_receipt_order_summary', // 订单汇总
 						
 						pre_sale_warehouse_receipt_pending_order = 'pre_sale_warehouse_receipt_pending_order', // 挂单
 						
-						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
+						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
 						
 						pre_sale_warehouse_receipt_deal = 'pre_sale_warehouse_receipt_deal', // 成交
 						
-						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
-						
-						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
-						
 						commodity_contract_commission = 'commodity_contract_commission', // 委托
 						
-						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
-						
 						commodity_contract_make_deal = 'commodity_contract_make_deal', // 成交
 						
+						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
+						
 						commodity_contract_settlement = 'commodity_contract_settlement', // 交收
 						
 						financing_manager_apply_order = 'financing_manager_apply_order', // 申请单
@@ -52,10 +52,10 @@ export enum enumOrderComponents {
 						
 						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
 						
-						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
-						
 						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
 						
+						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
+						
 						pre_sale_warehouse_receipt_designated_deal_resell = 'pre_sale_warehouse_receipt_designated_deal_resell', // 撤销出售
 						
 		}

src/common/constants/enumRouterName.ts

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

@@ -6,78 +6,74 @@ 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_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
 						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_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
+						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
 						
-						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
+						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
+						
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
 						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
-						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
+						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
+						
+						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
 						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
 						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
 						
-						pre_sale_warehouse_receipt_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', // 交收
+						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
 						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
 						
-						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
-						
-						financing_manager_contract_pay_arrears = 'financing_manager_contract_pay_arrears', // 支付欠款
-						
 						financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
 						
-						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
 						
-						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
+						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
 						
 						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
-						
 						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
 						performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
 						
 						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
 						
-						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
-						
 						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
-						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
+						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
-						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
+						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
 						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
 						
 						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', // 挂牌求购
 						
-						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
-						
 						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
 						
 						spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
 						
+						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
+						
 						open = 'open', // 开仓
 						
 						close = 'close', // 平仓
@@ -94,16 +90,16 @@ export enum ModalEnum {
 						
 						custom_info_btn_disable = 'custom_info_btn_disable', // 停用
 						
-						goods_info_spot_normal_add = 'goods_info_spot_normal_add', // 新增
-						
 						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
 						
-						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
+						goods_info_spot_normal_add = 'goods_info_spot_normal_add', // 新增
 						
-						goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
+						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
 						
 						goods_info_hedge_normal_modify = 'goods_info_hedge_normal_modify', // 修改
 						
+						goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
+						
 						spot_contract_btn_add = 'spot_contract_btn_add', // 新增
 						
 						none_btn = 'none_btn', // 按钮
@@ -156,6 +152,10 @@ export enum ModalEnum {
 						
 						platinum_custom_info_add = 'platinum_custom_info_add', // 新增
 						
+						financing_manager_contract_pay_arrears = 'financing_manager_contract_pay_arrears', // 支付欠款
+						
+						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
+						
 						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
 						
 						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
@@ -196,6 +196,10 @@ export enum ModalEnum {
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
+						spot_price_management_normal_add = 'spot_price_management_normal_add', // 新增
+						
+						spot_price_management_disable_add = 'spot_price_management_disable_add', // 新增
+						
 						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
 						
 						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
@@ -204,40 +208,44 @@ export enum ModalEnum {
 						
 						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
 						
-						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
-						
-						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
-						
 						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 						
+						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
+						
 						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
 						
 						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
-						
 						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
 						
 						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
 						
 						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
+						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+						
+						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
+						
+						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+						
 						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 						
+						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
+						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
-						
 						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
 						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
+						sell_pending_funds = 'sell_pending_funds', // 款项登记
+						
 						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
 						
 						sell_pending_storage = 'sell_pending_storage', // 出库登记
@@ -250,20 +258,16 @@ export enum ModalEnum {
 						
 						plan_audit_cancel = 'plan_audit_cancel', // 撤销
 						
-						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
-						
-						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
-						
 						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
 						
+						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
+						
 						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
 						
 						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
 						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
-						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
-						
 						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
 						
 						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
@@ -272,40 +276,46 @@ export enum ModalEnum {
 						
 						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
 						
-						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
-						
 						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
-						sell_pending_funds = 'sell_pending_funds', // 款项登记
-						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
 						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
 						
 						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
 						
+						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+						
 						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
 						
 						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
 						
 						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
-						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
+						spot_price_management_normal_modify = 'spot_price_management_normal_modify', // 修改
 						
-						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+						spot_price_management_normal_disable = 'spot_price_management_normal_disable', // 停用
+						
+						spot_price_management_disable_modify = 'spot_price_management_disable_modify', // 恢复
+						
+						spot_price_management_disable_disable = 'spot_price_management_disable_disable', // 删除
+						
+						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
+						
+						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
 						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_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
-						
 						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
-						
 						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
+						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
+						
+						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
+						
 						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
 						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
@@ -316,4 +326,6 @@ export enum ModalEnum {
 						
 						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
 						
+						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+						
 		}

src/router/index.ts

@@ -994,6 +994,40 @@ const routes: Array<RouteRecordRaw> = [
                             },
                         ]
                     },
+                    {
+                        path: '/spot_trade/spot_trade_order_transaction',
+                        name: EnumRouterName.spot_trade_order_transaction,
+                        component: () => import('@/views/market/spot_trade/spot_trade_order_transaction/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                        children: [
+                            {
+                                path: '/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_basis_difference',
+                                name: EnumRouterName.spot_trade_order_transaction_basis_difference,
+                                component: () => import('@/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_basis_difference/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer',
+                                name: EnumRouterName.spot_trade_order_transaction_listing_transfer,
+                                component: () => import('@/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                        ]
+                    },
+                    {
+                        path: '/spot_trade/spot_trade_reference_market',
+                        name: EnumRouterName.spot_trade_reference_market,
+                        component: () => import('@/views/market/spot_trade/spot_trade_reference_market/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
                 ]
             },
             {
@@ -1221,6 +1255,40 @@ const routes: Array<RouteRecordRaw> = [
                     }
                 ]
             },
+            {
+                path: '/entry_of_spot_information',
+                name: EnumRouterName.entry_of_spot_information,
+                component: () => import('@/views/hedging/entry_of_spot_information/index.vue'),
+                meta: {
+                    requireAuth: true,
+                },
+            },
+            {
+                path: '/spot_price_management',
+                name: EnumRouterName.spot_price_management,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/spot_price_management/spot_price_management_disable',
+                        name: EnumRouterName.spot_price_management_disable,
+                        component: () => import('@/views/hedging/spot_price_management/spot_price_management_disable/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                    {
+                        path: '/spot_price_management/spot_price_management_normal',
+                        name: EnumRouterName.spot_price_management_normal,
+                        component: () => import('@/views/hedging/spot_price_management/spot_price_management_normal/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                ]
+            },
         ],
     },
     {

src/views/hedging/entry_of_spot_information/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 现货信息录入-->
+  <div>现货信息录入</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { initData } from '@/common/methods';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.spot_price_management_normal,
+    components: {},
+    setup() {
+        initData(() => {});
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+</style
+>;

src/views/hedging/spot_price_management/spot_price_management_disable/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 现货点价管理: 正常-->
+  <div>现货点价管理: 正常</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { initData } from '@/common/methods';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.spot_price_management_disable,
+    components: {},
+    setup() {
+        initData(() => {});
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+</style
+>;

src/views/hedging/spot_price_management/spot_price_management_normal/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 现货点价管理: 停用-->
+  <div>现货点价管理: 停用</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { initData } from '@/common/methods';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.spot_price_management_normal,
+    components: {},
+    setup() {
+        initData(() => {});
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+</style
+>;

src/views/market/spot_trade/spot_trade_order_transaction/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <!-- 订单交易 -->
+  <div class="topTableHeight40">
+    <router-view></router-view>
+    <ThridMenu :list="tabList"
+               :selectedKey="index"
+               @selectMenu="changeTab" />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import ThridMenu from '@/common/components/thirdMenu/index.vue';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { handleMartketThirdRouter } from '@/common/setup/matket/router';
+
+export default defineComponent({
+    name: EnumRouterName.spot_trade_order_transaction,
+    components: {
+        ThridMenu,
+    },
+    setup() {
+        return { ...handleMartketThirdRouter(EnumRouterName.spot_trade_order_transaction) };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_basis_difference/index.vue

@@ -0,0 +1,113 @@
+<template>
+  <!-- 仓单贸易 一口价挂牌-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"></a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu"
+                 @cancel="closeContext"
+                 :list="firstBtn"></contextMenu>
+    <component :is="componentId"
+               v-if="componentId"
+               :enumName="name"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
+import Bus from '@/utils/eventBus/index';
+import Filter from '../../components/filter/index.vue';
+
+export default defineComponent({
+    name: EnumRouterName.spot_trade_order_transaction_basis_difference,
+    components: {
+        contextMenu,
+        // [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        // [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        // buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
+        // postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 1,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        Bus.$on('spotTrade', queryTableAction);
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_receipt_trade_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+        const {
+            contextMenu,
+            openContext,
+            closeContext, // 右键
+            columns,
+            registerColumn,
+            updateColumn, // 表头
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格折腾面板数据与单击、双击事件
+            componentId,
+            closeComponent, // 控制异步组件
+            firstBtn, // 表格按钮
+        } = handleComposeTable<WrOrderQuote>(param);
+        function search(value: Object) {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 1,
+            };
+            Object.assign(param, value);
+            queryTable(queryOrderQuote, param);
+        }
+        function buyOpen(value: any, goods: any) {
+            componentId.value = 'postBuying';
+            selectedRow.value = value;
+        }
+
+        return {
+            contextMenu,
+            openContext,
+            closeContext, // 右键
+            columns,
+            registerColumn,
+            updateColumn, // 表头
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格折腾面板数据与单击、双击事件
+            componentId,
+            closeComponent, // 控制异步组件
+            firstBtn, // 表格按钮
+            name: EnumRouterName.warehouse_receipt_trade_price,
+            loading,
+            tableList,
+            search,
+            buyOpen,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer/index.vue

@@ -0,0 +1,113 @@
+<template>
+  <!-- 仓单贸易 一口价挂牌-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"></a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu"
+                 @cancel="closeContext"
+                 :list="firstBtn"></contextMenu>
+    <component :is="componentId"
+               v-if="componentId"
+               :enumName="name"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
+import Bus from '@/utils/eventBus/index';
+import Filter from '../../components/filter/index.vue';
+
+export default defineComponent({
+    name: EnumRouterName.spot_trade_order_transaction_listing_transfer,
+    components: {
+        contextMenu,
+        // [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        // [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        // buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
+        // postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 1,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        Bus.$on('spotTrade', queryTableAction);
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_receipt_trade_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+        const {
+            contextMenu,
+            openContext,
+            closeContext, // 右键
+            columns,
+            registerColumn,
+            updateColumn, // 表头
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格折腾面板数据与单击、双击事件
+            componentId,
+            closeComponent, // 控制异步组件
+            firstBtn, // 表格按钮
+        } = handleComposeTable<WrOrderQuote>(param);
+        function search(value: Object) {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 1,
+            };
+            Object.assign(param, value);
+            queryTable(queryOrderQuote, param);
+        }
+        function buyOpen(value: any, goods: any) {
+            componentId.value = 'postBuying';
+            selectedRow.value = value;
+        }
+
+        return {
+            contextMenu,
+            openContext,
+            closeContext, // 右键
+            columns,
+            registerColumn,
+            updateColumn, // 表头
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格折腾面板数据与单击、双击事件
+            componentId,
+            closeComponent, // 控制异步组件
+            firstBtn, // 表格按钮
+            name: EnumRouterName.warehouse_receipt_trade_price,
+            loading,
+            tableList,
+            search,
+            buyOpen,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/market/spot_trade/spot_trade_reference_market/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <!-- 参考行情 -->
+  <div class="topTableHeight40">
+    <router-view></router-view>
+    <ThridMenu :list="tabList"
+               :selectedKey="index"
+               @selectMenu="changeTab" />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import ThridMenu from '@/common/components/thirdMenu/index.vue';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { handleMartketThirdRouter } from '@/common/setup/matket/router';
+
+export default defineComponent({
+    name: EnumRouterName.spot_trade_reference_market,
+    components: {
+        ThridMenu,
+    },
+    setup() {
+        return { ...handleMartketThirdRouter(EnumRouterName.spot_trade_reference_market) };
+    },
+});
+</script>
+<style lang="less">
+</style>

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

@@ -1,61 +1,50 @@
 <template>
-    <!-- 履约明细-->
-    <Drawer
-        :title="'履约明细'"
-        :placement="'right'"
-        class="bottomWidth"
-        :visible="visible"
-        @cancel="cancel"
-    >
-        <div class="listed">
-            <div class="condition">
-                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-            </div>
-            <a-table
-                class="dialogTable"
-                :columns="columns"
-                :data-source="performancePlanStepList"
-                :pagination="false"
-            >
-                <template #isauto="{ text }">
-                    <span>{{text ? '是' : '否'}}</span>
-                </template>
-                <template #handlestatus="{ text }">
-                    <span>{{getStatus(text)}}</span>
-                </template>
-            </a-table>
-        </div>
-    </Drawer>
+  <!-- 履约明细-->
+  <Drawer :title="'履约明细'"
+          :placement="'right'"
+          class="bottomWidth"
+          :visible="visible"
+          @cancel="cancel">
+    <div class="listed">
+      <div class="condition">
+        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+      </div>
+      <a-table class="dialogTable"
+               :columns="columns"
+               :data-source="performancePlanStepList"
+               :pagination="false">
+        <template #isauto="{ text }">
+          <span>{{text ? '是' : '否'}}</span>
+        </template>
+        <template #stepvalue="{ text }">
+          <span>{{(text* 100).toFixed(0)}}</span>
+        </template>
+        <template #handlestatus="{ text }">
+          <span>{{getPerformanceStatusName(text)}}</span>
+        </template>
+      </a-table>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { defineComponent, PropType } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { QueryWrPositionReq, WrHoldLB, WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
-import { getInTaAccount, getUserId } from '@/services/bus/account';
-import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { hdWROrder } from '@/services/proto/warehousetrade';
-import { v4 as uuidv4 } from 'uuid';
-import moment from 'moment';
+import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { validateAction } from '@/common/setup/form';
-import { getMarketRunByTradeMode } from '@/services/bus/market';
-import { message } from 'ant-design-vue';
-import { getGoodsGroupsByTradeMode } from '@/services/bus/goods';
-import { BuyOrSell, TradeMode } from '@/common/constants/enumCommon';
-import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
-import { CaretRightOutlined } from '@ant-design/icons-vue';
+
+import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
+import { getPerformanceStatusName } from '@/common/constants/enumsName';
 
 const columns = [
     { title: '履约步骤', dataIndex: 'steptypename', key: 'steptypename', align: 'center' },
     // { title: '天数', dataIndex: 'applytime', key: 'applytime', align: 'center' },
     { title: '剩余天数', dataIndex: 'remaindays', key: 'remaindays', align: 'center' },
-    { title: '步骤值（%）', dataIndex: 'stepvalue', key: 'stepvalue', align: 'center' },
+    { title: '步骤值（%）', dataIndex: 'stepvalue', key: 'stepvalue', align: 'center', slots: { customRender: 'stepvalue' } },
     { title: '距离上一步', dataIndex: 'stepdays', key: 'stepdays', align: 'center' },
     { title: '自动', dataIndex: 'isauto', key: 'isauto', align: 'center', slots: { customRender: 'isauto' } },
     { title: '当前状态', dataIndex: 'handlestatus', key: 'handlestatus', align: 'center', slots: { customRender: 'handlestatus' } },
@@ -63,7 +52,7 @@ const columns = [
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_detail,
-    components: { Drawer, CaretRightOutlined },
+    components: { Drawer },
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
@@ -77,79 +66,13 @@ export default defineComponent({
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
-        const { performancePlanStepList } = handlePerformancePlanStep(props.selectedRow);
-        function getStatus(type: number) {
-            //处理状态 - 1:开始 2:结束 3:冻结请求 4:冻结返回成功 5:冻结返回失败 6:扣款请求 7:扣款返回成功 8:扣款返回失败 9:仓单转移请求 1number;
-            //:仓单转移返回成功 11:仓单转移返回失败 12:加钱请求 13:加钱返回成功 14:加钱返回失败 15:解冻仓单头寸请求 16:解冻仓单头寸返回成功 17:解冻仓单头寸返回失败 18:解冻库位请求 19:解冻库位返回成功 2number;
-            //:解冻库位返回失败
-            let result = '--';
-            switch (type) {
-                case 1:
-                    result = '开始';
-                    break;
-                case 2:
-                    result = '结束';
-                    break;
-                case 3:
-                    result = '冻结请求';
-                    break;
-                case 4:
-                    result = '冻结返回成功';
-                    break;
-                case 5:
-                    result = '冻结返回失败';
-                    break;
-                case 6:
-                    result = '扣款请求';
-                    break;
-                case 7:
-                    result = '扣款返回成功';
-                    break;
-                case 8:
-                    result = '扣款返回失败';
-                    break;
-                case 9:
-                    result = '仓单转移请求';
-                    break;
-                case 10:
-                    result = '仓单转移返回成功';
-                    break;
-                case 11:
-                    result = '仓单转移返回失败';
-                    break;
-                case 12:
-                    result = '加钱请求';
-                    break;
-                case 13:
-                    result = '加钱返回成功';
-                    break;
-                case 14:
-                    result = '加钱返回失败';
-                    break;
-                case 15:
-                    result = '解冻仓单头寸请求';
-                    break;
-                case 16:
-                    result = '解冻仓单头寸返回成功';
-                    break;
-                case 17:
-                    result = '解冻仓单头寸返回失败';
-                    break;
-                case 18:
-                    result = '解冻库位请求';
-                    break;
-                case 19:
-                    result = '解冻库位返回成功';
-                    break;
-            }
-            return result;
-        }
+        const { performancePlanStepList } = handlePerformancePlanStep(props.selectedRow, true);
         return {
             visible,
             cancel,
             performancePlanStepList,
             columns,
-            getStatus,
+            getPerformanceStatusName,
         };
     },
 });

src/views/order/performance_information/components/components/setup.ts

@@ -3,12 +3,13 @@ import { QueryWrPerformancePlanStepReq, WrPerformancePlan, WrPerformancePlanStep
 import { ref } from "vue";
 
 // 获取当前履约步骤
-export function handlePerformancePlanStep(selectedRow: WrPerformancePlan) {
+export function handlePerformancePlanStep(selectedRow: WrPerformancePlan, isAll = false) {
     const performancePlanStep = ref<WrPerformancePlanStep>()
     const performancePlanStepList = ref<WrPerformancePlanStep[]>([])
 
     const stepamount = ref<string>('--')
-    const param: QueryWrPerformancePlanStepReq = { planid: selectedRow.performanceplanid, curstepid: selectedRow.curstepid }
+
+    const param: QueryWrPerformancePlanStepReq = isAll ? { planid: selectedRow.performanceplanid } : { planid: selectedRow.performanceplanid, curstepid: selectedRow.curstepid }
     queryWrPerformancePlanStep(param).then(res => {
         console.log('获取当前履约步骤', res)
         if (res.length) {