议价

public/proto/mtp.proto

@@ -1891,4 +1891,35 @@ message WrBargainNoAgreeRsp {
  optional MessageHead Header = 1; // MessageHead 消息头
  optional int32 RetCode = 2; // int32 返回码
  optional string RetDesc = 3; // string 描述信息
-}
+}
+
+// 议价申请请求 0 29 55
+message WrBargainApplyReq {
+	optional MessageHead Header = 1; // MessageHead
+	optional uint64 WRTradeOrderID = 2; // uint64 关联委托单ID
+	optional string UserID = 3; // string 摘牌人用户ID
+	optional string AccountID = 4; // string 摘牌资金账号
+	optional string BuyOrSell = 5; // string 摘牌方向
+	optional uint64 ApplyQty = 6; // uint64 摘牌数量
+	optional string ApplyPrice = 7; // string 申请价格
+	optional string ApplyRemark = 8; // string 申请备注
+}
+// 议价申请响应 0 29 56
+message WrBargainApplyRsp {
+	optional MessageHead Header = 1; // MessageHead 消息头
+	optional int32 RetCode = 2; // int32 返回码
+	optional string RetDesc = 3; // string 描述信息
+	optional uint64 WrBargainID = 4; // uint64 申请ID
+}
+// 议价申请撤回请求 0 29 57
+message WrBargainBackReq {
+	optional MessageHead Header = 1; // MessageHead
+	optional uint64 WrBargainID = 2; // uint64 申请ID
+}
+// 议价申请撤回请求响应 0 29 58
+message WrBargainBackRsp {
+	optional MessageHead Header = 1; // MessageHead 消息头
+	optional int32 RetCode = 2; // int32 返回码
+	optional string RetDesc = 3; // string 描述信息
+}
+

src/common/constants/modalNameEnum.ts

