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

generate-code/pc_menu_企业风管.json

@@ -209,11 +209,11 @@
             "remark": "",
             "children": [
               {
-                "code": "spot_warrant_in_and_out_warehouse_logistics_information",
-                "title": "物流信息",
+                "code": "spot_warrant_in_and_out_warehouse_sure_pick_up",
+                "title": "确认提货",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse_logistics_information",
+                "rulekey": "client_pc_web_spot_production_bottom_spot_in_out_warehouse_confirm_delivery",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -3064,6 +3064,322 @@
             "children": []
           }
         ]
+      },
+      {
+        "code": "search_document_records",
+        "title": "单据记录",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_inquire_document_record",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "search_spot_warrant",
+            "title": "现货仓单",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_document_record_spot_warrant",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "search_spot_warrant_warehouse_receipt_details",
+                "title": "仓单明细",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_spot_warrant_warehouse_receipt_details",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_spot_warrant_listing_record",
+                "title": "挂牌记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_spot_warrant_listing_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_spot_warrant_transaction_record",
+                "title": "成交记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_spot_warrant_transaction_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_spot_warrant_protocol_specified_record",
+                "title": "协议指定记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_spot_warrant_protocol_specified_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "search_pre_sale_warehouse_receipt",
+            "title": "预售仓单",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "search_pre_sale_warehouse_receipt_order_summary",
+                "title": "订单汇总",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_order_summary",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_pre_sale_warehouse_receipt_commission_record",
+                "title": "委托记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_commission_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_pre_sale_warehouse_receipt_transaction_record",
+                "title": "成交记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_transaction_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_pre_sale_warehouse_receipt_protocol_specified_record",
+                "title": "协议指定记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_pre_sale_warehouse_receipt_protocol_specified_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          },
+          {
+            "code": "search_document_records",
+            "title": "商品合约",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_document_record_commodity_contract",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+              {
+                "code": "search_document_records_contract_summary",
+                "title": "合约汇总",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_commodity_contract_contract_summary",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_document_records_commission_record",
+                "title": "委托记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_commodity_contract_commission_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_document_records_transaction_record",
+                "title": "成交记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_commodity_contract_transaction_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
+                "code": "search_document_records_delivery_record",
+                "title": "交收记录",
+                "sort": 1,
+                "type": 3,
+                "rulekey": "client_pc_web_inquire_document_record_commodity_contract_delivery_record",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "code": "search_capital_flow",
+        "title": "资金流水",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_inquire_capital_flow",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "search_capital_flow_tab",
+            "title": "资金流水",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_capital_flow_tab",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": [
+
+            ]
+          }
+        ]
+      },
+      {
+        "code": "search_financing_inquiry",
+        "title": "融资查询",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_inquire_financing_inquiry",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "search_financing_inquiry_apply_order",
+            "title": "申请单",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_financing_inquiry_requisition",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": []
+          },{
+            "code": "search_financing_inquiry_contract",
+            "title": "合同",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_financing_inquiry_contract",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": []
+          }
+        ]
+      },
+      {
+        "code": "search_performance_query",
+        "title": "履约查询",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_inquire_performance_query",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [      {
+          "code": "search_performance_query_buy_performance",
+          "title": "买履约",
+          "sort": 1,
+          "type": 1,
+          "rulekey": "client_pc_web_inquire_performance_query_buy_performance",
+          "isshow": true,
+          "url": "",
+          "remark": "",
+          "children": []
+        },
+          {
+            "code": "search_performance_query_sell_performance",
+            "title": "卖履约",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_performance_query_sell_performance",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": []
+          }]
+      },
+      {
+        "code": "search_pickup_query",
+        "title": "提货查询",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_inquire_pickup_query",
+        "isshow": true,
+        "url": "",
+        "remark": "",
+        "children": [
+          {
+            "code": "search_pickup_query_tab",
+            "title": "提货查询",
+            "sort": 1,
+            "type": 1,
+            "rulekey": "client_pc_web_inquire_pickup_query_tab",
+            "isshow": true,
+            "url": "",
+            "remark": "",
+            "children": []
+          }
+        ]
+      },
+      {
+        "code": "search_login_log",
+        "title": "登录日志",
+        "sort": 1,
+        "type": 1,
+        "rulekey": "client_pc_web_inquire_login_log",
+        "isshow": false,
+        "url": "",
+        "remark": "",
+        "children": []
       }
     ]
   },

src/assets/styles/mixin.less

