huangbin 4 년 전
부모
커밋
67532823f9

+ 303 - 64
generate-code/pc_menu_企业风管.json

@@ -36,7 +36,7 @@
             "sort": 1,
             "type": 4,
             "rulekey": "client_pc_web_spot_production_bottom_spot_summary",
-            "isshow": true,
+            "isshow": false,
             "url": "",
             "remark": "",
             "children": [
@@ -60,11 +60,10 @@
             "sort": 1,
             "type": 4,
             "rulekey": "client_pc_web_spot_production_bottom_inventory_summary",
-            "isshow": true,
+            "isshow": false,
             "url": "",
             "remark": "",
             "children": [
-
             ]
           },
           {
@@ -201,11 +200,11 @@
           },
           {
             "code": "spot_warrant_in_and_out_warehouse",
-            "title": "出入库",
+            "title": "提货",
             "sort": 1,
             "type": 4,
             "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse",
-            "isshow": false,
+            "isshow": true,
             "url": "",
             "remark": "",
             "children": [
@@ -325,7 +324,7 @@
             "sort": 1,
             "type": 4,
             "rulekey": "client_pc_web_warehouse_receipt_bottom_designated_deal",
-            "isshow": true,
+            "isshow": false,
             "url": "",
             "remark": "",
             "children": [
@@ -370,6 +369,174 @@
         ]
       },
       {
+        "code": "commodity_contract",
+        "title": "商品合约",
+        "sort": 1,
+        "type": 4,
+        "rulekey": "client_pc_web_spot_production_bottom_commodity_contract",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "commodity_contract_summary",
+            "title": "合约汇总",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_commodity_contract_bottom_order_summary",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "commodity_contract_summary_transfer",
+                "title": "转让",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_commodity_contract_bottom_contract_summary_transfer",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "commodity_contract_summary_settlement",
+                "title": "交收",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_commodity_contract_bottom_contract_summary_settlement",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "commodity_contract_commission",
+            "title": "委托",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_commodity_contract_bottom_commission",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "commodity_contract_commission_cancel_order",
+                "title": "撤单",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_commodity_contract_bottom_contract_summary_cancel_order",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "commodity_contract_make_deal",
+            "title": "成交",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_commodity_contract_bottom_make_deal",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+            ]
+          },
+          {
+            "code": "commodity_contract_settlement",
+            "title": "交收",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_commodity_contract_bottom_settlement",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+            ]
+          }
+        ]
+      },
+      {
+        "code": "financing_manager",
+        "title": "融资管理",
+        "sort": 1,
+        "type": 4,
+        "rulekey": "client_pc_web_spot_production_bottom_financing_management",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "financing_manager_apply_order",
+            "title": "申请单",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_financing_management_bottom_apply_order",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "financing_manager_apply_order_transfer",
+                "title": "转让",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_financing_management_bottom_apply_transfer",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "financing_manager_contract",
+            "title": "合同",
+            "sort": 1,
+            "type": 4,
+            "rulekey": "client_pc_web_financing_management_bottom_contract",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "financing_manager_contract_settlement",
+                "title": "交收",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_financing_management_bottom_contract_settlement",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "financing_manager_contract_cancel",
+                "title": "撤单",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_contract_cancel_order",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
         "code": "performance_information",
         "title": "履约信息",
         "sort": 1,
@@ -395,7 +562,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_pay",
-                "isshow": false,
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -407,7 +574,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_extension",
-                "isshow": false,
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -419,7 +586,19 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_breach_contract",
-                "isshow": false,
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_buy_performance_settlement",
+                "title": "交收",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_settlement",
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -431,7 +610,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_buy_performance_detail",
-                "isshow": false,
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -455,7 +634,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_pay",
-                "isshow": false,
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -467,7 +646,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_extension",
-                "isshow": false,
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -479,7 +658,19 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_breach_contract",
-                "isshow": false,
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "performance_information_sell_performance_settlement",
+                "title": "交收",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_settlement",
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -491,7 +682,7 @@
                 "sort": 1,
                 "type": 2,
                 "rulekey": "client_pc_web_performance_bottom_order_summary_sell_performance_detail",
-                "isshow": false,
+                "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -648,18 +839,6 @@
                         "remark": "",
                         "children": [
                         ]
-                      },
-                      {
-                        "code": "spot_trade_warehouse_financing_delisting",
-                        "title": "融资摘牌",
-                        "sort": 1,
-                        "type": 2,
-                        "rulekey": "client_pc_web_spot_warehouse_price_buy_hall_financing_delisting",
-                        "isshow": true,
-                        "url": "",
-                        "remark": "",
-                        "children": [
-                        ]
                       }
                     ]
                   },