@@ -1,331 +1,332 @@
 export enum ModalEnum {
-    notice = 'notice',  // 消息
-    logout = 'logout', // 退出登录
-    commomOrder = 'commom-order', // 下单通用界面
-
-    detail = 'detail', // 详情
-						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
-						
-						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
-						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
-						
-						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
-						
-						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
-						
-						spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
-						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
-						
-						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
-						
-						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
-						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
-						
-						pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
-						
-						pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
-						
-						pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
-						
-						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
-						
-						commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
-						
-						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
-						
-						commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
-						
-						financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
-						
-						commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
-						
-						financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
-						
-						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
-						
-						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
-						
-						performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
-						
-						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
-						
-						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
-						
-						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
-						
-						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
-						
-						performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
-						
-						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
-						
-						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
-						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
-						
-						spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
-						
-						spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
-						
-						spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
-						
-						spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
-						
-						open = 'open', // 开仓
-						
-						close = 'close', // 平仓
-						
-						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
-						
-						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
-						
-						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', // 修改
-						
-						goods_info_hedge_normal_modify = 'goods_info_hedge_normal_modify', // 修改
-						
-						goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
-						
-						spot_contract_btn_add = 'spot_contract_btn_add', // 新增
-						
-						none_btn = 'none_btn', // 按钮
-						
-						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', // 新增
-						
-						account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
-						
-						account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
-						
-						account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
-						
-						account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
-						
-						plan_btn_add = 'plan_btn_add', // 新增
-						
-						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
-						
-						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', // 撤销
-						
-						inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
-						
-						inventory_review_checkin_cancel = 'inventory_review_checkin_cancel', // 撤销
-						
-						inventory_review_checkout_audit = 'inventory_review_checkout_audit', // 审核
-						
-						inventory_review_checkout_cancel = 'inventory_review_checkout_cancel', // 撤销
-						
-						inventory_current_add = 'inventory_current_add', // 新增
-						
-						platinum_custom_info_add = 'platinum_custom_info_add', // 新增
-						
-						financing_manager_contract_pay_arrears = 'financing_manager_contract_pay_arrears', // 支付欠款
-						
-						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
-						
-						platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
-						
-						platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
-						
-						platinum_pick_query_upload_logistics = 'platinum_pick_query_upload_logistics', // 上传物流
-						
-						platinum_pick_query_receipt = 'platinum_pick_query_receipt', // 确认收货
-						
-						platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
-						
-						platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
-						
-						platinum_recharge_review_refuse = 'platinum_recharge_review_refuse', // 审核拒绝
-						
-						platinum_withdrawal_review_confirm_withdrawal = 'platinum_withdrawal_review_confirm_withdrawal', // 确认提现
-						
-						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_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
-						
-						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
-						
-						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
-						
-						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
-						
-						platinum_agreement_add = 'platinum_agreement_add', // 新增
-						
-						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
-						
-						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
-						
-						platinum_broker_management = 'platinum_broker_management', // 经纪人管理
-						
-						spot_price_management_normal_add = 'spot_price_management_normal_add', // 新增
-						
-						spot_price_management_disable_add = 'spot_price_management_disable_add', // 新增
-						
-						spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
-						
-						spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
-						
-						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
-						
-						spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
-						
-						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
-						
-						account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
-						
-						account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
-						
-						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
-						
-						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
-						
-						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
-						
-						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
-						
-						account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
-						
-						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
-						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
-						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
-						
-						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
-						
-						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
-						
-						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
-						
-						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
-						
-						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
-						
-						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
-						
-						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
-						
-						sell_pending_funds = 'sell_pending_funds', // 款项登记
-						
-						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
-						
-						sell_pending_storage = 'sell_pending_storage', // 出库登记
-						
-						plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
-						
-						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
-						
-						plan_audit_audit = 'plan_audit_audit', // 审核
-						
-						plan_audit_cancel = 'plan_audit_cancel', // 撤销
-						
-						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
-						
-						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
-						
-						platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
-						
-						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
-						
-						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
-						
-						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
-						
-						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
-						
-						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
-						
-						platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
-						
-						platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
-						
-						platinum_agreement_modify = 'platinum_agreement_modify', // 修改
-						
-						platinum_agreement_stop = 'platinum_agreement_stop', // 停用
-						
-						platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
-						
-						platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
-						
-						platinum_agreement_delete = 'platinum_agreement_delete', // 注销
-						
-						platinum_broker_management_check = 'platinum_broker_management_check', // 审核
-						
-						platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
-						
-						spot_price_management_normal_modify = 'spot_price_management_normal_modify', // 修改
-						
-						spot_price_management_normal_disable = 'spot_price_management_normal_disable', // 停用
-						
-						spot_price_management_disable_modify = 'spot_price_management_disable_modify', // 恢复
-						
-						spot_price_management_disable_disable = 'spot_price_management_disable_disable', // 删除
-						
-						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
-						
-						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
-						
-						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
-						
-						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
-						
-						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
-						
-						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
-						
-						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
-						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
-						
-						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
-						
-						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
-						
-						account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
-						
-						account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改
-						
-						account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
-						
-						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
-						
-		}
+	notice = 'notice',  // 消息
+	logout = 'logout', // 退出登录
+	commomOrder = 'commom-order', // 下单通用界面
+
+	detail = 'detail', // 详情
+	spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
+
+	spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
+
+	spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+
+	spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+
+	spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
+	spot_warrant_bargain_detail = 'spot_warrant_bargain_detail', // 议价单
+
+	spot_warrant_in_and_out_warehouse_sure_pick_up = 'spot_warrant_in_and_out_warehouse_sure_pick_up', // 确认提货
+
+	spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
+
+	spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
+
+	spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
+
+	spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
+
+	pre_sale_warehouse_receipt_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
+
+	pre_sale_warehouse_receipt_pending_order_cancel_order = 'pre_sale_warehouse_receipt_pending_order_cancel_order', // 撤单
+
+	pre_sale_warehouse_receipt_designated_deal_confirm_purchase = 'pre_sale_warehouse_receipt_designated_deal_confirm_purchase', // 确定购买
+
+	pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
+
+	commodity_contract_summary_transfer = 'commodity_contract_summary_transfer', // 转让
+
+	pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
+
+	commodity_contract_commission_cancel_order = 'commodity_contract_commission_cancel_order', // 撤单
+
+	financing_manager_contract_repurchase_warrant = 'financing_manager_contract_repurchase_warrant', // 回购仓单
+
+	commodity_contract_summary_settlement = 'commodity_contract_summary_settlement', // 交收
+
+	financing_manager_apply_cancel = 'financing_manager_apply_cancel', // 撤销
+
+	performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
+
+	performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
+
+	performance_information_buy_performance_settlement = 'performance_information_buy_performance_settlement', // 交收
+
+	performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
+
+	performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
+
+	performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
+
+	performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
+
+	performance_information_sell_performance_settlement = 'performance_information_sell_performance_settlement', // 交收
+
+	funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
+
+	performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
+
+	funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
+
+	spot_trade_warehouse_post_buying = 'spot_trade_warehouse_post_buying', // 挂牌求购
+
+	spot_trade_warehouse_delisting = 'spot_trade_warehouse_delisting', // 摘牌
+
+	spot_trade_warehouse_financing_delisting = 'spot_trade_warehouse_financing_delisting', // 融资摘牌
+
+	spot_trade_warehouse_detail = 'spot_trade_warehouse_detail', // 详情
+
+	open = 'open', // 开仓
+
+	close = 'close', // 平仓
+
+	custom_info_btn_delete = 'custom_info_btn_delete', // 删除
+
+	custom_info_btn_modify = 'custom_info_btn_modify', // 修改
+
+	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', // 修改
+
+	goods_info_hedge_normal_modify = 'goods_info_hedge_normal_modify', // 修改
+
+	goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
+
+	spot_contract_btn_add = 'spot_contract_btn_add', // 新增
+
+	none_btn = 'none_btn', // 按钮
+
+	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', // 新增
+
+	account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
+
+	account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
+
+	account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
+
+	account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
+
+	plan_btn_add = 'plan_btn_add', // 新增
+
+	business_review_someprice_audit = 'business_review_someprice_audit', // 审核
+
+	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', // 撤销
+
+	inventory_review_checkin_audit = 'inventory_review_checkin_audit', // 审核
+
+	inventory_review_checkin_cancel = 'inventory_review_checkin_cancel', // 撤销
+
+	inventory_review_checkout_audit = 'inventory_review_checkout_audit', // 审核
+
+	inventory_review_checkout_cancel = 'inventory_review_checkout_cancel', // 撤销
+
+	inventory_current_add = 'inventory_current_add', // 新增
+
+	platinum_custom_info_add = 'platinum_custom_info_add', // 新增
+
+	financing_manager_contract_pay_arrears = 'financing_manager_contract_pay_arrears', // 支付欠款
+
+	performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
+
+	platinum_pick_goods_management_add = 'platinum_pick_goods_management_add', // 新增
+
+	platinum_pick_query_complete_stocking = 'platinum_pick_query_complete_stocking', // 完成备货
+
+	platinum_pick_query_upload_logistics = 'platinum_pick_query_upload_logistics', // 上传物流
+
+	platinum_pick_query_receipt = 'platinum_pick_query_receipt', // 确认收货
+
+	platinum_pick_query_confirm_pickup = 'platinum_pick_query_confirm_pickup', // 确认取货
+
+	platinum_recharge_review_confirm_payment = 'platinum_recharge_review_confirm_payment', // 确认收款
+
+	platinum_recharge_review_refuse = 'platinum_recharge_review_refuse', // 审核拒绝
+
+	platinum_withdrawal_review_confirm_withdrawal = 'platinum_withdrawal_review_confirm_withdrawal', // 确认提现
+
+	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_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
+
+	platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
+
+	platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
+
+	platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
+
+	platinum_agreement_add = 'platinum_agreement_add', // 新增
+
+	platinum_capital_flow = 'platinum_capital_flow', // 积分流水
+
+	platinum_promotion_report = 'platinum_promotion_report', // 推广报表
+
+	platinum_broker_management = 'platinum_broker_management', // 经纪人管理
+
+	spot_price_management_normal_add = 'spot_price_management_normal_add', // 新增
+
+	spot_price_management_disable_add = 'spot_price_management_disable_add', // 新增
+
+	spot_contract_btn_modify = 'spot_contract_btn_modify', // 重新提交
+
+	spot_contract_btn_delete = 'spot_contract_btn_delete', // 删除
+
+	spot_contract_btn_check = 'spot_contract_btn_check', // 审核
+
+	spot_contract_btn_cancel = 'spot_contract_btn_cancel', // 撤销
+
+	spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
+
+	account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
+
+	account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
+
+	account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
+
+	account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
+
+	account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
+
+	account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
+
+	account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+
+	account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
+
+	account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+
+	account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+
+	purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
+
+	purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
+
+	purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+
+	purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
+
+	purchase_pending_storage = 'purchase_pending_storage', // 入库登记
+
+	sell_pending_someprice = 'sell_pending_someprice', // 点价登记
+
+	sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+
+	sell_pending_funds = 'sell_pending_funds', // 款项登记
+
+	sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+
+	sell_pending_storage = 'sell_pending_storage', // 出库登记
+
+	plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
+
+	plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
+
+	plan_audit_audit = 'plan_audit_audit', // 审核
+
+	plan_audit_cancel = 'plan_audit_cancel', // 撤销
+
+	inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
+
+	inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
+
+	platinum_custom_info_normal_modify = 'platinum_custom_info_normal_modify', // 修改
+
+	platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
+
+	platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
+
+	platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
+
+	platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
+
+	platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
+
+	platinum_contract_goods_modify = 'platinum_contract_goods_modify', // 修改
+
+	platinum_contract_commodity_suspension_modify = 'platinum_contract_commodity_suspension_modify', // 修改
+
+	platinum_agreement_modify = 'platinum_agreement_modify', // 修改
+
+	platinum_agreement_stop = 'platinum_agreement_stop', // 停用
+
+	platinum_agreement_resume = 'platinum_agreement_resume', // 恢复
+
+	platinum_contract_goods_logout = 'platinum_contract_goods_logout', // 注销
+
+	platinum_agreement_delete = 'platinum_agreement_delete', // 注销
+
+	platinum_broker_management_check = 'platinum_broker_management_check', // 审核
+
+	platinum_broker_management_resume = 'platinum_broker_management_resume', // 恢复
+
+	spot_price_management_normal_modify = 'spot_price_management_normal_modify', // 修改
+
+	spot_price_management_normal_disable = 'spot_price_management_normal_disable', // 停用
+
+	spot_price_management_disable_modify = 'spot_price_management_disable_modify', // 恢复
+
+	spot_price_management_disable_disable = 'spot_price_management_disable_disable', // 删除
+
+	platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
+
+	account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
+
+	account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
+
+	account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
+
+	account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
+
+	account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
+
+	account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
+
+	account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
+
+	account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
+
+	account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销
+
+	account_info_futures_btn_child_credit = 'account_info_futures_btn_child_credit', // 授信
+
+	account_info_futures_btn_child_modify = 'account_info_futures_btn_child_modify', // 修改
+
+	account_info_futures_btn_child_cancel = 'account_info_futures_btn_child_cancel', // 注销
+
+	account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
+
+}

