huangbin 4 years ago
parent
commit
71a46c09c1

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

@@ -485,11 +485,11 @@
             "remark": "",
             "children": [
               {
-                "code": "financing_manager_apply_order_transfer",
-                "title": "转让",
+                "code": "financing_manager_apply_cancel",
+                "title": "撤销",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_financing_management_bottom_apply_transfer",
+                "rulekey": "client_pc_web_financing_management_bottom_cancel",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -509,11 +509,11 @@
             "remark": "",
             "children": [
               {
-                "code": "financing_manager_contract_settlement",
-                "title": "交收",
+                "code": "financing_manager_contract_repurchase_warrant",
+                "title": "回购仓单",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_financing_management_bottom_contract_settlement",
+                "rulekey": "client_pc_web_financing_management_bottom_repurchase_warrant",
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -521,11 +521,11 @@
                 ]
               },
               {
-                "code": "financing_manager_contract_cancel",
-                "title": "撤单",
+                "code": "financing_manager_contract_pay_arrears",
+                "title": "支付欠款",
                 "sort": 1,
                 "type": 2,
-                "rulekey": "client_pc_web_warehouse_receipt_bottom_contract_cancel_order",
+                "rulekey": "client_pc_web_warehouse_receipt_bottom_pay_arrears",
                 "isshow": true,
                 "url": "",
                 "remark": "",

+ 15 - 15
src/common/constants/enumOrderComponents.ts

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

+ 102 - 106
src/common/constants/enumRouterName.ts

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

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

@@ -6,74 +6,68 @@ export enum ModalEnum {
     detail = 'detail', // 详情
 						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
-						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
-						
-						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
-						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
+						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
 						
 						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
 						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
-						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
 						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
 						
-						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
-						
-						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
-						
-						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
+						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
 						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
-						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
+						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
+						
+						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
 						
 						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
 						
-						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
+						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
 						commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
 						
 						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
 						
-						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
+						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
 						
-						financing_manager_contract_settlement = 'financing_manager_contract_settlement', // 交收
+						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
 						
-						financing_manager_apply_order_transfer = 'financing_manager_apply_order_transfer', // 转让
+						financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
 						
-						financing_manager_contract_cancel = 'financing_manager_contract_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_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
 						performance_information_buy_performance_settlement = 'performance_information_buy_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_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
 						
-						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
-						
 						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
-						
 						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
-						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
+						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
 						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
 						
-						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
+						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
+						
+						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
 						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
 						
+						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
+						
+						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
+						
+						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
+						
 						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
 						
 						spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
@@ -126,11 +120,13 @@ export enum ModalEnum {
 						
 						account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
 						
-						plan_btn_add = 'plan_btn_add', // 新增
+						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
-						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
 						
-						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
+						plan_btn_add = 'plan_btn_add', // 新增
+						
+						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
 						
 						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
 						
@@ -196,59 +192,61 @@ export enum ModalEnum {
 						
 						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
 						
+						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+						
+						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
+						
 						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
 						
 						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
 						
-						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
-						
 						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
 						
 						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 						
-						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
+						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
 						
-						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
 						
 						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
 						
-						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
-						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
 						
 						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
 						
+						account_info_manager_btn_child_add = 'account_info_manager_btn_child_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_modify = 'account_info_futures_btn_modify', // 修改
 						
 						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
 						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
 						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
+						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
+						
+						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
 						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
 						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
-						
-						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
+						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
 						
 						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
-						sell_pending_funds = 'sell_pending_funds', // 款项登记
+						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
 						
-						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+						sell_pending_funds = 'sell_pending_funds', // 款项登记
 						
 						sell_pending_storage = 'sell_pending_storage', // 出库登记
 						
-						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
-						
-						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
+						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
 						
 						plan_audit_audit = 'plan_audit_audit', // 审核
 						
@@ -260,19 +258,13 @@ export enum ModalEnum {
 						
 						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
 						
-						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
-						
 						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
 						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
-						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
-						
 						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
 						
-						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
-						
-						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
 						
 						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
 						
@@ -280,40 +272,48 @@ export enum ModalEnum {
 						
 						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
 						
-						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
+						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+						
+						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
 						
 						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
 						
-						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
+						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
 						
 						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
 						
 						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
 						
+						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
+						
+						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
+						
+						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
+						
 						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
 						
 						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
 						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
 						
-						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
-						
 						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
-						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
 						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
 						
 						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
 						
-						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
+						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
-						account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改
+						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
 						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
 						
-						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
+						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
 						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+						account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改
+						
+						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
 						
 		}

+ 64 - 0
src/views/order/financing_manager/components/financing_manager_apply_order/components/cancel/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <!-- 撤销-->
+  <div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { PerformanceActivateReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
+import { getAccount_longType, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { performanceActivate, performanceContractedApply } from '@/services/proto/performance';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { Modal } from 'ant-design-vue';
+
+export default defineComponent({
+    name: ModalEnum.financing_manager_apply_cancel,
+    components: { Drawer },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPerformancePlan>,
+            default: {},
+        },
+        buyOrSell: {
+            type: Number as PropType<BuyOrSell>,
+            default: BuyOrSell.buy,
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+        Modal.confirm({
+            title: '撤销',
+            content: '是否确认撤销申请单!',
+            onOk: submit,
+            onCancel: cancel,
+        });
+        function submit() {
+            // 激活接口 (就是交收)
+            // const paramReq: PerformanceActivateReq = {
+            //     PerformancePlanID: Number(props.selectedRow.performanceplanid), // uint64 履约计划ID
+            //     ApplyAccountID: getSelectedAccountId(), // uint64 发起方账号ID
+            // };
+            // requestResultLoadingAndInfo(performanceActivate, paramReq, loading, ['交收成功', '交收失败:']).then(() => {
+            //     cancel(true);
+            // });
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

+ 2 - 1
src/views/order/financing_manager/components/financing_manager_apply_order/index.vue

@@ -33,7 +33,7 @@
 
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
 import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
 import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
@@ -51,6 +51,7 @@ export default defineComponent({
     name: enumOrderComponents.financing_manager_apply_order,
     components: {
         BtnList,
+        [ModalEnum.financing_manager_apply_cancel]: defineAsyncComponent(() => import('./components/cancel/index.vue')),
     },
     setup() {
         // 表格列表数据

+ 143 - 0
src/views/order/financing_manager/components/financing_manager_contract/components/buyback/index.vue

@@ -0,0 +1,143 @@
+<template>
+  <!-- 付款-->
+  <Drawer :title="'回购仓单'"
+          :placement="'right'"
+          :visible="visible"
+          class="delistingBottom"
+          @cancel="cancel">
+    <div class="listed">
+      <div class="formBar">
+        <a-form class="inlineForm dialogForm"
+                ref="formRef"
+                :model="formState"
+                :rules="rules">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="品种">
+                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="仓库">
+                <span class="white ml10">{{selectedRow.warehousename}}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="履约商品">
+                <span class="white ml10">{{selectedRow.wrtypename}}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="购买数量">
+                <span class="white ml10">1000吨</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="已回购数量">
+                <span class="white ml10">1000吨</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="待回购数量">
+                <span class="white ml10">1000吨</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="本次回购数量"
+                           name="num"
+                           class="relative">
+                <a-input-number class="commonInput ml10"
+                                :min="1"
+                                v-model:value="formState.num"
+                                style="width: 200px" />
+
+                <div class="day">吨</div>
+                <div class="tip">本次可回购数量30吨</div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="本次回购金额">
+                <span class="white ml10">100.00</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="剩余保证金">
+                <span class="white ml10">100.00</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24"
+                 type="flex"
+                 justify="center">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
+                          @click="submit">提交</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { performanceManualConfirm } from '@/services/proto/performance';
+import { PerformanceManualConfirmReq } from '@/services/proto/performance/interface';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { HdWRDealOrder } from '@/services/proto/warehousetrade';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import * as Long from 'long';
+import { handleForm } from './setup';
+import { validateAction } from '@/common/setup/form';
+import { FormState } from './interface';
+
+export default defineComponent({
+    name: ModalEnum.financing_manager_contract_repurchase_warrant,
+    components: { Drawer },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPerformancePlan>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+        const { rules, formState, formRef } = handleForm();
+        function submit() {
+            validateAction<FormState>(formRef, formState).then((param) => {
+                // const param: PerformanceManualConfirmReq = {
+                //     PerformancePlanStepID: Long.fromString(props.selectedRow.curstepid),
+                //     PerformanceExecuteSide: 1,
+                // };
+                // requestResultLoadingAndInfo(performanceManualConfirm, param, loading, ['回购仓单成功', '回购仓单失败:']).then(() => {
+                //     cancel(true);
+                // });
+            });
+        }
+
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+            rules,
+            formState,
+            formRef,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

+ 3 - 0
src/views/order/financing_manager/components/financing_manager_contract/components/buyback/interface.ts

@@ -0,0 +1,3 @@
+export interface FormState {
+    num: number,
+}

+ 13 - 0
src/views/order/financing_manager/components/financing_manager_contract/components/buyback/setup.ts

@@ -0,0 +1,13 @@
+import { reactive, ref, UnwrapRef } from "vue";
+import { FormState } from "./interface";
+
+export function handleForm() {
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+        num: 0,
+    })
+    const rules = {
+        num: [{ required: true, message: '请输入回购数量', trigger: 'blur', type: 'number', min: 1, }],
+    }
+    return { rules, formState, formRef }
+}

+ 103 - 0
src/views/order/financing_manager/components/financing_manager_contract/components/pay/index.vue

@@ -0,0 +1,103 @@
+<template>
+  <!-- 付款-->
+  <Drawer :title="'付款'"
+          :placement="'right'"
+          :visible="visible"
+          class="delistingBottom"
+          @cancel="cancel">
+    <div class="listed">
+      <div class="formBar">
+        <a-form class="inlineForm dialogForm"
+                ref="formRef">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="借款金额">
+                <span class="white ml10">100.00</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="剩余金额">
+                <span class="white ml10">100.00</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="已计费用">
+                <span class="white ml10">100.00</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="费用欠款">
+                <span class="red ml10">100.00</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24"
+                 type="flex"
+                 justify="center">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
+                          @click="submit">提交</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { performanceManualConfirm } from '@/services/proto/performance';
+import { PerformanceManualConfirmReq } from '@/services/proto/performance/interface';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { HdWRDealOrder } from '@/services/proto/warehousetrade';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import * as Long from 'long';
+
+export default defineComponent({
+    name: ModalEnum.financing_manager_contract_pay_arrears,
+    components: { Drawer },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPerformancePlan>,
+            default: {},
+        },
+        buyOrSell: {
+            type: Number as PropType<BuyOrSell>,
+            default: BuyOrSell.buy,
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+        function submit() {
+            const param: PerformanceManualConfirmReq = {
+                PerformancePlanStepID: Long.fromString(props.selectedRow.curstepid),
+                PerformanceExecuteSide: 1,
+            };
+            requestResultLoadingAndInfo(performanceManualConfirm, param, loading, ['付款成功', '付款失败:']).then(() => {
+                cancel(true);
+            });
+        }
+
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

+ 3 - 1
src/views/order/financing_manager/components/financing_manager_contract/index.vue

@@ -33,7 +33,7 @@
 
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
 import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
 import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
@@ -51,6 +51,8 @@ export default defineComponent({
     name: enumOrderComponents.financing_manager_contract,
     components: {
         BtnList,
+        [ModalEnum.financing_manager_contract_repurchase_warrant]: defineAsyncComponent(() => import('./components/buyback/index.vue')),
+        [ModalEnum.financing_manager_contract_pay_arrears]: defineAsyncComponent(() => import('./components/pay/index.vue')),
     },
     setup() {
         // 表格列表数据