@@ -684,6 +863,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_price_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   }
@@ -744,18 +935,6 @@
                         "remark": "",
                         "children": [
                         ]
-                      },
-                      {
-                        "code": "spot_trade_warehouse_financing_delisting",
-                        "title": "融资摘牌",
-                        "sort": 1,
-                        "type": 2,
-                        "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall_financing_delisting",
-                        "isshow": true,
-                        "url": "",
-                        "remark": "",
-                        "children": [
-                        ]
                       }
                     ]
                   },
@@ -780,6 +959,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_floating_price_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   }
@@ -813,7 +1004,7 @@
                     "sort": 1,
                     "type": 2,
                     "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_post_buying",
-                    "isshow": false,
+                    "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
@@ -852,18 +1043,6 @@
                         "remark": "",
                         "children": [
                         ]
-                      },
-                      {
-                        "code": "spot_trade_warehouse_delisting",
-                        "title": "融资摘牌",
-                        "sort": 1,
-                        "type": 2,
-                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall_financing_delisting",
-                        "isshow": true,
-                        "url": "",
-                        "remark": "",
-                        "children": [
-                        ]
                       }
                     ]
                   },
@@ -888,6 +1067,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_buy_it_out_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   }
@@ -909,7 +1100,7 @@
                     "sort": 1,
                     "type": 2,
                     "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_post_buying",
-                    "isshow": false,
+                    "isshow": true,
                     "url": "",
                     "remark": "",
                     "children": [
@@ -948,18 +1139,6 @@
                         "remark": "",
                         "children": [
                         ]
-                      },
-                      {
-                        "code": "spot_trade_warehouse_financing_delisting",
-                        "title": "融资摘牌",
-                        "sort": 1,
-                        "type": 2,
-                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall_financing_delisting",
-                        "isshow": true,
-                        "url": "",
-                        "remark": "",
-                        "children": [
-                        ]
                       }
                     ]
                   },
@@ -984,6 +1163,18 @@
                         "remark": "",
                         "children": [
                         ]
+                      },
+                      {
+                        "code": "spot_trade_warehouse_financing_delisting",
+                        "title": "融资摘牌",
+                        "sort": 1,
+                        "type": 2,
+                        "rulekey": "client_pc_web_spot_warehouse_capacity_floating_price_buy_hall_financing_delisting",
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "children": [
+                        ]
                       }
                     ]
                   }
@@ -2723,6 +2914,54 @@
             ]
           }
         ]
+      },
+      {
+        "code": "inventory_manager",
+        "title": "库存管理",
+        "sort": 3,
+        "type": 1,
+        "rulekey": "client_stock_manage",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "inventory_manager_tab",
+            "title": "库存管理",
+            "sort": 3,
+            "type": 1,
+            "rulekey": "client_stock_manage",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "inventory_manager_inbound_details",
+                "title": "入库明细",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_stock_manage_in_detail",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "inventory_manager_outbound_details",
+                "title": "出库明细",
+                "sort": 2,
+                "type": 3,
+                "rulekey": "client_stock_manage_out_detail",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          }
+        ]
       }
     ]
   },

+ 23 - 7
src/common/constants/enumOrderComponents.ts

