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

generate-code/pc_menu_企业风管.json

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

public/proto/mtp.proto

@@ -1579,3 +1579,69 @@ message DGFactoryItems {
 }
 
 
+// 仓单出库申请 0 29 113
+message WROutApplyReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 ClientSerialID = 2; // uint64 客户端唯一ID
+ optional uint64 WRStandardID = 3; // uint64 仓单标准ID
+ optional uint64 WarehouseID = 4; // uint64 仓库ID
+ optional uint64 UserID = 5; // uint64 申请人ID
+ optional uint64 AccountID = 6; // uint64 申请人账户ID
+ optional string Mobile = 7; // string 申请人手机号
+ optional string AppointmentDate = 8; // string 预约出库时间（格式：20200101）
+ optional uint32 AppointmentModel = 9; // uint32 预约方式:1-物流,2-自送，3-自提
+  optional uint64 CountryID = 10; // uint64 国家
+  optional uint64 ProvinceID = 11; // uint64 省
+  optional uint64 DistrictID = 12; // uint64 区
+  optional uint64 CityID = 13; // uint64 市
+  optional string Address = 14; // string 详细地址
+  optional string ContactName = 15; // string 收货人提货人
+  optional string ContactNum = 16; // string 收货人提货人手机
+  optional string AppointmentRemark = 17; // string 预约备注
+ optional uint64 CreatorID = 18; // uint64 创建人ID
+ repeated WROutInDetail WROutInDetails = 19; // WROutInDetail 仓单出库提单明细数据
+}
+// 仓单出库申请响应 0 29 114
+message WROutApplyRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
+ optional uint64 ClientSerialID = 4; // uint64 客户端唯一ID
+}
+
+// 仓单出库提单明细数据 0 29 112
+message WROutInDetail {
+  optional string LadingBillID = 1; // string 提单ID
+  optional uint64 SubNum = 2; // uint64 提单子单号
+  optional uint64 Qty = 3; // uint64 子提单总数量
+  optional uint64 OutQty = 4; // uint64 预约数量
+}
+
+// 挂牌撤单请求 0 22 4
+message WRListingCancelOrderReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint32 UserID = 2; // uint32 用户ID
+ optional uint64 AccountID = 3; // uint64 资金账号
+ optional uint64 OldWRTradeOrderID = 4; // uint64 目标仓单贸易委托单ID
+ optional uint32 OrderSrc = 5; // uint32 委托来源
+ optional string ClientSerialNo = 6; // string 客户端流水号
+ optional string ClientOrderTime = 7; // string 客户端委托时间
+ optional uint32 ClientType = 8; // uint32 终端类型
+ optional uint64 OperatorID = 9; // uint64 操作员账号ID
+ optional uint32 BuyOrSell = 10; // uint32 买卖方向
+ optional uint64 WRID = 11; // uint64 仓单ID,卖的时候填写
+}
+// 挂牌撤单应答 0 22 5
+message WRListingCancelOrderRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
+ optional uint64 WRTradeCancelID = 4; // uint64 仓单贸易撤单号
+ optional uint64 OldWRTradeOrderID = 5; // uint64 目标仓单贸易委托单ID
+ optional uint32 UserID = 6; // uint32 用户ID
+ optional uint64 AccountID = 7; // uint64 资金账号
+ optional uint64 CancelQty = 8; // uint64 撤单数量
+ optional string OrderTime = 9; // string 接受撤单的时间
+ optional string ClientSerialNo = 10; // string 客户端流水号
+}
+

src/common/components/drawer/index.vue

@@ -1,19 +1,23 @@
 <template>
-    <div class="drawer">
-        <a-drawer :placement="placement" :closable="false" :visible="visible" class="bottomListed">
-            <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
-            <div class="collapse" @click="cancel"></div>
-            <div class="collapseCont">
-                <!-- <div class="title">{{ title }}</div> -->
-                <div class="content highContent">
-                    <!-- <Listed></Listed> -->
-                    <!-- <Delisting></Delisting> -->
-                    <slot></slot>
-                    <!-- <Trade></Trade> -->
-                </div>
-            </div>
-        </a-drawer>
-    </div>
+  <div class="drawer">
+    <a-drawer :placement="placement"
+              :closable="false"
+              :visible="visible"
+              class="bottomListed">
+      <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
+      <div class="collapse"
+           @click="cancel"></div>
+      <div class="collapseCont">
+        <div class="title">{{ title }}</div>
+        <div class="content highContent">
+          <!-- <Listed></Listed> -->
+          <!-- <Delisting></Delisting> -->
+          <slot></slot>
+          <!-- <Trade></Trade> -->
+        </div>
+      </div>
+    </a-drawer>
+  </div>
 </template>
 
 <script lang="ts">

src/common/constants/enumOrderComponents.ts

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

src/common/constants/enumRouterName.ts

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

src/common/constants/modalNameEnum.ts

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

src/common/methods/table/interface.ts

@@ -16,8 +16,7 @@
 		render?: Function;
 		customRender?: Function;
 	}