src/services/go/wrtrade/interface.ts

@@ -1065,7 +1065,7 @@ export interface QueryOrderQuoteMyqReq {
 
 export interface QueryWrTradeBargainApplyReq {
     userid?: number; // 用户id
-    wrtradeorderid?: number; //关联委托单id
+    wrtradeorderid?: string; //关联委托单id
     haswr: 0 | 1; // 0:仓单预售 1:仓单贸易
 }
 

src/services/proto/WrBargain/index.ts

@@ -0,0 +1,17 @@
+import { protoMiddleware } from "@/services/socket/protobuf/buildReq"
+import { HeadEnum } from "@/services/socket/protobuf/protoHeader"
+import { WrBargainBackReq, WrBargainNoAgreeReq } from "./interface"
+
+/**
+ * 议价申请审核请求
+ */
+export const wrBargainNoAgree = (param: WrBargainNoAgreeReq): Promise<any> => {
+    return protoMiddleware<WrBargainNoAgreeReq>(param, 'WrBargainNoAgreeReq', 'WrBargainNoAgreeRsp', HeadEnum.tradeMode17)
+}
+/**
+ * 议价申请撤回请求
+ */
+export const wrBargainBack = (param: WrBargainBackReq): Promise<any> => {
+    return protoMiddleware<WrBargainBackReq>(param, 'WrBargainBackReq', 'WrBargainBackRsp', HeadEnum.tradeMode17)
+}
+

src/services/proto/WrBargain/interface.ts

@@ -0,0 +1,11 @@
+export interface WrBargainNoAgreeReq {
+    WrBargainID: string; // 申请ID
+    ConfirmQty?: number; // 可接受数量(拒绝时填写)
+    ConfirmPrice?: number; // 可接受价格(拒绝时填写)
+    ConfirmRemark?: string; //  确认备注
+    Status: 1 | 2; // 状态 1 确认 2 拒绝
+}
+
+export interface WrBargainBackReq {
+    WrBargainID: number; // 申请ID
+}

src/services/proto/warehousetrade/index.ts

@@ -1,8 +1,7 @@
 import {
     DeliveryOrderReq,
     HdWRDealOrderReq,
-    HdWROrderReq, PaymentArrearsReq, WarehouseRepurchaseReq, WrBargainNoAgreeReq,
-    WRListingCancelOrderReq, WROutApplyCancelReq,
+    HdWROrderReq, PaymentArrearsReq, WarehouseRepurchaseReq, WRListingCancelOrderReq, WROutApplyCancelReq,
     WROutApplyReq, WROutCancelReq, WROutConfirmReq, WRTradeFinanceBuyCancelReq
 } from "@/services/proto/warehousetrade/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
@@ -104,15 +103,15 @@ export const WROutCancel = (param: WROutCancelReq): Promise<any> => {
  * @param param
  * @constructor
  */
-export const DeliveryOrder = (param: DeliveryOrderReq): Promise<any> =>{
+export const DeliveryOrder = (param: DeliveryOrderReq): Promise<any> => {
     return protoMiddleware<DeliveryOrderReq>(param, 'DeliveryOrderReq', 'DeliveryOrderRsp', HeadEnum.tradeMode17)
 }
 
-/**
- * 议价申请拒绝请求
- * @param param
- * @constructor
- */
-export const WrBargainNoAgree = (param: WrBargainNoAgreeReq): Promise<any> =>{
-    return protoMiddleware<WrBargainNoAgreeReq>(param, 'WrBargainNoAgreeReq', 'WrBargainNoAgreeRsp', HeadEnum.tradeMode17)
-}
+// /**
+//  * 议价申请拒绝请求
+//  * @param param
+//  * @constructor
+//  */
+// export const WrBargainNoAgree = (param: WrBargainNoAgreeReq): Promise<any> =>{
+//     return protoMiddleware<WrBargainNoAgreeReq>(param, 'WrBargainNoAgreeReq', 'WrBargainNoAgreeRsp', HeadEnum.tradeMode17)
+// }

src/services/proto/warehousetrade/interface.ts

@@ -298,18 +298,18 @@ export interface DeliveryOrderDetail {
     WRFactorTypeID: number // uint64 仓单要素类型ID
 }
 
-// 议价申请审核请求 0 29 59
-export interface WrBargainNoAgreeReq {
-    WrBargainID: number // uint64 申请ID
-    ConfirmQty: number // uint64 可接受数量(拒绝时填写)
-    ConfirmPrice: number // double 可接受价格(拒绝时填写)
-    ConfirmRemark: string // string 确认备注
-    Status: number // uint32 状态 1 确认 2 拒绝
-}
-// 议价申请审核响应 0 29 60
-export interface WrBargainNoAgreeRsp {
-    RetCode: number // int32 返回码
-    RetDesc: string // string 描述信息
-}
+// // 议价申请审核请求 0 29 59
+// export interface WrBargainNoAgreeReq {
+//     WrBargainID: number // uint64 申请ID
+//     ConfirmQty: number // uint64 可接受数量(拒绝时填写)
+//     ConfirmPrice: number // double 可接受价格(拒绝时填写)
+//     ConfirmRemark: string // string 确认备注
+//     Status: number // uint32 状态 1 确认 2 拒绝
+// }
+// // 议价申请审核响应 0 29 60
+// export interface WrBargainNoAgreeRsp {
+//     RetCode: number // int32 返回码
+//     RetDesc: string // string 描述信息
+// }
 
 

src/views/order/spot_warran/components/spot_warrant_bargain/components/bargain_detail/index.vue

@@ -1,27 +1,57 @@
 <template>
-  <!-- 现货仓单 现货明细 撤单 -->
-  <div></div>
+  <!-- 现货仓单 议价 议价单 -->
+  <Drawer :title="'议价单'"
+          :placement="'bottom'"
+          :visible="visible"
+          @cancel="cancel"
+          width="566px"
+          height="405px">
+    <a-table :columns="columns"
+             class="expandLeftTable"
+             :pagination="false"
+             :expandIcon="expandIcon"
+             :loading="loading"
+             :expandIconAsCell="false"
+             rowKey="applyprice"
+             :data-source="tableList">
+    </a-table>
+    <div>
+
+      <a-button class="ml10 cancelBtn"
+                v-if="isMy()"
+                @click="cacel">撤销</a-button>
+      <template v-else>
+        <a-button class="listedBtn"
+                  @click="submit">确认</a-button>
+        <a-button class="ml10 cancelBtn"
+                  @click="refuse">拒绝</a-button>
+      </template>
+
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrOrderDetail } from '@/services/go/wrtrade/interface';
-import { getInTaAccount, getUserId } from '@/services/bus/account';
+import { QueryWrPositionReq, QueryWrTradeBargainApplyReq, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { wRListingCancelOrder } from '@/services/proto/warehousetrade';
+import { hdWROrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { queryTableList } from '@/common/setup/table';
+import { queryQueryWrTradeBargainApply } from '@/services/go/wrtrade';
+import { getSpotWarrantBargainDetailColumns } from '../../setup';
+import { wrBargainNoAgree, wrBargainBack } from '@/services/proto/WrBargain';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { WRListingCancelOrderReq } from '@/services/proto/warehousetrade/interface';
-import * as Long from 'long';
-import { getLongTypeLoginID } from '@/services/bus/login';
-import { Modal } from 'ant-design-vue';
-import Bus from '@/utils/eventBus/index';
+import { WrBargainBackReq, WrBargainNoAgreeReq } from '@/services/proto/WrBargain/interface';
+import Long from 'long';
 
 export default defineComponent({
-    name: ModalEnum.spot_warrant_pending_order_cancel_order,
+    name: ModalEnum.spot_warrant_bargain_detail,
     components: { Drawer },
     emits: ['cancel', 'update'],
     props: {
@@ -31,42 +61,150 @@ export default defineComponent({
         },
     },
     setup(props, context) {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
         const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-
+        const { wrtradeorderid } = props.selectedRow;
+        const param: QueryWrTradeBargainApplyReq = {
+            haswr: 1,
+            wrtradeorderid: wrtradeorderid,
+        };
+        queryTable(queryQueryWrTradeBargainApply, param);
+        // 我对别人的 => 撤销
+        // 别人对我的 => 确认、拒绝
+        const { isMy, getColums } = getSpotWarrantBargainDetailColumns(props.selectedRow);
+        // 确认
         function submit() {
-            const param: WRListingCancelOrderReq = {
-                UserID: getUserId(), // uint32 用户ID
-                AccountID: getInTaAccount(), // uint64 资金账号
-                OldWRTradeOrderID: Long.fromString(props.selectedRow.wrtradeorderid), // uint64 目标仓单贸易委托单ID
-                OrderSrc: 1, // uint32 委托来源
-                ClientSerialNo: uuidv4(), // string 客户端流水号
-                ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
-                ClientType: 4, // uint32 终端类型
-                OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
-                BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
-                WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
+            const param: WrBargainNoAgreeReq = {
+                WrBargainID: Long.fromString(wrtradeorderid),
+                Status: 1,
             };
-            requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
-                Bus.$emit('spotTrade', true);
+            requestResultLoadingAndInfo(wrBargainNoAgree, param, loading, ['确认成功', '确认失败:']).then(() => {
+                cancel(true);
+            });
+        }
+        // 拒绝
+        function refuse() {
+            const param: WrBargainNoAgreeReq = {
+                WrBargainID: Long.fromString(wrtradeorderid),
+                Status: 2,
+            };
+            requestResultLoadingAndInfo(wrBargainNoAgree, param, loading, ['拒绝成功', '拒绝失败:']).then(() => {
+                cancel(true);
+            });
+        }
+        // 撤销
+        function cacel() {
+            const param: WrBargainBackReq = {
+                WrBargainID: Long.fromString(wrtradeorderid),
+            };
+            requestResultLoadingAndInfo(wrBargainBack, param, loading, ['撤销成功', '撤销失败:']).then(() => {
                 cancel(true);
             });
         }
-
-        Modal.confirm({
-            title: '撤单',
-            content: '是否确认撤单?',
-            onOk: submit,
-            onCancel: cancel,
-        });
-
         return {
-            visible,
-            cancel,
+            visible: true,
+            columns: getColums(),
+            loading,
+            tableList,
+            isMy,
+            submit,
+            refuse,
+            cacel,
         };
     },
 });
 </script>
 
 <style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    overflow: hidden;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            min-width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 70px;
+    .ant-progress-outer {
+        margin-right: 0;
+        padding-right: 0;
+        .ant-progress-inner {
+            background: @m-grey14;
+            .rounded-corners(2px);
+            .ant-progress-bg {
+                height: 3px !important;
+                border-radius: 2px !important;
+                background-color: @m-blue0;
+            }
+        }
+    }
+    .ant-progress-text {
+        display: none;
+    }
+}
+.unit {
+    margin-left: 80px;
+    .flex;
+    justify-content: space-between;
+    font-size: 14px;
+    color: @m-grey41;
+    height: 14px;
+    line-height: 14px;
+}
+.listedBtn {
+    width: 120px;
+    height: 30px;
+    line-height: 30px;
+    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+    border-radius: 3px;
+    color: @m-white0;
+    font-size: 14px;
+    text-align: center;
+    border: 0;
+    &:hover {
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
+        color: @m-white0-hover;
+    }
+}
+.cancelBtn:extend(.listedBtn) {
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
+    &:hover {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
+        color: @m-white0-hover;
+    }
+}
+.ml10 {
+    margin-left: 10px;
+}
 </style>;

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

@@ -62,7 +62,7 @@ export default defineComponent({
     name: enumOrderComponents.spot_warrant_pending_order,
     components: {
         BtnList,
-        detail: defineAsyncComponent(() => import('./components/bargain_detail/index.vue')),
+        spot_warrant_bargain_detail: defineAsyncComponent(() => import('./components/bargain_detail/index.vue')),
     },
     setup() {
         // 表格列表数据

src/views/order/spot_warran/components/spot_warrant_bargain/setup.ts

@@ -1,3 +1,6 @@
+import { getUserId } from "@/services/bus/account";
+import { WrOrderDetail } from "@/services/go/wrtrade/interface";
+
 export function getSpotWarrantBargainColumns() {
     const columns = [
         { title: '挂牌方', key: 'matchusername', align: 'center', width: 120 },
@@ -16,4 +19,20 @@ export function getSpotWarrantBargainColumns() {
         const slots = { customRender: el.key };
         return { ...el, slots, dataIndex: el.key };
     })
+}
+
+export function getSpotWarrantBargainDetailColumns(selectedRow: WrOrderDetail) {
+    const columns = [
+        { title: '数量', key: 'applyqty', dataIndex: 'applyqty', align: 'center' },
+        { title: '价格', key: 'applyprice', dataIndex: 'applyprice', align: 'center' },
+        { title: '时间', key: 'applytime', dataIndex: 'applytime', align: 'center', slots: { customRender: 'applytime' } },
+        { title: '状态', key: 'applystatus', dataIndex: 'applystatus', align: 'center' },
+    ];
+    function isMy() {
+        return selectedRow.userid === getUserId();
+    }
+    function getColums() {
+        return isMy() ? columns : [...columns, { title: '议价人', key: 'username', dataIndex: 'username', align: 'center' }]
+    }
+    return { isMy, getColums }
 }