@@ -6,6 +6,10 @@ export enum enumOrderComponents {
 						
 						pre_sale_warehouse_receipt = 'pre_sale_warehouse_receipt', // 预售仓单
 						
+						commodity_contract = 'commodity_contract', // 商品合约
+						
+						financing_manager = 'financing_manager', // 融资管理
+						
 						performance_information = 'performance_information', // 履约信息
 						
 						funding_information = 'funding_information', // 资金信息
@@ -14,32 +18,44 @@ export enum enumOrderComponents {
 						
 						spot_warrant_inventory_summary = 'spot_warrant_inventory_summary', // 库存汇总
 						
+						spot_warrant_deal = 'spot_warrant_deal', // 成交
+						
+						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
+						
 						spot_warrant_spot_details = 'spot_warrant_spot_details', // 现货明细
 						
 						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
 						
-						spot_warrant_deal = 'spot_warrant_deal', // 成交
+						pre_sale_warehouse_receipt_order_summary = 'pre_sale_warehouse_receipt_order_summary', // 订单汇总
 						
-						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
+						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
 						
-						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 出入库
+						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
 						
-						pre_sale_warehouse_receipt_order_summary = 'pre_sale_warehouse_receipt_order_summary', // 订单汇总
+						commodity_contract_make_deal = 'commodity_contract_make_deal', // 成交
+						
+						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 提货
 						
 						pre_sale_warehouse_receipt_pending_order = 'pre_sale_warehouse_receipt_pending_order', // 挂单
 						
 						pre_sale_warehouse_receipt_deal = 'pre_sale_warehouse_receipt_deal', // 成交
 						
-						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
+						commodity_contract_settlement = 'commodity_contract_settlement', // 交收
+						
+						financing_manager_apply_order = 'financing_manager_apply_order', // 申请单
 						
 						performance_information_buy_performance = 'performance_information_buy_performance', // 买履约
 						
-						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
+						financing_manager_contract = 'financing_manager_contract', // 合同
 						
-						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
+						commodity_contract_commission = 'commodity_contract_commission', // 委托
 						
 						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
 						
+						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
+						
+						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
+						
 						pre_sale_warehouse_receipt_designated_deal_resell = 'pre_sale_warehouse_receipt_designated_deal_resell', // 撤销出售
 						
 		}

+ 107 - 105
src/common/constants/enumRouterName.ts

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

+ 81 - 65
src/common/constants/modalNameEnum.ts

@@ -4,48 +4,70 @@ export enum ModalEnum {
     commomOrder = 'commom-order', // 下单通用界面
 
     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_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
-						
 						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
 						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
-						spot_warrant_designated_deal_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_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
+						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
+						
 						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
 						
 						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
-						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
-						
-						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
+						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
 						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
 						
+						commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
+						
+						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
+						
+						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
+						
+						financing_manager_apply_order_transfer = 'financing_manager_apply_order_transfer', // 转让
+						
+						financing_manager_contract_settlement = 'financing_manager_contract_settlement', // 交收
+						
+						financing_manager_contract_cancel = 'financing_manager_contract_cancel', // 撤单
+						
 						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
+						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_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
+						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_settlement = 'performance_information_sell_performance_settlement', // 交收
+						
 						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', // 挂牌求购
@@ -92,18 +114,14 @@ export enum ModalEnum {
 						
 						warehouse_info_btn_disable = 'warehouse_info_btn_disable', // 停用
 						
-						warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
-						
-						account_info_business_btn_add = 'account_info_business_btn_add', // 新增
-						
 						account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
 						
 						account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
 						
-						account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
-						
 						account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
 						
+						warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
+						
 						plan_btn_add = 'plan_btn_add', // 新增
 						
 						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
@@ -154,9 +172,9 @@ export enum ModalEnum {
 						
 						platinum_financing_information_detail = 'platinum_financing_information_detail', // 融资明细
 						
-						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
+						account_info_business_btn_add = 'account_info_business_btn_add', // 新增
 						
-						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
+						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
 						
 						platinum_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
 						
@@ -164,81 +182,73 @@ export enum ModalEnum {
 						
 						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
 						
+						account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
+						
 						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
 						
 						platinum_agreement_add = 'platinum_agreement_add', // 新增
 						
 						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
 						
-						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
+						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
-						
-						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
-						
-						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
-						
-						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
+						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
 						
 						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
 						
 						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
 						
-						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
+						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
 						
 						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
 						
-						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
-						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 						
 						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
 						
-						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
-						
-						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
-						
 						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
+						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
+						
 						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
 						
-						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 						
 						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
-						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
-						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
-						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
-						
 						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
-						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
+						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+						
 						sell_pending_funds = 'sell_pending_funds', // 款项登记
 						
-						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
+						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
 						
-						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
+						sell_pending_storage = 'sell_pending_storage', // 出库登记
+						
+						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
 						
 						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
 						
+						plan_audit_audit = 'plan_audit_audit', // 审核
+						
 						plan_audit_cancel = 'plan_audit_cancel', // 撤销
 						
-						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库明细
+						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 库明细
 						
-						plan_audit_audit = 'plan_audit_audit', // 审核
+						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
 						
-						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
+						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
 						
 						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
 						
@@ -246,41 +256,41 @@ export enum ModalEnum {
 						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
-						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
+						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
 						
-						sell_pending_storage = 'sell_pending_storage', // 出库登记
+						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
 						
-						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
+						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
 						
-						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
 						
-						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
 						
-						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
+						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
 						
-						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
+						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
-						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
+						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
 						
-						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
+						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
 						
-						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
+						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
 						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
-						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
+						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
 						
-						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
+						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
 						
 						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
 						
-						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
+						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
-						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
 						
-						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
+						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
-						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', // 注销
 						
@@ -288,12 +298,18 @@ export enum ModalEnum {
 						
 						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
-						
 						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
+						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+						
 						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
 						
+						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
+						
+						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+						
+						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
+						
 						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
 						
 						account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改

+ 1 - 1
src/views/order/performance_information/components/performance_information_buy_performance/components/breach_contract/setup.ts

@@ -8,7 +8,7 @@ export function handleForm() {
         remark: ''
     })
     const rules = {
-        url: [{ required: true, message: '请上传附件', trigger: 'blur', }],
+        url: [{ message: '请上传附件', trigger: 'change', }],
     }
     return { rules, formState, formRef }
 }

+ 9 - 3
src/views/order/performance_information/components/performance_information_buy_performance/components/detail/index.vue

@@ -1,10 +1,16 @@
 <template>
-  <!-- 详情-->
-  <Drawer :title="'详情'"
+  <!-- 履约明细-->
+  <Drawer :title="'履约明细'"
           :placement="'bottom'"
           :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>
+    </div>
   </Drawer>
 </template>
 

+ 46 - 0
src/views/order/performance_information/components/performance_information_buy_performance/components/settlement/index.vue

@@ -0,0 +1,46 @@
+<template>
+  <!-- 交收-->
+  <Drawer :title="'交收'"
+          :placement="'bottom'"
+          :visible="visible"
+          @cancel="cancel">
+    <div class="listed">
+
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrPosition } from '@/services/go/wrtrade/interface';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+
+export default defineComponent({
+    name: ModalEnum.performance_information_buy_performance_settlement,
+    components: { Drawer },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPosition>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+        console.log('selectedRow', props.selectedRow);
+        function submit() {}
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

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

@@ -65,6 +65,7 @@ export default defineComponent({
         [ModalEnum.performance_information_buy_performance_extension]: defineAsyncComponent(() => import('./components/extension/index.vue')),
         [ModalEnum.performance_information_buy_performance_breach_contract]: defineAsyncComponent(() => import('./components/breach_contract/index.vue')),
         [ModalEnum.performance_information_buy_performance_detail]: defineAsyncComponent(() => import('./components/detail/index.vue')),
+        [ModalEnum.performance_information_buy_performance_settlement]: defineAsyncComponent(() => import('./components/settlement/index.vue')),
     },
     setup() {
         // 表格列表数据