@@ -734,10 +734,12 @@
 .input-enumdicname-absolute {
     position: absolute;
     top: -8px;
-    right: -23px;
+    right: -110px;
     color: @m-grey10;
     margin-left: 5px;
     font-size: 16px;
+    display: inline-block;
+    min-width: 100px;
   }
 
 .dialogInput {

src/assets/styles/theme.css

@@ -29,7 +29,7 @@
     --m-grey26: #343e48;
 
     --m-grey31: #212629;
-    --m-green1: #e8ffef;
+    /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
     --m-black1: #181e22;
@@ -240,7 +240,7 @@
     --m-grey26: #343e48;
 
     --m-grey31: #212629;
-    --m-green1: #e8ffef;
+    /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
     --m-black1: #181e22;

src/common/constants/enumOrderComponents.ts

@@ -10,10 +10,10 @@ export enum enumOrderComponents {
 						
 						financing_manager = 'financing_manager', // 融资管理
 						
-						funding_information = 'funding_information', // 资金信息
-						
 						performance_information = 'performance_information', // 履约信息
 						
+						funding_information = 'funding_information', // 资金信息
+						
 						spot_warrant_spot_summary = 'spot_warrant_spot_summary', // 现货汇总
 						
 						spot_warrant_inventory_summary = 'spot_warrant_inventory_summary', // 库存汇总
@@ -38,24 +38,24 @@ export enum enumOrderComponents {
 						
 						commodity_contract_summary = 'commodity_contract_summary', // 合约汇总
 						
-						commodity_contract_make_deal = 'commodity_contract_make_deal', // 成交
-						
 						commodity_contract_commission = 'commodity_contract_commission', // 委托
 						
+						commodity_contract_make_deal = 'commodity_contract_make_deal', // 成交
+						
 						commodity_contract_settlement = 'commodity_contract_settlement', // 交收
 						
 						financing_manager_apply_order = 'financing_manager_apply_order', // 申请单
 						
 						financing_manager_contract = 'financing_manager_contract', // 合同
 						
-						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
-						
-						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
-						
 						performance_information_buy_performance = 'performance_information_buy_performance', // 买履约
 						
 						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约
 						
+						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
+						
+						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
+						
 						pre_sale_warehouse_receipt_designated_deal_resell = 'pre_sale_warehouse_receipt_designated_deal_resell', // 撤销出售
 						
 		}

src/common/constants/enumRouterName.ts

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

src/common/constants/enumsName.ts

@@ -877,6 +877,32 @@ export function getScfContractStatusName(type: number) {
     return result
 }
 
+//scfcontracttype: number;//合同类型 - 1:仓单回购 2:仓单质押 3:合作套保 4:资金贷款 5:融资单 6:融资回购
+export function getScfContractTypeName(type: number) {
+    let result = "--"
+    switch (type) {
+        case 1:
+            result = '仓单回购'
+            break
+        case 2:
+            result = '仓单质押'
+            break
+        case 3:
+            result = '合作套保'
+            break
+        case 4:
+            result = '资金贷款'
+            break
+        case 5:
+            result = '融资单'
+            break
+        case 6:
+            result = '融资回购'
+            break
+    }
+    return result
+}
+
 
 /**
  * 资金操作类型

src/common/constants/modalNameEnum.ts

@@ -4,80 +4,80 @@ 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_deal_detail = 'spot_warrant_deal_detail', // 详情
+						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
 						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
-						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
+						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
-						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
+						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
 						
 						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
-						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
+						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
+						
+						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
 						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
 						
-						commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
+						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
-						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
+						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
-						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
+						commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
 						
-						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
+						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
 						
-						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
+						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
 						financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
 						
-						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
-						
 						financing_manager_contract_pay_arrears = 'financing_manager_contract_pay_arrears', // 支付欠款
 						
-						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
+						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
+						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
 						
-						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
+						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
 						
 						performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
 						
+						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
+						
 						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
 						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
-						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
-						
-						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
+						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
 						
 						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
 						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
 						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
-						
-						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
-						
-						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
+						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
 						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
 						
+						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
+						
 						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
 						
 						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
 						
+						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
+						
 						spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
 						
+						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
+						
 						open = 'open', // 开仓
 						
 						close = 'close', // 平仓
@@ -88,14 +88,10 @@ export enum ModalEnum {
 						
 						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
 						
-						custom_info_btn_check = 'custom_info_btn_check', // 审核
-						
 						custom_info_btn_add = 'custom_info_btn_add', // 新增
 						
 						custom_info_btn_disable = 'custom_info_btn_disable', // 停用
 						
-						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
-						
 						goods_info_spot_normal_add = 'goods_info_spot_normal_add', // 新增
 						
 						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
@@ -106,22 +102,26 @@ export enum ModalEnum {
 						
 						spot_contract_btn_add = 'spot_contract_btn_add', // 新增
 						
+						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
+						
 						none_btn = 'none_btn', // 按钮
 						
 						warehouse_info_btn_add = 'warehouse_info_btn_add', // 新增
 						
 						warehouse_info_btn_modify = 'warehouse_info_btn_modify', // 修改
 						
-						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', // 新增
+						custom_info_btn_check = 'custom_info_btn_check', // 审核
 						
 						account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
 						
 						account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
 						
+						warehouse_info_btn_disable = 'warehouse_info_btn_disable', // 停用
+						
+						account_info_business_btn_add = 'account_info_business_btn_add', // 新增
+						
+						warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
+						
 						account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
 						
 						account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
@@ -132,19 +132,15 @@ export enum ModalEnum {
 						
 						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
 						
-						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_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
+						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
 						
-						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
+						finance_review_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
 						
 						inventory_review_checkin_cancel = 'inventory_review_checkin_cancel', // 撤销
 						
@@ -156,7 +152,7 @@ export enum ModalEnum {
 						
 						platinum_custom_info_add = 'platinum_custom_info_add', // 新增
 						
-						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
+						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
 						
 						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
 						
@@ -164,7 +160,7 @@ export enum ModalEnum {
 						
 						platinum_pick_query_receipt = 'platinum_pick_query_receipt', // 确认收货
 						
-						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
+						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
 						
 						platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
 						
@@ -172,13 +168,13 @@ export enum ModalEnum {
 						
 						platinum_withdrawal_review_confirm_withdrawal = 'platinum_withdrawal_review_confirm_withdrawal', // 确认提现
 						
+						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
+						
 						platinum_withdrawal_review_refuse = 'platinum_withdrawal_review_refuse', // 审核拒绝
 						
 						platinum_financing_information_detail = 'platinum_financing_information_detail', // 融资明细
 						
-						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
-						
-						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
+						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
 						
 						platinum_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
 						
@@ -186,7 +182,7 @@ export enum ModalEnum {
 						
 						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
 						
-						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
+						platinum_contract_goods_add = 'platinum_contract_goods_add', // 新增
 						
 						platinum_agreement_add = 'platinum_agreement_add', // 新增
 						
@@ -194,18 +190,28 @@ export enum ModalEnum {
 						
 						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
 						
+						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
+						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
-						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
+						platinum_contract_commodity_suspension_add = 'platinum_contract_commodity_suspension_add', // 新增
 						
 						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
 						
+						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
+						
 						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_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
+						
+						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
+						
+						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
+						
 						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
 						
 						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
@@ -216,18 +222,6 @@ export enum ModalEnum {
 						
 						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
 						
-						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
-						
-						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
-						
-						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
-						
-						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
-						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
-						
-						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
-						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
@@ -236,8 +230,16 @@ export enum ModalEnum {
 						
 						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
+						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						
+						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
+						
 						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
+						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
+						
+						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
+						
 						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
 						sell_pending_funds = 'sell_pending_funds', // 款项登记
@@ -246,14 +248,12 @@ export enum ModalEnum {
 						
 						sell_pending_storage = 'sell_pending_storage', // 出库登记
 						
-						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
+						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
-						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
+						plan_audit_cancel = 'plan_audit_cancel', // 撤销
 						
 						plan_audit_audit = 'plan_audit_audit', // 审核
 						
-						plan_audit_cancel = 'plan_audit_cancel', // 撤销
-						
 						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
 						
 						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
@@ -274,8 +274,6 @@ export enum ModalEnum {
 						
 						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
 						
-						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
-						
 						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
 						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
@@ -286,29 +284,31 @@ 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_broker_management_check = 'platinum_broker_management_check', // 审核
+						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
 						
-						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
+						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
-						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
-						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
+						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
-						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
+						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
-						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
+						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
 						
-						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
+						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
+						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
 						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
 						
-						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
-						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
+						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
 						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
 						

src/layout/components/bottom.vue

@@ -105,6 +105,10 @@ export default defineComponent({
     .capitalSelect {
         margin-top: 3px;
         margin-right: 10px;
+        .ant-select-selector{
+            background-color: @m-grey6;
+            border:none
+        }
     }
 }
 .layout-bottom-all {

src/router/index.ts

@@ -996,6 +996,57 @@ const routes: Array<RouteRecordRaw> = [
                     },
                 ]
             },
+            {
+                path: '/search_document_records',
+                name: EnumRouterName.search_document_records,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                // redirect: { name: EnumRouterName.search_document_records, },
+                children: [
+                    {
+                        path: '/search_document_records/search_document_records',
+                        name: EnumRouterName.search_document_records,
+                        component: () => import('@/views/search/search_document_records/search_document_records/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                        children: [
+                            {
+                                path: '/search_document_records/search_document_records/search_spot_warrant_listing_record',
+                                // name: EnumRouterName.search_spot_warrant_listing_record,
+                                component: () => import('@/views/search/search_document_records/search_document_records/search_spot_warrant_listing_record/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            }
+                        ]
+                    },
+                    {
+                        path: '/search_document_records/search_pre_sale_warehouse_receipt',
+                        name: EnumRouterName.search_pre_sale_warehouse_receipt,
+                        component: () => import('@/views/search/search_document_records/search_pre_sale_warehouse_receipt/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                        children: [
+
+                        ]
+                    },
+                    {
+                        path: '/search_document_records/search_spot_warrant',
+                        name: EnumRouterName.search_spot_warrant,
+                        component: () => import('@/views/search/search_document_records/search_spot_warrant/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                        children: [
+
+                        ]
+                    },
+                ]
+            }
         ],
     },
     {

src/services/go/commonService/index.ts

@@ -90,7 +90,7 @@ export function GetPCMenus(): Promise<string> {
     return commonSearch_go('/Common/GetClientMenus', param)
         .then((res) => {
             APP.set('menus', res);
-            console.log('res', res);
+            console.log('交易端菜单', res);
             return 'ok';
         })
         .catch((err: Error) => {

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 买大厅 -->
+  <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
   <a-table :columns="handleColumn(columns)"
            :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
@@ -19,6 +19,9 @@
                class="btn-list-sticky"
                @click="openComponent" />
     </template>
+    <template #username="{text, record }">
+      <span>{{record.userid + " "}}{{text}}</span>
+    </template>
   </a-table>
   <component :is="componentId"
              v-if="componentId"

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

@@ -1,160 +1,149 @@
 <template>
-    <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
-    <Drawer
-        :title="'摘牌'"
-        :placement="'right'"
-        :visible="visible"
-        width="486px"
-        height="479px"
-        @cancel="cancel"
-        class="top"
-    >
-        <div class="delisting">
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item label="交易账户" name="accountid">
-                                <a-select
-                                    class="inlineFormSelect"
-                                    style="width: 260px"
-                                    v-model:value="formState.accountid"
-                                    placeholder="请选择"
-                                >
-                                    <a-select-option
-                                        v-for="item in accountList"
-                                        :value="item.accountid"
-                                        :key="item.accountid"
-                                    >{{item.accountid}}</a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item label="挂牌方">
-                                <span class="white ml8">{{selectedRow.username}}</span>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item label="基差" v-if="isFloat()">
-                                <span class="yellow ml8">{{selectedRow.pricemove}}</span>
-                            </a-form-item>
-                            <a-form-item label="挂牌价格" v-if="!isFloat()">
-                                <span class="yellow ml8">{{selectedRow.fixedprice}}</span>
-                            </a-form-item>
-                            <a-row :gutter="24">
-                                <a-col :span="24"></a-col>
-                            </a-row>
-                            <a-form-item label="挂牌数量">
-                                <span
-                                    class="white ml8"
-                                >{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24" v-if="isBuy() && isWR()">
-                        <a-col :span="24">
-                            <a-form-item label="现货仓单" name="LadingBillId">
-                                <a-select
-                                    class="inlineFormSelect"
-                                    style="width: 260px"
-                                    v-model:value="formState.LadingBillId"
-                                    placeholder="请选择"
-                                >
-                                    <a-select-option
-                                        v-for="item in wrHoldList"
-                                        :value="item.id"
-                                        :key="item.id"
-                                    >{{item.name}}</a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item label="摘牌数量" class="relative" name="num">
-                                <a-input-number
-                                    class="dialogInput yellowInput"
-                                    style="width: 260px"
-                                    :min="0"
-                                    :max="getMaxNum()"
-                                    v-model:value="formState.num"
-                                />
-                                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                                <div
-                                    class="labelTip"
-                                >({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24" class="mt-20">
-                            <a-form-item>
-                                <a-slider
-                                    ::min="0"
-                                    v-model:value="formState.num"
-                                    :max="selectedRow.orderqty"
-                                    class="formSlider"
-                                />
-                                <div class="unit">
-                                    <span>0</span>
-                                    <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
-                                </div>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">&nbsp;</a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24" class="mt-20">
-                            <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
-                                <span class="white ml8">{{getMoney()}}</span>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24" class="mt-20">
-                            <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                                <a-row>
-                                    <a-col :span="8" v-if="getMargin()">
-                                        <span class="white ml8">{{getMargin()}}</span>
-                                    </a-col>
-                                    <a-col :span="4" class="tr">
-                                        <span class="grey1">可用资金</span>
-                                    </a-col>
-                                    <a-col :span="12">
-                                        <span
-                                            class="white ml8"
-                                        >{{getCanUseMoney(getSelectedAccount())}}</span>
-                                    </a-col>
-                                </a-row>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item class="tc">
-                                <a-button
-                                    class="listedBtn"
-                                    :loading="loading"
-                                    :disabled="loading"
-                                    @click="submit"
-                                >{{isBuy() ? '卖出' : '买入'}}</a-button>
-                                <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
-        </div>
-    </Drawer>
+  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+  <Drawer :title="'摘牌'"
+          :placement="'right'"
+          :visible="visible"
+          width="486px"
+          height="479px"
+          @cancel="cancel"
+          class="top">
+    <div class="delisting">
+      <div class="formBar">
+        <a-form class="inlineForm dialogForm"
+                ref="formRef"
+                :model="formState"
+                :rules="rules">
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="交易账户"
+                           name="accountid">
+                <a-select class="inlineFormSelect"
+                          style="width: 260px"
+                          v-model:value="formState.accountid"
+                          placeholder="请选择">
+                  <a-select-option v-for="item in accountList"
+                                   :value="item.accountid"
+                                   :key="item.accountid">{{item.accountid}}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="挂牌方">
+                <span class="white ml8">{{selectedRow.username}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="基差"
+                           v-if="isFloat()">
+                <span class="yellow ml8">{{selectedRow.pricemove}}</span>
+              </a-form-item>
+              <a-form-item label="挂牌价格"
+                           v-if="!isFloat()">
+                <span class="yellow ml8">{{selectedRow.fixedprice}}</span>
+              </a-form-item>
+              <a-row :gutter="24">
+                <a-col :span="24"></a-col>
+              </a-row>
+              <a-form-item label="挂牌数量">
+                <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24"
+                 v-if="isBuy() && isWR()">
+            <a-col :span="24">
+              <a-form-item label="现货仓单"
+                           name="LadingBillId">
+                <a-select class="inlineFormSelect"
+                          style="width: 260px"
+                          v-model:value="formState.LadingBillId"
+                          placeholder="请选择">
+                  <a-select-option v-for="item in wrHoldList"
+                                   :value="item.id"
+                                   :key="item.id">{{item.name}}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="摘牌数量"
+                           class="relative"
+                           name="num">
+                <a-input-number class="dialogInput yellowInput"
+                                style="width: 260px"
+                                :min="0"
+                                :max="getMaxNum()"
+                                v-model:value="formState.num" />
+                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
+                <div class="labelTip">({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item>
+                <a-slider ::min="0"
+                          v-model:value="formState.num"
+                          :max="selectedRow.orderqty"
+                          class="formSlider" />
+                <div class="unit">
+                  <span>0</span>
+                  <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
+                <span class="white ml8">{{getMoney()}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24"
+                   class="mt-20">
+              <a-form-item :label="getMargin() ? '履约保证金' : ''">
+                <a-row>
+                  <a-col :span="8"
+                         v-if="getMargin()">
+                    <span class="white ml8">{{getMargin()}}</span>
+                  </a-col>
+                  <a-col :span="4"
+                         class="tr">
+                    <span class="grey1">可用资金</span>
+                  </a-col>
+                  <a-col :span="12">
+                    <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
+                  </a-col>
+                </a-row>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
+                          @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
+                <a-button class="ml10 cancelBtn"
+                          @click="cancel">取消</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -173,7 +162,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleForm, handleNumAndMoney, handleSpotWarrant, getWrPosition } from './setup';
 import { handleIs } from '../../setup';
 import { validateAction } from '@/common/setup/form';
-import { ListingForm } from './interface';
+import { ListingForm, TempWrOrderQuoteDetail } from './interface';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getCanUseMoney } from '@/services/bus/account';
@@ -187,7 +176,7 @@ export default defineComponent({
             type: String as PropType<EnumRouterName>,
         },
         selectedRow: {
-            type: Object as PropType<WrOrderQuoteDetail>,
+            type: Object as PropType<TempWrOrderQuoteDetail>,
             default: {},
         },
         parantSelectedRow: {

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

@@ -1,3 +1,5 @@
+import { WrOrderQuoteDetail } from "@/services/go/wrtrade/interface";
+
 export interface ListingForm {
     accountid: undefined | number,
     num: number,
@@ -7,4 +9,8 @@ export interface ListingForm {
 export interface Wrhold {
     id: string,
     name: string,
+}
+
+export interface TempWrOrderQuoteDetail extends WrOrderQuoteDetail {
+    wrResult: { dgfactoryitemtypeid: number; dgfactoryitemid: number }[]
 }

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

@@ -70,14 +70,14 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
     const rules = getRules()
     // 是否有规则
     const hasRule = () => rules.length > 0;
+    const { buymarginvalue, buymarginalgorithm } = rules[0]
     //保证金模式 1： 比率 2： 固定
-    const marginMethod = (buymarginalgorithm: number) => buymarginalgorithm === 1
+    const marginMethod = () => buymarginalgorithm === 1
     const { fixedprice, orderqty, pricemove } = selectedRow;
     // 获取摘牌最大可摘量
     function getMaxNum() {
         let result = 0;
         if (hasRule()) {
-            const { buymarginvalue, buymarginalgorithm } = rules[0]
             // 可用资金
             const canUseMoney = Number(getCanUseMoney(getSelectedAccount() as AccountListItem))
             if (!isBuy()) {
@@ -88,13 +88,13 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
                         // 估算总价
                         const predictTotal = pricemove + (goodsPrice.value as number);
                         // 买方履约保证金比例*估算总价
-                        const marginMoney = marginMethod(buymarginalgorithm) ? (buymarginvalue * predictTotal) : (buymarginvalue + predictTotal)
+                        const marginMoney = marginMethod() ? (buymarginvalue * predictTotal) : (buymarginvalue + predictTotal)
                         // 浮动价 摘买 最大数量=min{可用资金/（买方履约保证金比例*估算总价），挂牌数量}
                         result = Math.min(orderqty, canUseMoney / marginMoney)
                     }
                 } else {
                     // 买方履约保证金比例*挂牌价格
-                    const marginMoney = marginMethod(buymarginalgorithm) ? (buymarginvalue * fixedprice) : (buymarginvalue + fixedprice)
+                    const marginMoney = marginMethod() ? (buymarginvalue * fixedprice) : (buymarginvalue + fixedprice)
                     //  一口价 摘买 最大数量=min{挂牌数量，可用资金/（买方履约保证金比例*挂牌价格）
                     result = Math.min(orderqty, canUseMoney / marginMoney)
                 }
@@ -132,7 +132,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
             }
         } else {
             // 摘牌金额=挂牌价格*摘牌数量
-            result = formState.num * orderqty
+            result = formState.num * fixedprice
         }
         return Number(result.toFixed(2))
     }
@@ -145,11 +145,8 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
         let result = 0
         if (hasRule()) {
             const { buymarginvalue, sellmarginvalue } = rules[0]
-            if (isBuy()) {
-                result = sellmarginvalue * getMoney()
-            } else {
-                result = buymarginvalue * getMoney()
-            }
+            const margin = isBuy() ? sellmarginvalue : buymarginvalue
+            result = marginMethod() ? margin * getMoney() : margin + getMoney()
         }
         return Number(result.toFixed(2))
     }

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

@@ -93,13 +93,13 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
     // 是否有规则
     const hasRule = () => rules.length > 0;
     //保证金模式 1： 比率 2： 固定
-    const marginMethod = (buymarginalgorithm: number) => buymarginalgorithm === 1
+    const { buymarginvalue, buymarginalgorithm } = rules[0]
+    const marginMethod = () => buymarginalgorithm === 1
     const { fixedprice, orderqty, pricemove } = selectedRow;
     // 获取摘牌最大可摘量
     function getMaxNum() {
         let result = 0;
         if (hasRule()) {
-            const { buymarginvalue, buymarginalgorithm } = rules[0]
             // 可用资金
             const canUseMoney = Number(getCanUseMoney(getSelectedAccount() as AccountListItem))
             if (!isBuy()) {
@@ -110,13 +110,13 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
                         // 估算总价
                         const predictTotal = pricemove + (goodsPrice.value as number);
                         // 买方履约保证金比例*估算总价
-                        const marginMoney = marginMethod(buymarginalgorithm) ? (buymarginvalue * predictTotal) : (buymarginvalue + predictTotal)
+                        const marginMoney = marginMethod() ? (buymarginvalue * predictTotal) : (buymarginvalue + predictTotal)
                         // 浮动价 摘买 最大数量=min{可用资金/（买方履约保证金比例*估算总价），挂牌数量}
                         result = Math.min(orderqty, canUseMoney / marginMoney)
                     }
                 } else {
                     // 买方履约保证金比例*挂牌价格
-                    const marginMoney = marginMethod(buymarginalgorithm) ? (buymarginvalue * fixedprice) : (buymarginvalue + fixedprice)
+                    const marginMoney = marginMethod() ? (buymarginvalue * fixedprice) : (buymarginvalue + fixedprice)
                     //  一口价 摘买 最大数量=min{挂牌数量，可用资金/（买方履约保证金比例*挂牌价格）
                     result = Math.min(orderqty, canUseMoney / marginMoney)
                 }
@@ -154,7 +154,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
             }
         } else {
             // 摘牌金额=挂牌价格*摘牌数量
-            result = formState.num * orderqty
+            result = formState.num * fixedprice
         }
         return Number(result.toFixed(2))
     }
@@ -167,7 +167,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
         let result = 0
         if (hasRule()) {
             if (selecedFinance.value) {
-                result = selecedFinance.value.marginratio * getMoney()
+                result = marginMethod() ? selecedFinance.value.marginratio * getMoney() : selecedFinance.value.marginratio * getMoney()
             }
         }
         return Number(result.toFixed(2))

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

@@ -1,32 +1,33 @@
 <template>
-    <!-- 卖大厅 -->
-    <a-table
-        :columns="handleColumn(columns)"
-        :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
-        :pagination="false"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :customRow="Rowclick"
-        :expandIcon="expandIcon"
-        :expandIconAsCell="false"
-        rowKey="key"
-        :data-source="tableList"
-    >
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
-        </template>
-    </a-table>
-    <component
-        :is="componentId"
-        v-if="componentId"
-        :selectedRow="selectedRow"
-        :enumName="enumName"
-        :buyOrSell="BuyOrSell.sell"
-        :parantSelectedRow="parantSelectedRow"
-        @cancel="closeComponent"
-    ></component>
+  <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
+  <a-table :columns="handleColumn(columns)"
+           :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
+           :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
+           :pagination="false"
+           :loading="loading"
+           :expandedRowKeys="expandedRowKeys"
+           :customRow="Rowclick"
+           :expandIcon="expandIcon"
+           :expandIconAsCell="false"
+           rowKey="key"
+           :data-source="tableList">
+    <!-- 额外的展开行 -->
+    <template #expandedRowRender="{ record }">
+      <BtnList :btnList="btnList"
+               :record="record"
+               @click="openComponent" />
+    </template>
+    <template #username="{text, record }">
+      <span>{{record.userid + " " }}{{text}}</span>
+    </template>
+  </a-table>
+  <component :is="componentId"
+             v-if="componentId"
+             :selectedRow="selectedRow"
+             :enumName="enumName"
+             :buyOrSell="BuyOrSell.sell"
+             :parantSelectedRow="parantSelectedRow"
+             @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/components/filter/index.vue

@@ -28,7 +28,7 @@
         <a-month-picker :allowClear="false"
                         placeholder="全部交收月"
                         v-model:value="time"
-                        class="commonDatePicker conditionPicker" />
+                        class="commonDatePicker conditionPicker allDatePicker" />
       </a-space>
       <a-select class="conditionSelect"
                 v-if="isFloat()"
@@ -137,8 +137,9 @@ export default defineComponent({
                     });
                 });
             }
+            const wrResult: { dgfactoryitemtypeid: number; dgfactoryitemid: number }[] = [];
             wrLsit.value.forEach((el) => {
-                const { selected, itemtypename } = el;
+                const { selected, itemtypename, dgfactoryitemtypeid } = el;
                 if (selected) {
                     const { key } = selected;
                     if (itemtypename === '仓库') {
@@ -148,6 +149,7 @@ export default defineComponent({
                         const name = el.itemlst.find((e) => e.dgfactoryitemid === key)!.dgfactoryitemvalue;
                         result.dgitemname = result.dgitemname ? `${result.dgitemname},${name}` : name;
                     }
+                    wrResult.push({ dgfactoryitemtypeid, dgfactoryitemid: key });
                 }
             });
             if (!isWR()) {
@@ -160,6 +162,7 @@ export default defineComponent({
             if (isQuery) {
                 context.emit('search', result);
             }
+            result.wrResult = wrResult;
             return result;
         }
         function listingAction() {
@@ -214,5 +217,15 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.allDatePicker{
+    cursor: pointer;
+    min-width: 120px;
+    height: 30px;
+    padding: 0 8px;
+    background: var(--m-grey9);
+    border: none;
+    border-radius: 3px 3px 3px 3px;
+    color: var(--m-grey10);
+}
 </style>;
 

src/views/market/spot_trade/components/post_buying/index.vue

@@ -98,7 +98,7 @@
             </a-col>
             <a-col :span="24"
                    class="relative mt20">
-              <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
+              <a-form-item :label="isFloat() ? '估算金额' : '挂牌金额'">
                 <span class="white ml8">{{getMoney()}}</span>
               </a-form-item>
             </a-col>
@@ -149,7 +149,7 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
+import {DGFactoryItems, WRGoodsInfo} from '@/services/proto/warehousetrade/interface';
 import { getAccountTypeList, getUserId } from '@/services/bus/account';
 import { v4 as uuidv4 } from 'uuid';
 import moment, { Moment } from 'moment';
@@ -157,7 +157,7 @@ import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { WrOrderQuote } from '@/services/go/wrtrade/interface';
 import { handleForm, handleNumAndPrice } from './setup';
 import { validateAction } from '@/common/setup/form';
-import { FormParam } from './interface';
+import {FormParam, TempWrOrderQuoteDetail} from './interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleIs } from '../buy-sell-market/setup';
 import { BuyOrSell } from '@/common/constants/enumCommon';
@@ -169,7 +169,7 @@ export default defineComponent({
     components: { Des, Drawer, PlusOutlined, MinusOutlined },
     props: {
         selectedRow: {
-            type: Object as PropType<WrOrderQuote>,
+            type: Object as PropType<TempWrOrderQuoteDetail>,
             default: {},
         },
         enumName: {
@@ -200,6 +200,10 @@ export default defineComponent({
             const marketInfo = getMarketRunByTradeMode(17);
             if (marketInfo) {
                 validateAction<FormParam>(formRef, formState).then((res) => {
+
+                    // 现在增加一种挂牌求购的情况
+                    // 这种求购模式会生成一种仓单贸易商品
+
                     const wrGoodsInfo: WRGoodsInfo = {
                         GoodsID: props.selectedRow.goodsid, // uint32 配置商品ID
                         GoodsCode: props.selectedRow.goodscode, // string 配置商品代码
@@ -248,7 +252,16 @@ export default defineComponent({
                         WRStandardID: props.selectedRow.wrstandardid,
                         HasWr: isWR(), // 无仓单挂牌  是否有无仓单
                         DeliveryMonth: isWR() ? '' : moment(res.DeliveryMonth).format('YYYY-MM'),
+                        FactoryItems: props.selectedRow.wrResult.flatMap((it) => {
+                                return {
+                                    DGFactoryItemTypeID: it.dgfactoryitemtypeid, // uint64 要素项类型ID
+                                    DGFactoryItemID: it.dgfactoryitemid, // uint64 预约要素项类型值
+                                    ItemTypeMode: 1, // uint32 要素项类型模式
+                                }
+                            }
+                        ) // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
                     };
+                    debugger
                     requestResultLoadingAndInfo(hdWROrder, param, loading, ['求购成功', '求购失败:']).then(() => {
                         cancel(true);
                     });

src/views/market/spot_trade/components/post_buying/interface.ts

@@ -1,4 +1,5 @@
 import { Moment } from "moment";
+import {WrOrderQuote, WrOrderQuoteDetail} from "@/services/go/wrtrade/interface";
 
 export interface FormParam {
     accountid: undefined | number,
@@ -7,3 +8,8 @@ export interface FormParam {
     PriceMove: number,
     DeliveryMonth: Moment,
 }
+
+
+export interface TempWrOrderQuoteDetail extends WrOrderQuote {
+    wrResult: { dgfactoryitemtypeid: number; dgfactoryitemid: number }[]
+}

src/views/market/spot_trade/components/post_buying/setup.ts

@@ -36,13 +36,16 @@ export function handleNumAndPrice(enumName: EnumRouterName, selectedRow: WrOrder
     const getSelectedAccount = () => accountList.find((e) => e.accountid === formState.accountid);
     // 交易规则
     const rules = getRules()
+    const { buymarginvalue, buymarginalgorithm } = rules[0]
+    //保证金模式 1： 比率 2： 固定
+    const marginMethod = () => buymarginalgorithm === 1
     // 挂牌最大数量
     function getMaxNum() {
         // 可用资金
         const canUseMoney = Number(getCanUseMoney(getSelectedAccount() as AccountListItem))
         // 挂牌最大数量=可用资金/(买方履约保证金比例*挂牌价格)
-        const margin = getMargin()
-        return margin ? Math.floor(canUseMoney / getMargin()) : selectedRow.minivalue
+        const margin = marginMethod() ? (buymarginvalue * formState.FixedPrice) : (buymarginvalue + formState.FixedPrice)
+        return Math.floor(canUseMoney / margin)
     }
     //  摘牌金额
     function getMoney() {
@@ -66,7 +69,8 @@ export function handleNumAndPrice(enumName: EnumRouterName, selectedRow: WrOrder
         const { buymarginvalue } = rules[0]
         // 浮动价 履约保证金=估算总额*买方履约保证金比例
         // 一口价 履约保证金=挂牌金额*买方履约保证金比例
-        return Number((getMoney() * buymarginvalue).toFixed(2))
+        const margin = marginMethod() ? (buymarginvalue * getMoney()) : (buymarginvalue + getMoney())
+        return Number((margin).toFixed(2))
     }
     return { getMaxNum, getMoney, getMargin }
 }

src/views/order/financing_manager/components/financing_manager_contract/index.vue

@@ -32,6 +32,10 @@
       <template #createtime="{ record }">
         <a>{{ formatTime(record.createtime) }}</a>
       </template>
+        <template #scfcontracttype="{ record }">
+            <a>{{ getScfContractTypeName(record.scfcontracttype) }}</a>
+        </template>
+
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -50,7 +54,7 @@ import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { formatTime } from '@/common/methods';
 import { expandIcon } from '@/common/setup/table/clolumn';
-import { getContractName, getFinanceTypeName } from '@/common/constants/enumsName';
+import {getContractName, getFinanceTypeName, getScfContractTypeName} from '@/common/constants/enumsName';
 import { BtnList as BtnListType } from '@/common/components/btnList/interface';
 
 export default defineComponent({
@@ -94,6 +98,7 @@ export default defineComponent({
             getContractName,
             getFinanceTypeName,
             handleBtnList,
+            getScfContractTypeName,
         };
     },
 });

src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -24,7 +24,7 @@
         <span>{{getCanUseMoney(record)}}</span>
       </template>
       <template #freezemargin="{record}">
-        <span>{{getFreeze(record)}}</span>
+        <span>{{getFreeze(record, true)}}</span>
       </template>
     </a-table>
     <component :is="componentId"

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

@@ -90,7 +90,7 @@ import { performanceDelayApply, performanceManualConfirm } from '@/services/prot
 import { getUserId } from '@/services/bus/account';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
-import Long from "long";
+import Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_extension,
@@ -120,7 +120,7 @@ export default defineComponent({
                     applicant: getUserId(),
                     applyremark: param.remark,
                 };
-                requestResultLoadingAndInfo(performanceDelayApply, paramReq, loading, ['延期成功', '延期失败:']).then(() => {
+                requestResultLoadingAndInfo(performanceDelayApply, paramReq, loading, ['延期申请成功', '延期申请失败:']).then(() => {
                     cancel(true);
                 });
             });

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/setup.ts

@@ -92,10 +92,11 @@ export function handleNumAndPrice() {
     // 履约保证金
     function getMargin() {
         if (hasRules()) {
-            const { sellmarginvalue } = getRules()[0]
+            const { sellmarginvalue, buymarginalgorithm } = getRules()[0]
             // 浮动价 履约保证金=估算总额*买方履约保证金比例
             // 一口价 履约保证金=挂牌金额*买方履约保证金比例
-            return Number((getMoney() * sellmarginvalue).toFixed(2))
+            const margin = buymarginalgorithm === 1 ? getMoney() * sellmarginvalue : getMoney() + sellmarginvalue
+            return Number(margin.toFixed(2))
         } else {
             return 0
         }

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue

@@ -13,11 +13,12 @@
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
+      <template #expandedRowRender="{ record }" >
         <BtnList :btnList="btnList"
                  class="btn-list-sticky"
                  :record="record"
-                 @click="openComponent" />
+                 @click="openComponent" 
+                 v-if="record.enalbeqty > 0"/>
       </template>
     </a-table>
     <component :is="componentId"

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/setup.ts

@@ -91,10 +91,11 @@ export function handleNumAndPrice() {
     // 履约保证金
     function getMargin() {
         if (hasRules()) {
-            const { sellmarginvalue } = getRules()[0]
+            const { sellmarginvalue, buymarginalgorithm } = getRules()[0]
             // 浮动价 履约保证金=估算总额*买方履约保证金比例
             // 一口价 履约保证金=挂牌金额*买方履约保证金比例
-            return Number((getMoney() * sellmarginvalue).toFixed(2))
+            const margin = buymarginalgorithm === 1 ? getMoney() * sellmarginvalue : getMoney() + sellmarginvalue
+            return Number(margin.toFixed(2))
         } else {
             return 0
         }

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

@@ -17,7 +17,8 @@
         <BtnList :btnList="btnList"
                  :record="record"
                  class="btn-list-sticky"
-                 @click="openComponent" />
+                 @click="openComponent"
+                 v-if="record.enalbeqty > 0" />
       </template>
     </a-table>
     <component :is="componentId"

src/views/platinum/platinum_document_query/list/waiting/index.vue

@@ -24,6 +24,7 @@
         <template #paylimitedtime="{ record }">
           <a>{{ isOverTime(record.paylimitedtime) }}</a>
         </template>
+
       </a-table>
     </contextMenu>
     <!-- <ControlModal :selectedRow="selectedRow" /> -->

src/views/search/search_document_records/search_document_records/index.vue

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

src/views/search/search_document_records/search_document_records/search_spot_warrant_listing_record/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 单据记录 商品合约-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, defineComponent, ComposeTableParam } from '@/common/export/commonTable';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
+
+export default defineComponent({
+    name: EnumRouterName.search_document_records,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 0,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_pre_sale_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_pre_sale_price,
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/search/search_document_records/search_document_records/search_spot_warrant_protocol_specified_record/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 单据记录 商品合约-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, defineComponent, ComposeTableParam } from '@/common/export/commonTable';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
+
+export default defineComponent({
+    name: EnumRouterName.search_document_records,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 0,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_pre_sale_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_pre_sale_price,
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/search/search_document_records/search_document_records/search_spot_warrant_transaction_record/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 单据记录 商品合约-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, defineComponent, ComposeTableParam } from '@/common/export/commonTable';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
+
+export default defineComponent({
+    name: EnumRouterName.search_document_records,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 0,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_pre_sale_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_pre_sale_price,
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/search/search_document_records/search_document_records/search_spot_warrant_warehouse_receipt_details/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 单据记录 商品合约-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, defineComponent, ComposeTableParam } from '@/common/export/commonTable';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
+
+export default defineComponent({
+    name: EnumRouterName.search_document_records,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 0,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_pre_sale_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+
+        return {
+            ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_pre_sale_price,
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/index.vue

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

src/views/search/search_document_records/search_spot_warrant/index.vue

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