-	export interface TableKey {table_pcweb_delivery:string, // 现货合同
-table_pcweb_userinfo:string, // 客户资料
+	export interface TableKey {table_pcweb_userinfo:string, // 客户资料
 table_pcweb_warehouse:string, // 仓库信息
 table_pcweb_purchase_pointprice:string, // 采购_待点价
 table_pcweb_purchase_settle:string, // 采购_履约交收
@@ -72,25 +71,38 @@ table_pcweb_financial_statement_brand_details:string, // 报表-财务报表-品
 table_pcweb_futures_statement_account_details:string, // 报表-期货报表-账户明细
 table_pcweb_inventory_commodity_report_brand_details:string, // 报表-库存（商品）报表-品牌明细
 table_pcweb_inventory_commodity_report_warehouse_details:string, // 报表-库存（商品）报表-仓库明细
+table_pcweb_delivery:string, // 现货合同
 table_pcweb_inventory_warehouse_report_warehouse_details:string, // 报表-库存（仓库）报表-仓库明细
 table_pcweb_inventory_summary_profit_and_loss_details:string, // 报表-汇总损益报表-损益明细
 table_pcweb_qhj_recharge_review:string, // 铂金宝-充值提现审核-充值审核
 table_pcweb_qhj_withdrawal_review:string, // 铂金宝-充值提现审核-提现审核
-table_pcweb_qhj_pickup_query:string, // 铂金宝-提货查询
-table_pcweb_qhj_fixed_investment_price_query:string, // 铂金宝-定投价查询
 table_pcweb_qhj_fixed_investment_plan_query:string, // 铂金宝-定投查询-定投计划查询
 table_pcweb_qhj_fixed_investment_flow_query:string, // 铂金宝-定投查询-定投流水查询
 table_pcweb_qhj_fixed_financing_information:string, // 铂金宝-融资信息
 table_pcweb_qhj_customer_info:string, // 铂金宝-客户资料
 table_pcweb_qhj_holder_order:string, // 铂金宝-单据查询-持仓单
 table_pcweb_qhj_order:string, // 铂金宝-单据查询-委托单
+table_pcweb_qhj_pay_bill:string, // 铂金宝-单据查询-待付单
+table_pcweb_qhj_deal_order:string, // 铂金宝-单据查询-成交单
+table_pcweb_spot_and_price:string, // 铂金宝-现货市价
 table_pcweb_agreement:string, // 铂金宝-协议管理
 table_pcweb_spot_trade_warehouse_price:string, // 现货贸易-仓单贸易-一口价
 table_pcweb_spot_trade_warehouse_float:string, // 现货贸易-仓单贸易
 table_pcweb_spot_trade_warehouse_sale_price:string, // 现货贸易-仓单预售
 table_pcweb_spot_trade_warehouse_sale_float:string, // 现货贸易-仓单预售
+table_pcweb_spot_trade_warehouse_price_trading_hall_sale:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_spot_trade_warehouse_price_trading_hall_buy:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_spot_trade_warehouse_float_trading_hall_sale:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_qhj_pickup_query:string, // 铂金宝-提货查询
+table_pcweb_qhj_fixed_investment_price_query:string, // 铂金宝-定投价查询
+table_pcweb_spot_trade_warehouse_float_trading_hall_buy:string, // 现货贸易-仓单贸易-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_price_trading_hall_sale:string, // 现货贸易-仓单预售-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_price_trading_hall_buy:string, // 现货贸易-仓单预售-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_float_trading_hall_sale:string, // 现货贸易-仓单预售-买卖大厅
+table_pcweb_spot_trade_warehouse_presale_float_trading_hall_buy:string, // 现货贸易-仓单预售-买卖大厅
 table_pcweb_spot_trade_bottom_spot_warrant_spot_summary:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_inventory_summary:string, // 底部栏-现货仓单
+table_pcweb_spot_trade_bottom_spot_warrant_spot_detail:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_pending_order:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_deal:string, // 底部栏-现货仓单
 table_pcweb_spot_trade_bottom_spot_warrant_designated_deal:string, // 底部栏-现货仓单
@@ -104,8 +116,5 @@ table_pcweb_spot_trade_bottom_commodity_contract_settlement:string, // 底部栏
 table_pcweb_spot_trade_bottom_performance_info_buy:string, // 底部栏-履约信息
 table_pcweb_spot_trade_bottom_performance_info_sale:string, // 底部栏-履约信息
 table_pcweb_spot_trade_bottom_funding_info_summary:string, // 底部栏-资金信息
-table_pcweb_spot_trade_bottom_funding_info_log:string, // 底部栏-资金信息
-table_pcweb_qhj_pay_bill:string, // 铂金宝-单据查询-待付单
-table_pcweb_qhj_deal_order:string, // 铂金宝-单据查询-成交单
-table_pcweb_spot_and_price:string, // 铂金宝-现货市价 
+table_pcweb_spot_trade_bottom_funding_info_log:string, // 底部栏-资金信息 
  }

src/common/setup/asyncComponent/index.ts

@@ -20,6 +20,7 @@ export function handleModalComponent<T>(callback: Function, selectedRow: Ref<T>)
      * @param record
      */
     function openComponent(item: btnType, record: T) {
+        console.log('打开组件: ', item.code)
         // 更新点击的数据，处理例如，修改之后，再次打开页面是之前的数据的问题
         if (record && selectedRow) {
             selectedRow.value = record

src/common/setup/order/orderData.ts

@@ -50,6 +50,7 @@ export function handleOrderDetailList(code: enumOrderComponents) {
     // 切换tab组件
     function changeTab(index: number, item: OperationTabMenu) {
         recordItemTab.value = item.children
+        console.log('当前底部组件名：', item.code)
         componentId.value = item.code as unknown as enumOrderComponents
     }
     filerAction()

src/layout/components/bottom.vue

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

src/services/funcode/index.ts

@@ -158,9 +158,17 @@ export const funCode: Code = {
     QHJAgreementConfigOperateReq: 1900733,  /// 协议操作请求
     QHJAgreementConfigOperateRsp: 1900734,  /// 协议操作响应
 
+    // 仓单贸易
+
     HdWROrderReq: 1441807,  ///  持仓单挂牌请求
     HdWROrderRsp: 1441808,  ///  持仓单挂牌应答
 
     HdWRDealOrderReq: 1441809, ///  持仓单摘牌请求
     HdWRDealOrderRsp: 1441810, ///  持仓单摘牌应答
+
+    WROutApplyReq: 1900657, //// 仓单出库申请
+    WROutApplyRsp: 1900658,  /// 仓单出库申请响应
+
+    WRListingCancelOrderReq: 1441796, // 挂牌撤单请求
+    WRListingCancelOrderRsp: 1441797, // 挂牌撤单应答
 };

src/services/go/TaAccount/index.ts

@@ -1,9 +1,11 @@
 import APP from '@/services';
 import { getLongTypeLoginID } from "@/services/bus/login";
 import { commonSearch_go } from "..";
+import {ErmcpBizGroupEx} from "@/services/go/ermcp/account/interface";
+import {GetTaAccountsReq, QueryAmountLogReq, QueryAmountLogRsp, Taaccount} from "@/services/go/TaAccount/interface";
 
 /**
- * 
+ *  获取资金账户信息
  */
 export function getTaAccount() {
     const loginID = getLongTypeLoginID()?.toNumber()
@@ -11,4 +13,26 @@ export function getTaAccount() {
         APP.set('accountList', res);
         return 'ok'
     }).catch(err => { throw new Error(`获取资金账户信息失败：${err}`) })
+}
+
+/**
+ * /TaAccount/QueryAmountLog
+ * 资金流水查询（当前）
+ * @param req
+ */
+export function queryAmountLog(req: QueryAmountLogReq) : Promise<QueryAmountLogRsp> {
+    return commonSearch_go('/TaAccount/QueryAmountLog', { req }).catch((err) => {
+        throw new Error(`资金流水查询（当前）: ${err}`);
+    });
+}
+
+/**
+ * /TaAccount/GetTaAccounts
+ * 获取资金账户信息
+ * @param req
+ */
+export function getTaAccounts(req: GetTaAccountsReq): Promise<Taaccount> {
+    return commonSearch_go('/TaAccount/GetTaAccounts', { req }).catch((err) => {
+        throw new Error(`获取资金账户信息: ${err}`);
+    });
 }

src/services/go/TaAccount/interface.ts

@@ -0,0 +1,184 @@
+export interface QueryAmountLogReq {
+    page?: number               // 页码
+    pagesize?: number           // 每页条数
+    accountID: string           // 资金账户 - 格式：1,2,3
+    OperateType?: number        // 资金操作类型 - 格式：1,2,3
+}
+
+export interface QueryAmountLogRsp{
+    OPERATETYPENAME	:string;//资金操作类型名称
+    accountid	:number;//资金账户ID
+    agoodscode	:string;//竞拍商品代码
+    agoodsname	:string;//竞拍商品名称
+    amount	:number;//资金金额
+    amountadjusttype	:number;//资金调整类型(默认值为number;
+//) - number;
+//：系统 1:单边账调整 2:人工调整
+    autoid	:number;//流水ID(22number;
+//+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    balance	:number;//期初余额
+    businesscode	:number;//业务编号
+    createtime	:string;//发生时间
+    currencyid	:number;//币种ID
+    currentbalance	:number;//期末余额(变动后金额)
+    dgoodscode	:string;//交割商品代码
+    dgoodsname	:string;//交割商品名称
+    goodscode	:string;//商品代码
+    goodsid	:number;//商品ID
+    goodsname	:string;//商品名称
+    marketid	:number;//市场ID
+    marketname	:string;//市场名称
+    moneyticket	:number;//资金流水号：银行端流水号
+    operatetype	:number;//资金操作类型 (AccountFundCmdOp)- 1number;
+//1:入金 1number;
+//2:入金手续费 1number;
+//3:出金 1number;
+//4:出金冻结 1number;
+//5:出金解冻 1number;
+//6:出金手续费 1number;
+//7:出金手续费冻结 1number;
+//8:出金手续费解冻 2number;
+//1:交易冻结 2number;
+//2:交易解冻 2number;
+//3:交易占用 2number;
+//4:交易解占用 2number;
+//5:交易手续费冻结 2number;
+//6:交易手续费解冻 2number;
+//7:交易手续费 2number;
+//8:交易货款 2number;
+//9:交易盈亏 3number;
+//1:交割冻结 3number;
+//2:交割解冻 3number;
+//3:交割手续费 3number;
+//4:交割手续费冻结 3number;
+//5:交割手续费解冻 3number;
+//6:交割货款 3number;
+//7:交割税款 4number;
+//1:结算盈亏 4number;
+//2:结算递延费 4number;
+//3:分润收入 4number;
+//4:延期分润 5number;
+//1:授信增加 5number;
+//2:授信减少 5number;
+//3:转积分 5number;
+//4:转入 5number;
+//5:转出 5number;
+//6:转出冻结 5number;
+//7:转出解冻 6number;
+//1:履约金额冻结 6number;
+//2:履约最大冻结 6number;
+//3:履约金额解冻 6number;
+//4:履约扣款 6number;
+//5:履约收款 6number;
+//6:履约违约手续费 6number;
+//7:履约违约收入 6number;
+//8:履约最大扣款 7number;
+//1:供应链金融冻结 7number;
+//2:供应链金融解冻 7number;
+//3:供应链金融最大冻结 7number;
+//4:供应链金融利息 7number;
+//5:供应链金融货款 7number;
+//6:供应链金融押金 7number;
+//7:供应链金融最大扣款 8number;
+//1:仓单贸易冻结 8number;
+//2:仓单贸易解冻 8number;
+//3:仓单贸易首付款 8number;
+//4:仓单贸易最大扣款 9number;
+//1:商城扣款冻结 9number;
+//2:商城扣款解冻 9number;
+//3:商城扣款 9number;
+//4:商城收款 1number;
+//number;
+//1:期权冻结 1number;
+//number;
+//2:期权解冻 1number;
+//number;
+//3:期权权力金 1number;
+//number;
+//4:期权手续费冻结 1number;
+//number;
+//5:期权手续费解冻 1number;
+//number;
+//6:期权手续费 1number;
+//number;
+//7:期权盈亏 11number;
+//1:营销扣款 11number;
+//2:营销收款
+    relationorderid	:string;//关联单号
+    remark	:string;//备注
+    trademode	:number;//交易模式
+}
+
+
+/**
+ * 获取资金账户信息
+ */
+export interface GetTaAccountsReq {
+    loginID: number//               登录账户
+    taAccountType?: number//        账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+}
+
+
+export interface Taaccount{
+    accountflag	:number;//账户标识 - number;
+//\1 (默认为number;
+//， 当上级账户与本账户的关联用户均为自己时更新为1)
+    accountid	:number;//资金账户ID
+    accountname	:string;//账户名称
+    balance	:number;//期初余额
+    capitalbalance	:number;//本金余额[外部子账户实际出入金余额]
+    changeflag	:number;//变动标志(当前账户资金有任何变动更新为1系统结算时更新number;
+//;供清算时使用) number;
+//：无变动 1：有变动
+    changetime	:string;//账户状态变更时间
+    closepl	:number;//今日平仓盈亏
+    creditdecrease	:number;//今日授信减少
+    creditincrease	:number;//今日授信增加
+    curamount	:number;//总市值(从持仓中统计)
+    currencyid	:number;//货币ID
+    currentbalance	:number;//期末余额
+    freezecharge	:number;//手续费冻结
+    freezemargin	:number;//冻结保证金
+    fromaccountid	:number;//所属上级账户
+    inamount	:number;//今日入金金额(包括三方入金)
+    ismain	:number;//是否母账号 number;
+//:不是母账户 1:是母账户
+    ismarketaccount	:number;//是否机构接单账号 number;
+//:不是 1:是
+    isreckonaccount	:number;//是否机构分润账号 number;
+//:不是 1:是
+    mortgagecredit	:number;//授信金额
+    orifreezecharge	:number;//期初手续费冻结
+    orifreezemargin	:number;//期初冻结保证金
+    orimortgagecredit	:number;//期初授信金额
+    oriothercredit	:number;//期初其它授信金额
+    oriotherfreezemargin	:number;//期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    orioutamountfreeze	:number;//期初出金冻结
+    oriusedmargin	:number;//期初占用保证金
+    othercredit	:number;//其它授信金额
+    othercreditdecrease	:number;//今日其它授信减少
+    othercreditincrease	:number;//今日其它授信增加
+    otherfreezemargin	:number;//其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+    otherincome	:number;//其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+    otherpay	:number;//其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+    outamount	:number;//今日出金金额(包括三方出金)
+    outamountfreeze	:number;//出金冻结
+    outthreshold	:number;//出金阈值
+    parentaccountid	:number;//所属根账号
+    paycharge	:number;//今日手续费支出
+    relatedaccountstatus	:number;//关联用户交易权限状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)
+    relateduserid	:number;//关联用户
+    remainamount	:number;//融资额(从融资合同中统计)
+    serivcegroup	:number;//服务分组
+    signstatus	:number;//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+    sublevelpath	:string;//账号层级路径(逗号分隔,首尾加逗号)
+    taaccounttype	:number;//账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+    thirdinamount	:number;//今日三方入金
+    thirdoutamount	:number;//今日三方出金
+    tradestatus	:number;//交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+    tradestatuschangetime	:string;//激活时间
+    transferamount	:number;//今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+    usedmargin	:number;//占用保证金
+    userid	:number;//用户ID
+}

src/services/go/wrtrade/index.ts

@@ -1,24 +1,37 @@
 /** ================================= 仓单贸易v2 ================================**/
 
+import { getSelectedAccountId } from "@/services/bus/account";
 import { getUsrId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
-    QueryOrderQuoteDetailReq,
-    QueryOrderQuoteReq,
+    QueryFilterItemReq, QueryOrderQuoteDetailReq,
+    QueryOrderQuoteReq, QueryPerformancePlanReq,
     QueryWrGoodsInfoReq,
     QueryWrOrderDetailReq,
     QueryWrPositionReq, QueryWrSpecialMatchOrderReq,
-    QueryWrTradeDetailReq,
-    WrGoodsInfo,
+    QueryWrTradeDetailReq, WrFilterItem,
+    WrGoodsInfo, WrHoldLB,
     WrOrderDetail,
     WrOrderQuote,
-    WrOrderQuoteDetail,
+    WrOrderQuoteDetail, WrPerformancePlan,
     WrPosition, WrSpecialMatchOrder,
     WrTradeDetail
 } from "@/services/go/wrtrade/interface";
 
 
 /**
+ * 查询筛选框列表  /WrTrade2/QueryFilterItem
+ * 页面 - 一口价挂牌 - 上方品类 ｜ 仓库 下拉框数据获取
+ * @param req
+ */
+export function queryFilterItem(req: QueryFilterItemReq): Promise<WrFilterItem[]> {
+    return commonSearch_go('/WrTrade2/QueryFilterItem', req).catch((err) => {
+        throw new Error(`查询筛选框列表: ${err}`);
+    });
+}
+
+
+/**
  * 查询大厅行情列表 /WrTrade2/QueryOrderQuote
  * @param req
  */
@@ -43,7 +56,7 @@ export function queryOrderQuoteDetail(req: QueryOrderQuoteDetailReq): Promise<Wr
  * @param req
  */
 export function queryWrGoodsInfo(req: QueryWrGoodsInfoReq): Promise<WrGoodsInfo[]> {
-    return commonSearch_go('/WrTrade2/QueryWrGoodsInfo', { req }).catch((err) => {
+    return commonSearch_go('/WrTrade2/QueryWrGoodsInfo', req).catch((err) => {
         throw new Error(`查询仓单商品信息: ${err}`);
     });
 }
@@ -77,7 +90,8 @@ export function queryWrPosition(req: QueryWrPositionReq): Promise<WrPosition[]>
  * 页面 现货仓单 | 预售仓单 -> 指定成交
  */
 export function queryWrSpecialMatchOrder(req: QueryWrSpecialMatchOrderReq): Promise<WrSpecialMatchOrder[]> {
-    return commonSearch_go('/WrTrade2/QueryWrSpecialMatchOrder', { req }).catch((err) => {
+    req.userid = getUsrId();
+    return commonSearch_go('/WrTrade2/QueryWrSpecialMatchOrder', req).catch((err) => {
         throw new Error(`查询指定成交: ${err}`);
     });
 }
@@ -89,4 +103,27 @@ export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeD
     return commonSearch_go('/WrTrade2/QueryWrTradeDetail', req).catch((err) => {
         throw new Error(`查询仓单成交明细: ${err}`);
     });
-}
+}
+
+/**
+ * 查询仓单持有记录 /WrTrade2/QueryHoldLB
+ * 页面 现货仓单 -> 现货明细
+ * @param req
+ */
+export function queryHoldLB(): Promise<WrHoldLB[]> {
+    const accountid = Number(getSelectedAccountId())
+    return commonSearch_go('/WrTrade2/QueryHoldLB', { accountid }).catch((err) => {
+        throw new Error(`查询仓单持有记录: ${err}`);
+    });
+}
+
+/**
+ * 查询履约信息 /WrTrade2/QueryPerformancePlan
+ */
+export function QueryPerformancePlan(req: QueryPerformancePlanReq): Promise<WrPerformancePlan[]> {
+    req.userid = getUsrId();
+    return commonSearch_go('/WrTrade2/QueryPerformancePlan', req).catch((err) => {
+        throw new Error(`查询履约信息: ${err}`);
+    });
+}
+

src/services/go/wrtrade/interface.ts

@@ -130,7 +130,7 @@ export interface WrOrderDetail {
  */
 export interface QueryWrPositionReq {
     userid?: number //       用户id
-    querytype: 1 | 2 | 3 //    查询类型 1-现货汇总 2-库存汇总(订单汇总) 3-现货明细
+    querytype: 1 | 2 //    查询类型 1-现货汇总 2-库存汇总(订单汇总)
 }
 
 /**
@@ -233,20 +233,20 @@ export interface QueryWrGoodsInfoReq {
  * 履约规则
  */
 export interface WrGoodsPerformanceStep {
-    autoid  :number;//AutoID
-    isauto  :number;//是否自动 - number;
-//:不自动 1:自动
-    remark  :string;//备注
-    stepdate        :string;//天数信息(T+N)
-    stepdays        :number;//距离上一步天数
-    stepindex       :number;//步骤序号
-    stepinfo        :string;//步骤信息(步骤名称+步骤值)
-    steptypeid      :number;//履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结 1number;
-//:货款溢短 11:生成合同[中江] 12:运费 9number;
-//:确认支付 91. 确认放行 92买方支付(直接扣款) 用于-1模板“
-    steptypename    :string;//步骤名称
-    stepvalue       :number;//步骤值
-    templateid      :number;//履约计划模板ID
+    autoid: number;//AutoID
+    isauto: number;//是否自动 - number;
+    //:不自动 1:自动
+    remark: string;//备注
+    stepdate: string;//天数信息(T+N)
+    stepdays: number;//距离上一步天数
+    stepindex: number;//步骤序号
+    stepinfo: string;//步骤信息(步骤名称+步骤值)
+    steptypeid: number;//履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结 1number;
+    //:货款溢短 11:生成合同[中江] 12:运费 9number;
+    //:确认支付 91. 确认放行 92买方支付(直接扣款) 用于-1模板“
+    steptypename: string;//步骤名称
+    stepvalue: number;//步骤值
+    templateid: number;//履约计划模板ID
 }
 
 
@@ -254,18 +254,18 @@ export interface WrGoodsPerformanceStep {
  * 商品信息项
  */
 export interface WrTypeItem {
-    name    :string;//名称
-    value   :string;//值
+    name: string;//名称
+    value: string;//值
 }
 
 /**
  *  查询仓单商品信息返回
  */
 export interface WrGoodsInfo {
-    haswr : number              //              0:仓单预售 1:仓单贸易
-    lstitem : WrTypeItem[] //                   商品信息项
-    lststep : WrGoodsPerformanceStep[]//        履约规则
-    marketid : number//                         市场id
+    haswr: number              //              0:仓单预售 1:仓单贸易
+    lstitem: WrTypeItem[] //                   商品信息项
+    lststep: WrGoodsPerformanceStep[]//        履约规则
+    marketid: number//                         市场id
 }
 
 /**
@@ -275,7 +275,7 @@ export interface QueryWrSpecialMatchOrderReq {
     page?: number           //   页码
     pagesize?: number       //   每页条数
     marketid?: number       //   用户id
-    userid: number          //   仓单贸易市场id
+    userid?: number          //   仓单贸易市场id
     haswr: number           //   0:仓单预售 1:仓单贸易
 }
 
@@ -283,43 +283,172 @@ export interface QueryWrSpecialMatchOrderReq {
  * 查询指定成交返回
  */
 export interface WrSpecialMatchOrder {
-    amount	:number;//金额 = 数量  价格
-    buyorsell	:number;//买卖 - number;
-//:买 1:卖(挂牌类型 买为采购 卖为销售)
-    cancelqty	:number;//撤销数量
-    deliverygoodscode	:string;//品种代码
-    deliverygoodsid	:number;//品种ID
-    deliverygoodsname	:string;//品种名称
-    enumdicname	:string;//单位名称
-    fixedprice	:number;//固定价格(价格)
-    haswr	:number;//是否有仓单-卖方 - number;
-//:无仓单 1:有仓单
-    marketid	:number;//市场ID
-    matchuserid	:number;//指定方资金账号(字段名为userid，实际存的是accountid by:邓工)
-    matchusername	:string;//指定方
-    optioncompare	:string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
-    orderqty	:number;//委托数量
-    ordertime	:string;//委托时间
-    pricemove	:number;//升贴水(浮动价时填写) - [挂牌]
-    tradedate	:string;//交易日(yyyyMMdd)
-    tradeprice	:number;//成交价格
-    tradeqty	:number;//成交数量
-    userid	:number;//用户ID
-    username	:string;//发起方
-    warehouseid	:number;//仓库ID
-    warehousename	:string;//仓库名称
-    wrfactortypeid	:number;//仓单要素类型ID(212+Unix秒时间戳(1number;
-//位)+xxxxxx)
-    wrfactortypename	:string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
-    wrpricetype	:number;//价格方式 - 1:固定价 2-浮动价 - [挂牌]
-    wrstandardcode	:string;//现货商品代码
-    wrstandardid	:number;//现货商品ID
-    wrstandardname	:string;//商品名称
-    wrtradeorderid	:string;//仓单贸易委托单ID(32number;
-//+Unix秒时间戳(1number;
-//位)+xxxxxx)
-    wrtradeorderstatus	:number;//委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 1number;
-//:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
-    wrtradetype	:number;//仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
-    wrtypename	:string;//商品
-}
+    amount: number;//金额 = 数量  价格
+    buyorsell: number;//买卖 - number;
+    //:买 1:卖(挂牌类型 买为采购 卖为销售)
+    cancelqty: number;//撤销数量
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    enumdicname: string;//单位名称
+    fixedprice: number;//固定价格(价格)
+    haswr: number;//是否有仓单-卖方 - number;
+    //:无仓单 1:有仓单
+    marketid: number;//市场ID
+    matchuserid: number;//指定方资金账号(字段名为userid，实际存的是accountid by:邓工)
+    matchusername: string;//指定方
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    orderqty: number;//委托数量
+    ordertime: string;//委托时间
+    pricemove: number;//升贴水(浮动价时填写) - [挂牌]
+    tradedate: string;//交易日(yyyyMMdd)
+    tradeprice: number;//成交价格
+    tradeqty: number;//成交数量
+    userid: number;//用户ID
+    username: string;//发起方
+    warehouseid: number;//仓库ID
+    warehousename: string;//仓库名称
+    wrfactortypeid: number;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrpricetype: number;//价格方式 - 1:固定价 2-浮动价 - [挂牌]
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtradeorderid: string;//仓单贸易委托单ID(32number;
+    //+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrtradeorderstatus: number;//委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 1number;
+    //:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
+    wrtradetype: number;//仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
+    wrtypename: string;//商品
+}
+
+/**
+ * 查询仓单持有记录请求
+ */
+export interface QueryHoldLBReq {
+    accountid: number
+}
+
+export interface WrHoldLB {
+    accountid: number;//持有人帐户ID
+    createtime: string;//创建时间(过户时间)
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    enableqty: number;//可用数量
+    enumdicname: string;//单位名称
+    freezerqty: number;//冻结数量
+    ladingbillid: string;//提单ID(2number;
+    //8+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    parentsubnum: number;//拆分父子单号
+    qty: number;//数量
+    subnum: number;//提单子单号
+    tradedate: string;//交易日(yyyyMMdd)
+    userid: number;//持有人ID
+    warehouseid: number;//仓库ID
+    warehousename: string;//仓库名称
+    wrfactortypeid: string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrholdeno: string;//仓单编号
+    wrid: number;//仓单变更ID
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtypename: string;//商品
+}
+
+/**
+ * 查询筛选框列表 请求
+ */
+export interface QueryFilterItemReq {
+    itype: string    // 类型(可多选,逗号隔开) 1-品种 2-品类(商品) 3-仓库
+}
+
+/**
+ * 查询筛选框列表 返回
+ */
+export interface WrFilterItem {
+    itemcode: string;//代码
+    itemid: number;//项id
+    itemname: string;//名称
+    itemtype: number;//类型 1-品种 2-品类(商品) 3-仓库
+    itype: string;//类型 逗号隔开, 如 1,2
+}
+
+/**
+ * 查询履约信息
+ */
+export interface QueryPerformancePlanReq {
+    userid?: number      //  用户id
+    buyorsell: number   //  买卖方向 0-买 1-卖
+}
+
+/**
+ * 查询履约信息返回
+ */
+export interface WrPerformancePlan {
+    amount: number;//履约金额(总金额)
+    buyaccountid: number;//买方账号
+    buyerfreezeamount: number;//履约冻结(买履约)
+    buyerfreezeamountremain: number;//履约冻结剩余(买履约)
+    buyorsell: number;//买卖方向 number;
+    //-买 1-卖
+    buypaidamount: number;//买方已冻/已扣金额 (已付金额)
+    buyusername: string;//买方名字
+    contractid: number;//合同ID
+    createtime: string;//创建时间(开始时间)
+    creatorid: number;//创建人
+    curstepdeadline: string;//当前步骤到期时间
+    curstepid: number;//当前步骤ID
+    curstepname: string;//当前步骤名称
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    enumdicname: string;//单位名称
+    expressfee: number;//运费
+    expressfeeconfirmed: number;//是否确认运费 - number;
+    //:无 1:买方确认 2:卖方确认
+    hasovershort: number;//是否确认溢短 - number;
+    //:没有 1:买方确认 2:卖方确认
+    haswr: number;//类型 number;
+    //-仓单预售 1-仓单贸易
+    marketid: number;//市场ID
+    middleaccountid: number;//中间商资金账号ID
+    middleuserid: number;//中间商用户ID
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    overshortamount: number;//溢短金额
+    overshortqty: number;//溢短数量
+    paymenttype: number;//付款方式 - 1:冻结 2:扣款
+    performanceplanid: number;//履约计划ID(13number;
+    //+yyMMddHHmmss+xxxx)
+    performancestatus: number;//履约状态 - 1:初始化 2:正常 3:处理错误 4:违约待处理 5:违约处理中 6:完成 7.违约已完成 8:释放冻结失败 9:超时待处理 1number;
+    //:超时关闭
+    performancetype: number;//履约类型 - number;
+    //:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 1number;
+    //:法币C2C 11:报价系统 12:挂牌系统
+    qty: number;//履约数量
+    relatedorderid: string;//关联单号(履约类型的关联单号)
+    remark: string;//备注
+    sellaccountid: number;//卖方账号
+    sellerfreezeamount: number;//履约冻结(卖履约)
+    sellerfreezeamountremain: number;//履约冻结剩余(卖履约)
+    sellreceivedamount: number;//卖方已收金额
+    sellusername: string;//卖方名字
+    shipremark: string;//发货备注[物流单号]
+    userid: number;//用户id
+    warehouseid: number;//仓库ID
+    warehousename: string;//仓库名称
+    wrfactortypeid: number;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtransferuserid: number;//仓单受让用户
+    wrtypename: string;//商品
+}

src/services/proto/warehousetrade/index.ts

@@ -1,4 +1,9 @@
-import { HdWRDealOrderReq, HdWROrderReq } from "@/services/proto/warehousetrade/interface";
+import {
+    HdWRDealOrderReq,
+    HdWROrderReq,
+    WRListingCancelOrderReq,
+    WROutApplyReq
+} from "@/services/proto/warehousetrade/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 
 
@@ -12,9 +17,43 @@ export const hdWROrder = (param: HdWROrderReq): Promise<any> => {
 
 /**
  * 持仓单摘牌请求
+ *
+ *             const param = {
+                MarketID: MarketID,
+                AccountID: AccountId.toString(), // 资金账号
+                RelatedWRTradeOrderID: WRTradeOrderID, // 关联委托单号(摘牌委托关联挂牌委托单ID)
+                WRTransferUserID: WRTransferUserID, // 仓单贸易委托单ID
+                OrderQty: OrderQty, // 委托数量
+                OrderSrc: 0, // 委托来源
+                OperatorID: 0, // 操作员账号ID
+                BuyOrSell: enums.BuyOrSell.BuyOrSell_BUY, // 买卖方向
+                ApplyID: 0, // 申请ID
+                TradeDate: moment().format('YYYYMMDD'), // 交易日
+                LadingBillId: LadingBillID,
+                SubNum: 0, // 提单子单号(wrholdlb的SubNum字段),卖的时候填写
+                WRFactorTypeId: WRFactorTypeID,
+            }
  * @param param
  * @constructor
  */
 export const HdWRDealOrder = (param: HdWRDealOrderReq): Promise<any> => {
     return protoMiddleware<HdWRDealOrderReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', 2)
-}
+}
+
+/**
+ * 出入库请求
+ * @param param
+ */
+export const wROutApply = (param: WROutApplyReq): Promise<any> =>{
+    return protoMiddleware<WROutApplyReq>(param, 'WROutApplyReq', 'WROutApplyRsp', 2)
+}
+
+/**
+ * 挂牌撤单请求
+ * @param param
+ */
+export const wRListingCancelOrder = (param: WRListingCancelOrderReq): Promise<any> =>{
+    return protoMiddleware<WRListingCancelOrderReq>(param, 'WRListingCancelOrderReq', 'WRListingCancelOrderRsp', 2)
+}
+
+

src/services/proto/warehousetrade/interface.ts

@@ -98,3 +98,69 @@ export interface DGFactoryItems {
 }
 
 
+// 仓单出库申请 0 29 113
+export interface WROutApplyReq {
+    ClientSerialID: number; // uint64 客户端唯一ID
+    WRStandardID: number; // uint64 仓单标准ID
+    WarehouseID: number; // uint64 仓库ID
+    UserID: number; // uint64 申请人ID
+    AccountID: string; // uint64 申请人账户ID
+    Mobile: string; // string 申请人手机号
+    AppointmentDate: string; // string 预约出库时间（格式：20200101）
+    AppointmentModel: number; // uint32 预约方式:1-物流,2-自送，3-自提
+    CountryID: number; // uint64 国家
+    ProvinceID: number; // uint64 省
+    DistrictID: number; // uint64 区
+    CityID: number; // uint64 市
+    Address: string; // string 详细地址
+    ContactName: string; // string 收货人提货人
+    ContactNum: string; // string 收货人提货人手机
+    AppointmentRemark: string; // string 预约备注
+    CreatorID: number; // uint64 创建人ID
+    WROutInDetails: WROutInDetail; // WROutInDetail 仓单出库提单明细数据
+}
+// 仓单出库申请响应 0 29 114
+export interface WROutApplyRsp {
+    RetCode: number; // int32 返回码
+    RetDesc: string; // string 描述信息
+    ClientSerialID: number; // uint64 客户端唯一ID
+}
+
+// 仓单出库提单明细数据 0 29 112
+export interface WROutInDetail {
+    LadingBillID: string; // string 提单ID
+    SubNum: number; // uint64 提单子单号
+    Qty: number; // uint64 子提单总数量
+    OutQty: number; // uint64 预约数量
+}
+
+
+// 挂牌撤单请求 0 22 4
+export interface WRListingCancelOrderReq {
+    UserID: number; // uint32 用户ID
+    AccountID: number; // uint64 资金账号
+    OldWRTradeOrderID: number; // uint64 目标仓单贸易委托单ID
+    OrderSrc: number; // uint32 委托来源
+    ClientSerialNo: string; // string 客户端流水号
+    ClientOrderTime: string; // string 客户端委托时间
+    ClientType: number; // uint32 终端类型
+    OperatorID: number; // uint64 操作员账号ID
+    BuyOrSell: number; // uint32 买卖方向
+    WRI: number; // uint64 仓单ID,卖的时候填写
+}
+
+// 挂牌撤单应答 0 22 5
+export interface WRListingCancelOrderRsp {
+    RetCode: number; // int32 返回码
+    RetDesc: string; // string 描述信息
+    WRTradeCancelID: number; // uint64 仓单贸易撤单号
+    OldWRTradeOrderID : number; // uint64 目标仓单贸易委托单ID
+    UserID: number; // uint32 用户ID
+    AccountID: number; // uint64 资金账号
+    CancelQty: number; // uint64 撤单数量
+    OrderTime: string; // string 接受撤单的时间
+    ClientSerialNo: string; // string 客户端流水号
+}
+
+
+

src/views/business/order/funding_information/components/funding_information_funding_log/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 资金流水 -->
-  <section class="funding_information_funding_log">
-    资金流水
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.funding_information_funding_log,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/performance_information/components/performance_information_buy_performance/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 买履约 -->
-  <section class="performance_information_buy_performance">
-    买履约
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.performance_information_buy_performance,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/performance_information/components/performance_information_sell_performance/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 卖履约 -->
-  <section class="performance_information_sell_performance">
-    卖履约
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.performance_information_sell_performance,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_deal/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 成交 -->
-  <section class="pre_sale_warehouse_receipt_deal">
-    成交
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.pre_sale_warehouse_receipt_deal,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_designated_deal/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 指定成交 -->
-  <section class="pre_sale_warehouse_receipt_designated_deal">
-    指定成交
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.pre_sale_warehouse_receipt_designated_deal,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

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

@@ -1,21 +0,0 @@
-<template>
-  <!-- 订单汇总 -->
-  <section class="pre_sale_warehouse_receipt_order_summary">
-    订单汇总
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.pre_sale_warehouse_receipt_order_summary,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 挂单 -->
-  <section class="pre_sale_warehouse_receipt_pending_order">
-    挂单
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/spot_warran/components/spot_warrant_deal/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 成交 -->
-  <section class="spot_warrant_deal">
-    成交
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.spot_warrant_deal,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/spot_warran/components/spot_warrant_designated_deal/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 指定成交 -->
-  <section class="spot_warrant_designated_deal">
-    指定成交
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.spot_warrant_designated_deal,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/spot_warran/components/spot_warrant_pending_order/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 挂单 -->
-  <section class="spot_warrant_pending_order">
-    挂单
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.spot_warrant_pending_order,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

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

@@ -1,21 +0,0 @@
-<template>
-  <!-- 现货明细 -->
-  <section class="spot_warrant_spot_details">
-    现货明细
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.spot_warrant_spot_details,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

src/views/business/order/spot_warran/components/spot_warrant_spot_summary/index.vue

@@ -1,21 +0,0 @@
-<template>
-  <!-- 现货汇总 -->
-  <section class="spot_warrant_spot_summary">
-    现货汇总
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.spot_warrant_spot_summary,
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-</style>;

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

@@ -1,33 +1,56 @@
 <template>
-    <!-- 买大厅 -->
-    <a-table
-        :columns="columns"
-        class="buyHallTable"
-        :scroll="{ x: '100%', y: 'calc(100% - 61px)' }"
-        :pagination="false"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :customRow="Rowclick"
-        rowKey="key"
-        :data-source="tableList"
-    ></a-table>
+  <!-- 买大厅 -->
+  <a-table :columns="columns"
+           class="buyHallTable"
+           :scroll="{ x: '100%', y: 'calc(100% - 61px)' }"
+           :pagination="false"
+           :loading="loading"
+           :expandedRowKeys="expandedRowKeys"
+           :customRow="Rowclick"
+           rowKey="key"
+           :data-source="tableList">
+    <!-- 额外的展开行 -->
+    <template #expandedRowRender="{ record }">
+      <BtnList :btnList="btnList"
+               :record="record"
+               @click="open" />
+    </template>
+  </a-table>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { ComposeTableParam, defineComponent, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
+import { ComposeTableParam, BtnList, defineComponent, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { queryAgreementConfig } from '@/services/go/ermcp/qhj';
 import { queryOrderQuoteDetail } from '@/services/go/wrtrade';
 import { QueryOrderQuoteDetailReq, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
+import { defineAsyncComponent, PropType, ref } from 'vue';
+import { BtnList as btnListType } from '@/common/components/btnList/interface';
+import { handleModalComponent } from '@/common/setup/asyncComponent';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'openComponent'],
     name: 'warehouse_receipt_trade_price_delisting_buy',
-    props: {},
+    props: {
+        enumName: {
+            default: '',
+            type: String as PropType<EnumRouterName>,
+        },
+        btnList: {
+            default: [],
+            type: Array as PropType<btnListType[]>,
+        },
+    },
+    components: {
+        BtnList,
+    },
     setup(props, context) {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuoteDetail>();
+        function open(item: btnListType) {
+            context.emit('openComponent', item);
+        }
         // 获取列表数据
         const queryTableAction = () => {
             // const param: QueryOrderQuoteReq = {
@@ -40,12 +63,13 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: EnumRouterName.warehouse_receipt_trade_floating_price,
+            menuType: props.enumName,
             tableName: 'table_pcweb_agreement',
             tableFilterKey: [],
             isDetail: false,
         };
         return {
+            open,
             ...handleComposeTable<WrOrderQuoteDetail>(param),
             loading,
             tableList,

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

@@ -0,0 +1,141 @@
+<template>
+  <!-- 摘牌 -->
+  <Drawer :title="'摘牌'"
+          :placement="'top'"
+          :visible="visible">
+    <!-- 挂牌 -->
+    摘牌
+  </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 { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { hdWROrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+
+export default defineComponent({
+    name: ModalEnum.spot_trade_warehouse_delisting,
+    components: { Drawer },
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPosition>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const data = props.selectedRow;
+        const loading = ref<boolean>(false);
+        // console.log(param);
+        // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+        //     // cancel(true);
+        // });
+        return {
+            visible: true,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
+    }
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 80px;
+    .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-grey1;
+    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/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -1,34 +1,56 @@
 <template>
-    <!-- 卖大厅 -->
+  <!-- 卖大厅 -->
 
-    <a-table
-        :columns="columns"
-        class="sellHallTable"
-        :scroll="{ x: '100%', y: 'calc(100% - 61px)' }"
-        :pagination="false"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :customRow="Rowclick"
-        rowKey="key"
-        :data-source="tableList"
-    ></a-table>
+  <a-table :columns="columns"
+           class="sellHallTable"
+           :scroll="{ x: '100%', y: 'calc(100% - 61px)' }"
+           :pagination="false"
+           :loading="loading"
+           :expandedRowKeys="expandedRowKeys"
+           :customRow="Rowclick"
+           rowKey="key"
+           :data-source="tableList">
+    <!-- 额外的展开行 -->
+    <template #expandedRowRender="{ record }">
+      <BtnList :btnList="btnList"
+               :record="record"
+               @click="open" />
+    </template>
+  </a-table>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { ComposeTableParam, defineComponent, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
+import { ComposeTableParam, BtnList, defineComponent, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { queryAgreementConfig } from '@/services/go/ermcp/qhj';
 import { queryOrderQuoteDetail } from '@/services/go/wrtrade';
 import { QueryOrderQuoteDetailReq, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
+import { defineAsyncComponent, PropType } from 'vue';
+import { BtnList as btnListType } from '@/common/components/btnList/interface';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'openComponent'],
     name: 'warehouse_receipt_trade_price_delisting_sell',
-    props: {},
+    props: {
+        enumName: {
+            default: '',
+            type: String as PropType<EnumRouterName>,
+        },
+        btnList: {
+            default: [],
+            type: Array as PropType<btnListType[]>,
+        },
+    },
+    components: {
+        BtnList,
+    },
     setup(props, context) {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuoteDetail>();
+        function open(item: btnListType) {
+            context.emit('openComponent', item);
+        }
         // 获取列表数据
         const queryTableAction = () => {
             // const param: QueryOrderQuoteReq = {
@@ -50,6 +72,7 @@ export default defineComponent({
             ...handleComposeTable<WrOrderQuoteDetail>(param),
             loading,
             tableList,
+            open,
         };
     },
 });

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

@@ -1,9 +1,6 @@
 <template>
   <!-- 买卖大厅 -->
   <div class="buy-sell-market">
-    <!--<div>
-             <button @click="cancel">关闭</button>
-        </div>-->
     <div class="buy-sell-market-title">
       <a class="backIcon"
          @click="cancel">
@@ -47,23 +44,36 @@
         <div class="last red">6291.0</div>
         <LineChartOutlined />
       </div>
-      <a-button class="publishBuy">发布求购</a-button>
-      <a-button class="detailBtn">详情</a-button>
+      <BtnList :btnList="firstBtn"
+               :record="selectedRow"
+               @click="openComponent" />
+      <!-- <a-button class="publishBuy">发布求购</a-button>
+      <a-button class="detailBtn">详情</a-button> -->
     </div>
     <a-row>
-      <a-col :span="12">
-        <Buy />
+      <a-col :span="12"
+             v-if="buyMarket.isMarket">
+        <Buy :enumName="enumName"
+             @openComponent="openComponent"
+             :btnList="buyMarket.btnList" />
       </a-col>
-      <a-col :span="12">
-        <Sell />
+      <a-col :span="12"
+             v-if="sellMarket.isMarket">
+        <Sell :enumName="enumName"
+              @openComponent="openComponent"
+              :btnList="sellMarket.btnList" />
       </a-col>
     </a-row>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
   </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { ComposeTableParam, defineComponent, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
+import { ComposeTableParam, defineAsyncComponent, defineComponent, BtnList, handleComposeTable, ModalEnum, queryTableList } from '@/common/export/commonTable';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { queryOrderQuoteDetail } from '@/services/go/wrtrade';
 import { QueryOrderQuoteDetailReq, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
@@ -72,33 +82,51 @@ import { handleBuyAndSellList } from './setup';
 import Buy from './components/buy/index.vue';
 import Sell from './components/sell/index.vue';
 import { LineChartOutlined } from '@ant-design/icons-vue';
+// import { getBuyAndSellMarketData } from '../../setup';
+import { handleModalComponent } from '@/common/setup/asyncComponent';
+import { PropType, ref } from 'vue';
+import { handleSpotBtnList } from '../../setup';
 
 export default defineComponent({
     emits: ['cancel'],
     name: 'buy-sell-market',
     props: {
-        wrpricetype: {
-            // 价格方式 - 1:固定价 2-浮动价
-            default: 1,
-            type: Number,
+        selectedRow: {
+            type: Object as PropType<any>,
+            default: {},
         },
-        haswr: {
-            default: 0, // 是否有仓单 0-没有 1-有(仓单贸易填1,仓单预售填0)
-            type: Number,
+        enumName: {
+            default: '',
+            type: String as PropType<EnumRouterName>,
         },
     },
     components: {
         Buy,
         Sell,
+        BtnList,
         LeftOutlined,
         LineChartOutlined,
+        [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../detail/index.vue')),
+        [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../post_buying/index.vue')),
+        [ModalEnum.spot_trade_warehouse_delisting]: defineAsyncComponent(() => import('./components/delisting/index.vue')),
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
-
+        console.log(props.selectedRow);
+        // 买卖大厅 配置数据
+        // 表格操作按钮列表
+        const { firstBtn, buyMarket, sellMarket } = handleSpotBtnList(props.enumName);
+        function init() {}
+        const { componentId, closeComponent, openComponent } = handleModalComponent(init, ref({}));
         return {
             cancel,
             visible,
+            firstBtn,
+            buyMarket,
+            sellMarket,
+            componentId,
+            closeComponent,
+            openComponent,
         };
     },
 });

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

@@ -1,22 +1,18 @@
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { TableKey } from '@/common/methods/table/interface';
 import { getTableColumns, getTableEvent, queryTableList } from "@/common/setup/table";
-import { getBtnList_ } from '@/common/setup/table/button';
-import { WrOrderQuoteDetail } from "@/services/go/wrtrade/interface";
 
 
 export function handleBuyAndSellList<T>(menuType: EnumRouterName, isDetail: boolean, tableName: keyof TableKey) {
     // 表格列表数据
-    const { loading, tableList, queryTable } = queryTableList<WrOrderQuoteDetail>();
+    const { loading, tableList, queryTable } = queryTableList<T>();
     // 表头数据
     const { columns, registerColumn } = getTableColumns();
     // 表格事件
     const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>({});
-    // 表格操作按钮列表
-    const [firstBtn, secondBtn] = getBtnList_(menuType, isDetail).value;
     // 注册表头信息 过滤
     registerColumn(tableName, []);
     return {
-        loading, tableList, columns, expandedRowKeys, selectedRow, Rowclick, firstBtn, secondBtn, queryTable
+        loading, tableList, columns, expandedRowKeys, selectedRow, Rowclick, queryTable
     }
 }

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

@@ -1,57 +1,141 @@
 <template>
-  <!-- 详情-->
-  <a-modal class="add-custom custom-detail"
-           title="详情"
-           centered
-           v-model:visible="visible"
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                @click="cancel">关闭</a-button>
-    </template>
+  <!-- 详情 -->
+  <Drawer :title="'详情'"
+          :placement="'top'"
+          :visible="visible">
+    <!-- 挂牌 -->
     详情
-  </a-modal>
+  </Drawer>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import { Des } from '@/common/components/commonDes';
-import { QhjAgreementConfig } from '@/services/go/ermcp/qhj/interface';
-import { _closeModal } from '@/common/setup/modal/modal';
+import { defineComponent, PropType, ref } from 'vue';
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import Drawer from '@/common/components/drawer/index.vue';
+import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { hdWROrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 
 export default defineComponent({
-    emits: ['cancel'],
-    name: ModalEnum.detail,
-    components: { Des },
+    name: ModalEnum.spot_trade_warehouse_delisting,
+    components: { Drawer },
     props: {
         selectedRow: {
-            type: Object as PropType<QhjAgreementConfig>,
+            type: Object as PropType<WrPosition>,
             default: {},
         },
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
+    setup(props) {
+        const data = props.selectedRow;
+        const loading = ref<boolean>(false);
+        // console.log(param);
+        // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+        //     // cancel(true);
+        // });
         return {
-            cancel,
-            visible,
+            visible: true,
         };
     },
 });
 </script>
 
-<style lang="less">
-.custom-detail {
-    .ant-form.inlineForm {
-        margin-top: 20px;
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
     }
-    .upload {
-        .look {
-            margin-left: 0;
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 80px;
+    .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-grey1;
+    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/market/spot_trade/setup.ts

@@ -9,49 +9,21 @@ import { OperationTabMenu } from '@/services/go/commonService/interface';
 import { onUnmounted, ref } from "vue";
 import { BuyAndSellMarket } from './interface';
 
-// 报价大厅操作按钮列表
-const priceBtnList = ref<BtnList[]>([])
+const buyAndSellEunm = 'buyAndSell'
 
-// 买大厅数据
-const buyMarket: BuyAndSellMarket = {
-    isMarket: true,
-    btnList: []
-}
-
-// 卖大厅数据
-const sellMarket: BuyAndSellMarket = {
-    isMarket: true,
-    btnList: []
-}
-
-
-// 表格 + 表头 + 右键 + 单击表格 + 按钮列表 通用处理逻辑
-export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName, tableFilterKey }: ComposeTableParam) {
-    // 右键逻辑
-    const { contextMenu, openContext, closeContext: closeContextAction } = handleContextMenu();
-    // 表头数据
-    const { columns, registerColumn, updateColumn } = getTableColumns();
-    // 控制异步组件
-    const componentId = ref<string>('');
-    // 关闭组件
-    function closeComponent(isRefresh: boolean) {
-        componentId.value = '';
-        if (isRefresh) {
-            queryFn()
-        }
+export function handleSpotBtnList(menuType: EnumRouterName) {
+    let firstBtn: BtnList[] = []
+    // 买大厅数据
+    const buyMarket: BuyAndSellMarket = {
+        isMarket: true,
+        btnList: []
     }
-    // 右键回调函数
-    const eventsCB: TableEventCB = {
-        contextmenuCB: (record: T, value: ContextMenuTemp) => {
-            // 控制打开右键
-            contextMenu.value = value
-        },
-        clickCB: (record: T) => {
-            componentId.value = 'warehouse_receipt_trade_floating_price_delisting'
-        }
+
+    // 卖大厅数据
+    const sellMarket: BuyAndSellMarket = {
+        isMarket: true,
+        btnList: []
     }
-    // 表格事件
-    const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
     // 表格操作按钮列表
     const list = findChildList(menuType);
     if (list) {
@@ -63,8 +35,7 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         }
         // 过滤报价大厅按钮列表
         const temp = list.children.filter(e => e.type === 2)
-        priceBtnList.value = fnMap(temp)
-        priceBtnList.value.push({ lable: '买卖大厅', code: 'buyAndSell', className: 'btnPrimary' })
+        firstBtn = fnMap(temp)
 
         const fn = (code: EnumRouterName) => {
             const findResult = list.children.find(e => e.code === code)
@@ -82,6 +53,39 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         // 处理卖大厅
         Object.assign(sellMarket, fn(EnumRouterName.spot_trade_warehouse_sell_hall))
     }
+    return { firstBtn, buyMarket, sellMarket }
+}
+
+// 表格 + 表头 + 右键 + 单击表格 + 按钮列表 通用处理逻辑
+export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName, tableFilterKey }: ComposeTableParam) {
+    // 右键逻辑
+    const { contextMenu, openContext, closeContext: closeContextAction } = handleContextMenu();
+    // 表头数据
+    const { columns, registerColumn, updateColumn } = getTableColumns();
+    // 控制异步组件
+    const componentId = ref<string>('');
+    // 关闭组件
+    function closeComponent(isRefresh: boolean) {
+        componentId.value = '';
+        if (isRefresh) {
+            queryFn()
+        }
+    }
+    // 右键回调函数
+    const eventsCB: TableEventCB = {
+        contextmenuCB: (record: T, value: ContextMenuTemp) => {
+            // 控制打开右键
+            contextMenu.value = value
+        },
+        clickCB: (record: T) => {
+            componentId.value = buyAndSellEunm
+        }
+    }
+    // 表格事件
+    const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(eventsCB);
+    // 表格操作按钮列表
+    const { firstBtn } = handleSpotBtnList(menuType)
+    firstBtn.push({ lable: '买卖大厅', code: buyAndSellEunm, className: 'btnPrimary' })
 
     // 关闭右键
     function closeContext(value: BtnList | null) {
@@ -104,10 +108,6 @@ export function handleComposeTable<T>({ queryFn, menuType, isDetail, tableName,
         columns, registerColumn, updateColumn,  // 表头
         expandedRowKeys, selectedRow, Rowclick, // 表格折腾面板数据与单击、双击事件
         componentId, closeComponent,  // 控制异步组件
-        firstBtn: priceBtnList, // 表格按钮
+        firstBtn, // 表格按钮
     }
 }
-
-export function getBuyAndSellMarketData() {
-    return { buyMarket, sellMarket }
-}

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_floating_price/index.vue

@@ -16,6 +16,7 @@
                  :list="firstBtn"></contextMenu>
     <component :is="componentId"
                v-if="componentId"
+               :enumName="name"
                :selectedRow="selectedRow"
                @cancel="closeComponent"></component>
   </div>
@@ -59,6 +60,7 @@ export default defineComponent({
         };
         return {
             ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_receipt_trade_floating_price,
             loading,
             tableList,
         };

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_price/index.vue

@@ -16,6 +16,7 @@
                  :list="firstBtn"></contextMenu>
     <component :is="componentId"
                v-if="componentId"
+               :enumName="name"
                :selectedRow="selectedRow"
                @cancel="closeComponent"></component>
   </div>
@@ -59,6 +60,7 @@ export default defineComponent({
         };
         return {
             ...handleComposeTable<WrOrderQuote>(param),
+            name: EnumRouterName.warehouse_receipt_trade_price,
             loading,
             tableList,
         };

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 资金流水 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } 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';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.funding_information_funding_log,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 0,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,67 @@
+<template>
+  <!-- 买履约 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } 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';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.performance_information_buy_performance,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 0,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;
+

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 卖履约 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } 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';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.performance_information_sell_performance,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 1,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_sale',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 成交 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.pre_sale_warehouse_receipt_deal,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 0,
+            };
+            queryTable(queryWrTradeDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_make_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 指定成交 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrSpecialMatchOrder, queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.pre_sale_warehouse_receipt_designated_deal,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 0,
+            };
+            queryTable(queryWrSpecialMatchOrder, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_make_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 订单汇总 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrPosition } from '@/services/go/wrtrade';
+import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.pre_sale_warehouse_receipt_order_summary,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPosition>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrPositionReq = {
+                querytype: 2,
+            };
+            queryTable(queryWrPosition, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_designated_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPosition>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 挂单 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrOrderDetail } from '@/services/go/wrtrade';
+import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrOrderDetailReq = {
+                haswr: 0,
+            };
+            queryTable(queryWrOrderDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_pending_order',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrOrderDetail>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 成交 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_deal,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 1,
+            };
+            queryTable(queryWrTradeDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 指定成交 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrSpecialMatchOrder, queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_designated_deal,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 1,
+            };
+            queryTable(queryWrSpecialMatchOrder, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_designated_deal',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -84,7 +84,7 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import {QueryWrPositionReq, WrHoldLB, WrPosition} from '@/services/go/wrtrade/interface';
 import { getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hdWROrder } from '@/services/proto/warehousetrade';
@@ -96,23 +96,27 @@ export default defineComponent({
     components: { Drawer },
     props: {
         selectedRow: {
-            type: Object as PropType<WrPosition>,
+            type: Object as PropType<WrHoldLB>,
             default: {},
         },
     },
     setup(props) {
         const data = props.selectedRow;
         const loading = ref<boolean>(false);
+        debugger
         const param = {
             AccountID: data.accountid.toString(),
             ClientSerialNo: uuidv4(), // 客户端流水号
             // OperateSrc: 2,
             ClientType: 4,
             // MarketID: 17201,
-            LadingBillId: '2081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
-            TradeDate: moment('20210725').format('YYYYMMDD'), // 交易日 string
-            SubNum: '0', // 提单子单号
-            WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            TradeDate: moment('20210727').format('YYYYMMDD'), // 交易日 string
+            // SubNum: '0', // 提单子单号
+            SubNum: props.selectedRow.subnum,
+            // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
             IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
             // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
             OrderQty: 1, // 委托数量(可挂部分数据量) ======
@@ -141,6 +145,8 @@ export default defineComponent({
             HasWr: 1,
         };
         console.log(param);
+
+        console.log(props.selectedRow)
         requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
             // cancel(true);
         });

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 库存汇总 -->
-  <section class="spot_warrant_inventory_summary">
+  <section>
     <a-table :columns="columns"
              class="srcollYTable"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
@@ -26,10 +26,9 @@
 
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam, handleComposeTable } from '@/common/export/commonTable';
-import { queryWrOrderDetail, queryWrPosition } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, QueryWrPositionReq, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrPosition } from '@/services/go/wrtrade';
+import {QueryWrPositionReq, WrHoldLB, WrPosition} from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
@@ -38,11 +37,11 @@ export default defineComponent({
     name: enumOrderComponents.spot_warrant_inventory_summary,
     components: {
         BtnList,
-        [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
+        // [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
     },
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrPosition>();
+        const { loading, tableList, queryTable } = queryTableList<WrHoldLB>();
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryWrPositionReq = {
@@ -57,7 +56,7 @@ export default defineComponent({
             recordList: getRecordItemTab(),
         };
         return {
-            ...handleComposeOrderTable<WrPosition>(param),
+            ...handleComposeOrderTable<WrHoldLB>(param),
             loading,
             tableList,
         };

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

@@ -0,0 +1,66 @@
+<template>
+  <!-- 挂单 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrOrderDetail } from '@/services/go/wrtrade';
+import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_pending_order,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrOrderDetailReq = {
+                haswr: 1,
+            };
+            queryTable(queryWrOrderDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_pending_order',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrOrderDetail>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,254 @@
+<template>
+  <!-- 现货仓单 现货明细 挂牌 -->
+  <Drawer :title="'挂牌'"
+          :placement="'bottom'"
+          :visible="visible">
+    <!-- 挂牌 -->
+    <div class="listed">
+      <div class="condition">
+        <a-button class="conditionBtn">螺纹钢</a-button>
+        <a-button class="conditionBtn">12</a-button>
+        <a-button class="conditionBtn">江铜</a-button>
+        <a-button class="conditionBtn">华南仓库</a-button>
+      </div>
+      <div class="formBar">
+        <a-form class="inlineForm"
+                :form="form"
+                @submit="handleSearch">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="挂牌方式">
+                <a-select class="inlineFormSelect"
+                          default-value="1"
+                          style="width: 140px">
+                  <a-select-option value="1">
+                    一口价
+                  </a-select-option>
+                  <a-select-option value="2">
+                    一口价2
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="挂牌价">
+                <a-input class="commonInput"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="挂牌数量">
+                <a-input class="commonInput"
+                         suffix="吨"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="起摘数量"
+                           class="relative">
+                <a-input class="commonInput"
+                         suffix="吨"
+                         style="width: 140px" />
+                <div class="tip">最小单位：1吨</div>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item>
+                <a-progress class="formProgress"
+                            :percent="30" />
+                <div class="unit"><span>0</span><span>300吨</span></div>
+              </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">挂牌</a-button>
+                <a-button class="ml10 cancelBtn">取消</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 { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import Drawer from '@/common/components/drawer/index.vue';
+import {QueryWrPositionReq, WrHoldLB, WrPosition} from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { hdWROrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+
+export default defineComponent({
+    name: ModalEnum.spot_warrant_spot_details_listed,
+    components: { Drawer },
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrHoldLB>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const data = props.selectedRow;
+        const loading = ref<boolean>(false);
+        debugger
+        const param = {
+            AccountID: data.accountid.toString(),
+            ClientSerialNo: uuidv4(), // 客户端流水号
+            // OperateSrc: 2,
+            ClientType: 4,
+            // MarketID: 17201,
+            LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            TradeDate: moment('20210727').format('YYYYMMDD'), // 交易日 string
+            // SubNum: '0', // 提单子单号
+            SubNum: props.selectedRow.subnum,
+            // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
+            // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
+            OrderQty: 1, // 委托数量(可挂部分数据量) ======
+            DeliveryGoodsID: data.deliverygoodsid, // 交割商品商品ID
+            WRPriceType: 1, // 价格方式 1：固定价 2：浮动价
+            FixedPrice: 10, // 固定价格
+            PriceFactor: 0, // 价格系数(浮动价时填写)
+            PriceMove: 0, // 升贴水(浮动价时填写)
+            TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
+            // ValidTime: moment('2021-08-25 00:00:00').format('YYYY-MM-DD HH:mm:ss'), // 有效期限
+            ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+            FirstRatio: 0, // 首付比例
+            PerformanceTemplateID: 0, // 履约计划模板ID
+            UserID: getUserId(),
+            OperatorID: getUserId(), // 操作员账号ID
+            BuyOrSell: 1, // 买卖方向 0买1卖
+            PriceDisplayMode: 1, // 浮动价显示方式 1：合并显示 2：分开显示
+            CanBargain: 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
+            Attachment1: '', // 附件1
+            Attachment2: '', // 附件2
+            Remark: '222', // 备注
+            ApplyID: 0, // 申请ID
+            CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
+            WRTradeGoods: [],
+            wrstandardid: 1,
+            HasWr: 1,
+        };
+        console.log(param);
+        requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+            // cancel(true);
+        });
+        return {
+            visible: true,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
+    }
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 80px;
+    .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-grey1;
+    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_spot_details/components/pick_up/index.vue

@@ -0,0 +1,142 @@
+<template>
+  <!-- 现货仓单 现货明细 提货 -->
+  <Drawer :title="'提货'"
+          :placement="'bottom'"
+          :visible="visible">
+    <!-- 挂牌 -->
+    提货
+  </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 { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { hdWROrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+
+export default defineComponent({
+    name: ModalEnum.spot_warrant_spot_details_pick_up,
+    components: { Drawer },
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPosition>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const data = props.selectedRow;
+        const loading = ref<boolean>(false);
+
+        // console.log(param);
+        // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+        //     // cancel(true);
+        // });
+        return {
+            visible: true,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
+    }
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 80px;
+    .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-grey1;
+    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_spot_details/index.vue

@@ -0,0 +1,66 @@
+<template>
+  <!-- 现货明细 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam, handleComposeTable } from '@/common/export/commonTable';
+import { queryHoldLB, queryWrOrderDetail, queryWrPosition } from '@/services/go/wrtrade';
+import { QueryHoldLBReq, QueryWrOrderDetailReq, QueryWrPositionReq, WrHoldLB, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_spot_details,
+    components: {
+        BtnList,
+        [ModalEnum.spot_warrant_spot_details_listed]: defineAsyncComponent(() => import('./components/listing/index.vue')),
+        [ModalEnum.spot_warrant_spot_details_pick_up]: defineAsyncComponent(() => import('./components/pick_up/index.vue')),
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrHoldLB>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryHoldLB);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_spot_detail',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrHoldLB>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,142 @@
+<template>
+  <!-- 现货仓单 现货明细 提货 -->
+  <Drawer :title="'提货'"
+          :placement="'bottom'"
+          :visible="visible">
+    <!-- 挂牌 -->
+    提货
+  </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 { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { hdWROrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+
+export default defineComponent({
+    name: ModalEnum.spot_warrant_spot_details_pick_up,
+    components: { Drawer },
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrPosition>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const data = props.selectedRow;
+        const loading = ref<boolean>(false);
+
+        // console.log(param);
+        // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+        //     // cancel(true);
+        // });
+        return {
+            visible: true,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: rgba(@m-black7, 0.8);
+                color: rgba(@m-blue0, 0.8);
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+    .formBar {
+        width: 100%;
+        flex: 1;
+        padding: 28px 16px 7px;
+    }
+}
+
+::v-deep.formProgress {
+    width: 140px;
+    // height: 3px;
+    // .rounded-corners(2px);
+    margin-left: 80px;
+    .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-grey1;
+    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_spot_summary/index.vue

@@ -0,0 +1,66 @@
+<template>
+  <!-- 现货汇总 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             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"
+               @cancel="closeComponent"></component>
+  </section>
+</template>
+
+<script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrPosition } from '@/services/go/wrtrade';
+import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_spot_summary,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPosition>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrPositionReq = {
+                querytype: 1,
+            };
+            queryTable(queryWrPosition, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_spot_summary',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPosition>(param),
+            loading,
+            tableList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/business/order/spot_warran/index.vue → src/views/order/spot_warran/index.vue

@@ -26,7 +26,7 @@ export default defineComponent({
         [enumOrderComponents.spot_warrant_inventory_summary]: defineAsyncComponent(() => import('./components/spot_warrant_inventory_summary/index.vue')),
         [enumOrderComponents.spot_warrant_pending_order]: defineAsyncComponent(() => import('./components/spot_warrant_pending_order/index.vue')),
         [enumOrderComponents.spot_warrant_spot_summary]: defineAsyncComponent(() => import('./components/spot_warrant_spot_summary/index.vue')),
-        // [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
+        [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
     },
     setup() {
         return { ...handleOrderDetailList(enumOrderComponents.spot_warrant) };