huangbin %!s(int64=4) %!d(string=hai) anos
pai
achega
d90c9f8f62
Modificáronse 26 ficheiros con 196 adicións e 179 borrados
  1. 33 20
      generate-code/pc_menu_企业风管.json
  2. 4 2
      src/common/constants/enumOrderComponents.ts
  3. 80 78
      src/common/constants/enumRouterName.ts
  4. 74 74
      src/common/constants/modalNameEnum.ts
  5. 4 4
      src/layout/components/bottom.vue
  6. 0 0
      src/views/order/funding_information/components/funding_information_funding_log/index.vue
  7. 0 0
      src/views/order/funding_information/components/funding_information_funding_summary/index.vue
  8. 0 0
      src/views/order/funding_information/index.vue
  9. 0 0
      src/views/order/performance_information/components/performance_information_buy_performance/index.vue
  10. 0 0
      src/views/order/performance_information/components/performance_information_sell_performance/index.vue
  11. 0 0
      src/views/order/performance_information/index.vue
  12. 0 0
      src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_deal/index.vue
  13. 0 0
      src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_designated_deal/index.vue
  14. 0 0
      src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue
  15. 0 0
      src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue
  16. 0 0
      src/views/order/pre_sale_warehouse_receipt/index.vue
  17. 0 0
      src/views/order/spot_warran/components/spot_warrant_deal/index.vue
  18. 0 0
      src/views/order/spot_warran/components/spot_warrant_designated_deal/index.vue
  19. 0 0
      src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/index.vue
  20. 0 0
      src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing.vue
  21. 0 0
      src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing/index.vue
  22. 1 1
      src/views/order/spot_warran/components/spot_warrant_inventory_summary/index.vue
  23. 0 0
      src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue
  24. 0 0
      src/views/order/spot_warran/components/spot_warrant_spot_details/index.vue
  25. 0 0
      src/views/order/spot_warran/components/spot_warrant_spot_summary/index.vue
  26. 0 0
      src/views/order/spot_warran/index.vue

+ 33 - 20
generate-code/pc_menu_企业风管.json

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

+ 4 - 2
src/common/constants/enumOrderComponents.ts

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

+ 80 - 78
src/common/constants/enumRouterName.ts

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

+ 74 - 74
src/common/constants/modalNameEnum.ts

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

+ 4 - 4
src/layout/components/bottom.vue

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

+ 0 - 0
src/views/business/order/funding_information/components/funding_information_funding_log/index.vue → src/views/order/funding_information/components/funding_information_funding_log/index.vue


+ 0 - 0
src/views/business/order/funding_information/components/funding_information_funding_summary/index.vue → src/views/order/funding_information/components/funding_information_funding_summary/index.vue


+ 0 - 0
src/views/business/order/funding_information/index.vue → src/views/order/funding_information/index.vue


+ 0 - 0
src/views/business/order/performance_information/components/performance_information_buy_performance/index.vue → src/views/order/performance_information/components/performance_information_buy_performance/index.vue


+ 0 - 0
src/views/business/order/performance_information/components/performance_information_sell_performance/index.vue → src/views/order/performance_information/components/performance_information_sell_performance/index.vue


+ 0 - 0
src/views/business/order/performance_information/index.vue → src/views/order/performance_information/index.vue


+ 0 - 0
src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_deal/index.vue → src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_deal/index.vue


+ 0 - 0
src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_designated_deal/index.vue → src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_designated_deal/index.vue


+ 0 - 0
src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue → src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue


+ 0 - 0
src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue → src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue


+ 0 - 0
src/views/business/order/pre_sale_warehouse_receipt/index.vue → src/views/order/pre_sale_warehouse_receipt/index.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_deal/index.vue → src/views/order/spot_warran/components/spot_warrant_deal/index.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_designated_deal/index.vue → src/views/order/spot_warran/components/spot_warrant_designated_deal/index.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_in_and_out_warehouse/index.vue → src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/index.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_inventory_summary/components/listing.vue → src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_inventory_summary/components/listing/index.vue → src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing/index.vue


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

@@ -38,7 +38,7 @@ export default defineComponent({
     name: enumOrderComponents.spot_warrant_inventory_summary,
     components: {
         BtnList,
-        [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
+        // [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
     },
     setup() {
         // 表格列表数据

+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_pending_order/index.vue → src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_spot_details/index.vue → src/views/order/spot_warran/components/spot_warrant_spot_details/index.vue


+ 0 - 0
src/views/business/order/spot_warran/components/spot_warrant_spot_summary/index.vue → src/views/order/spot_warran/components/spot_warrant_spot_summary/index.vue


+ 0 - 0
src/views/business/order/spot_warran/index.vue → src/views/order/spot_warran/index.vue