huangbin hace 4 años
padre
commit
0a96b33c87

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

@@ -65,6 +65,18 @@
             "remark": "",
             "children": [
               {
+                "code": "spot_warrant_inventory_summary_listed",
+                "title": "挂牌",
+                "sort": 1,
+                "type": 2,
+                "rulekey": "client_pc_web_spot_production_bottom_spot_details_listed",
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                ]
+              },
+              {
                 "code": "spot_warrant_inventory_summary_detail",
                 "title": "仓单明细",
                 "sort": 1,

+ 130 - 121
src/common/components/drawer/index.vue

@@ -1,147 +1,156 @@
 <template>
-    <div class="drawer">
-        <a-drawer :placement="placement" :closable="false" :visible="visible" class="tradeDialog">
-            <!-- 摘牌是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> -->
-                    <Trade></Trade>
-                </div>
-            </div>
-        </a-drawer>
-    </div>
+  <div class="drawer">
+    <a-drawer :placement="placement"
+              :closable="false"
+              :visible="visible"
+              class="tradeDialog">
+      <!-- 摘牌是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">
-    import { defineComponent, ref, PropType } from 'vue';
-    import { closeModal, ModalName } from '@/common/setup/modal/index';
-    import Listed from '@/views/market/warehouseTrade/components/listed/index.vue';
-    import Delisting from '@/views/market/warehouseTrade/components/delisting/index.vue';
-    import Trade from '@/views/market/warehouseTrade/components/trade/index.vue';
+import { defineComponent, ref, PropType } from 'vue';
+import { closeModal, ModalName } from '@/common/setup/modal/index';
+import Listed from '@/views/market/warehouseTrade/components/listed/index.vue';
+import Delisting from '@/views/market/warehouseTrade/components/delisting/index.vue';
+import Trade from '@/views/market/warehouseTrade/components/trade/index.vue';
+import { _closeModal } from '@/common/setup/modal/modal';
 
-    interface Key {
-        [propName: string]: string;
-    }
+interface Key {
+    [propName: string]: string;
+}
 
-    export default defineComponent({
-        name: 'drawer',
-        props: {
-            modalName: {
-                default: 'drawer',
-                type: String as PropType<keyof ModalName>,
-            },
-            title: {
-                default: '',
-                type: String,
-            },
-            placement: {
-                // 需要绑定的值得 key
-                default: 'right',
-                type: String,
-            },
+export default defineComponent({
+    name: 'drawer',
+    emits: ['cancel'],
+    props: {
+        modalName: {
+            default: 'drawer',
+            type: String as PropType<keyof ModalName>,
         },
-        components: {
-            Listed,
-            Delisting,
-            Trade,
+        title: {
+            default: '',
+            type: String,
         },
-        setup(props, context) {
-            const { visible, cancel } = closeModal(props.modalName);
-            return {
-                visible,
-                cancel,
-            };
+        placement: {
+            // 需要绑定的值得 key
+            default: 'right',
+            type: String,
         },
-    });
+    },
+    components: {
+        Listed,
+        Delisting,
+        Trade,
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        // const { visible, cancel } = closeModal(props.modalName);
+        return {
+            visible,
+            cancel,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .bottom {
-        .position(fixed, auto, 0, -2px, auto);
-        width: 586px;
-        height: 330px;
-        background: transparent;
-        z-index: 10;
-        .ant-drawer-content-wrapper {
-            width: 586px !important;
-        }
+.bottom {
+    .position(fixed, auto, 0, -2px, auto);
+    width: 586px;
+    height: 330px;
+    background: transparent;
+    z-index: 10;
+    .ant-drawer-content-wrapper {
+        width: 586px !important;
     }
-    .top {
-        .position(fixed, 116px, 0, auto, auto);
-        width: 446px;
-        height: 350px;
-        background: transparent;
-        z-index: 10;
-        .ant-drawer-content-wrapper {
-            width: 446px !important;
-        }
+}
+.top {
+    .position(fixed, 116px, 0, auto, auto);
+    width: 446px;
+    height: 350px;
+    background: transparent;
+    z-index: 10;
+    .ant-drawer-content-wrapper {
+        width: 446px !important;
+    }
+}
+.tradeDialog {
+    .position(fixed, 116px, 0, auto, auto);
+    width: 467px;
+    height: 310px;
+    background: transparent;
+    z-index: 10;
+    .ant-drawer-content-wrapper {
+        width: 467px !important;
     }
-    .tradeDialog {
-        .position(fixed, 116px, 0, auto, auto);
-        width: 467px;
-        height: 310px;
+}
+.ant-drawer.ant-drawer-open {
+    .ant-drawer-mask {
         background: transparent;
-        z-index: 10;
-        .ant-drawer-content-wrapper {
-            width: 467px !important;
-        }
     }
-    .ant-drawer.ant-drawer-open {
-        .ant-drawer-mask {
+    .ant-drawer-content-wrapper {
+        box-shadow: none;
+        .ant-drawer-content {
             background: transparent;
-        }
-        .ant-drawer-content-wrapper {
-            box-shadow: none;
-            .ant-drawer-content {
-                background: transparent;
-                .ant-drawer-wrapper-body {
-                    overflow: hidden;
-                    .ant-drawer-body {
-                        width: 100%;
+            .ant-drawer-wrapper-body {
+                overflow: hidden;
+                .ant-drawer-body {
+                    width: 100%;
+                    height: 100%;
+                    padding: 0;
+                    .inlineflex;
+                    .collapse {
+                        width: 26px;
+                        height: 66px;
+                        margin-top: 15px;
+                        background: url(../../../assets/images/dialogClose.png) center center no-repeat;
+                        background-size: cover;
+                    }
+                    .collapseCont {
+                        flex: 1;
                         height: 100%;
-                        padding: 0;
-                        .inlineflex;
-                        .collapse {
-                            width: 26px;
-                            height: 66px;
-                            margin-top: 15px;
-                            background: url(../../../assets/images/dialogClose.png) center center no-repeat;
-                            background-size: cover;
+                        border: 2px solid @m-blue0;
+                        border-right: 0;
+                        .flex;
+                        flex-direction: column;
+                        .title {
+                            width: 100%;
+                            height: 36px;
+                            line-height: 36px;
+                            text-align: center;
+                            background: linear-gradient(0deg, @m-blue4, @m-blue5);
+                            font-size: 16px;
+                            color: @m-white1;
+                            border-bottom: 2px solid @m-blue0;
                         }
-                        .collapseCont {
+                        .content {
                             flex: 1;
-                            height: 100%;
-                            border: 2px solid @m-blue0;
-                            border-right: 0;
-                            .flex;
-                            flex-direction: column;
-                            .title {
-                                width: 100%;
-                                height: 36px;
-                                line-height: 36px;
-                                text-align: center;
-                                background: linear-gradient(0deg, @m-blue4, @m-blue5);
-                                font-size: 16px;
-                                color: @m-white1;
-                                border-bottom: 2px solid @m-blue0;
-                            }
-                            .content {
-                                flex: 1;
-                                width: 100%;
-                                max-height: calc(100% - 36px);
-                                overflow-y: auto;
-                                background: @m-grey11;
-                            }
-                            .highContent {
-                                max-height: 100%;
-                            }
+                            width: 100%;
+                            max-height: calc(100% - 36px);
+                            overflow-y: auto;
+                            background: @m-grey11;
+                        }
+                        .highContent {
+                            max-height: 100%;
                         }
                     }
                 }
             }
         }
-    }</style
+    }
+}
+</style
 >;

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

@@ -18,24 +18,24 @@ export enum enumOrderComponents {
 						
 						spot_warrant_pending_order = 'spot_warrant_pending_order', // 挂单
 						
+						spot_warrant_deal = 'spot_warrant_deal', // 成交
+						
 						spot_warrant_designated_deal = 'spot_warrant_designated_deal', // 指定成交
 						
 						spot_warrant_in_and_out_warehouse = 'spot_warrant_in_and_out_warehouse', // 出入库
 						
-						spot_warrant_deal = 'spot_warrant_deal', // 成交
-						
 						pre_sale_warehouse_receipt_order_summary = 'pre_sale_warehouse_receipt_order_summary', // 订单汇总
 						
 						pre_sale_warehouse_receipt_pending_order = 'pre_sale_warehouse_receipt_pending_order', // 挂单
 						
 						pre_sale_warehouse_receipt_designated_deal = 'pre_sale_warehouse_receipt_designated_deal', // 指定成交
 						
-						pre_sale_warehouse_receipt_deal = 'pre_sale_warehouse_receipt_deal', // 成交
-						
 						funding_information_funding_summary = 'funding_information_funding_summary', // 资金汇总
 						
 						funding_information_funding_log = 'funding_information_funding_log', // 资金流水
 						
+						pre_sale_warehouse_receipt_deal = 'pre_sale_warehouse_receipt_deal', // 成交
+						
 						performance_information_buy_performance = 'performance_information_buy_performance', // 买履约
 						
 						performance_information_sell_performance = 'performance_information_sell_performance', // 卖履约

+ 247 - 249
src/common/constants/enumRouterName.ts

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

+ 66 - 64
src/common/constants/modalNameEnum.ts

@@ -6,136 +6,138 @@ export enum ModalEnum {
     detail = 'detail', // 详情
 						spot_warrant_spot_details_listed = 'spot_warrant_spot_details_listed', // 挂牌
 						
-						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
-						
 						spot_warrant_inventory_summary_detail = 'spot_warrant_inventory_summary_detail', // 仓单明细
 						
-						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
+						spot_warrant_inventory_summary_listed = 'spot_warrant_inventory_summary_listed', // 挂牌
+						
+						spot_warrant_deal_detail = 'spot_warrant_deal_detail', // 详情
+						
+						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
 						
 						spot_warrant_designated_deal_ignore = 'spot_warrant_designated_deal_ignore', // 忽略
 						
+						spot_warrant_pending_order_cancel_order = 'spot_warrant_pending_order_cancel_order', // 撤单
+						
 						spot_warrant_spot_summary_check = 'spot_warrant_spot_summary_check', // 查看库存
 						
-						spot_warrant_designated_deal_confirm_purchase = 'spot_warrant_designated_deal_confirm_purchase', // 确定购买
+						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
 						
-						spot_warrant_in_and_out_warehouse_logistics_information = 'spot_warrant_in_and_out_warehouse_logistics_information', // 物流信息
+						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
 						
 						spot_warrant_spot_details_pick_up = 'spot_warrant_spot_details_pick_up', // 提货
 						
-						spot_warrant_designated_deal_resell = 'spot_warrant_designated_deal_resell', // 撤销出售
-						
 						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_order_summary_listed = 'pre_sale_warehouse_receipt_order_summary_listed', // 挂牌
 						
+						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', // 确定购买
 						
-						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
+						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
 						
 						performance_information_buy_performance_extension = 'performance_information_buy_performance_extension', // 延期
 						
-						spot_warrant_in_and_out_warehouse_revoke = 'spot_warrant_in_and_out_warehouse_revoke', // 撤销
-						
-						pre_sale_warehouse_receipt_deal_detail = 'pre_sale_warehouse_receipt_deal_detail', // 详情
+						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
 						
 						performance_information_buy_performance_detail = 'performance_information_buy_performance_detail', // 详情
 						
-						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
+						performance_information_buy_performance_pay = 'performance_information_buy_performance_pay', // 付款
 						
-						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
+						performance_information_sell_performance_pay = 'performance_information_sell_performance_pay', // 付款
 						
 						performance_information_sell_performance_extension = 'performance_information_sell_performance_extension', // 延期
 						
-						performance_information_buy_performance_breach_contract = 'performance_information_buy_performance_breach_contract', // 违约
-						
 						performance_information_sell_performance_breach_contract = 'performance_information_sell_performance_breach_contract', // 违约
 						
-						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
+						performance_information_sell_performance_detail = 'performance_information_sell_performance_detail', // 详情
 						
-						pre_sale_warehouse_receipt_designated_deal_ignore = 'pre_sale_warehouse_receipt_designated_deal_ignore', // 忽略
+						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
 						
 						warehouse_receipt_trade_price_post_buying = 'warehouse_receipt_trade_price_post_buying', // 发布求购
 						
-						warehouse_receipt_trade_floating_price_post_buying = 'warehouse_receipt_trade_floating_price_post_buying', // 发布求购
+						funding_information_funding_summary_withdraw = 'funding_information_funding_summary_withdraw', // 提现
 						
-						funding_information_funding_summary_recharge = 'funding_information_funding_summary_recharge', // 充值
+						warehouse_receipt_trade_price_detail = 'warehouse_receipt_trade_price_detail', // 详情
+						
+						warehouse_receipt_trade_price_delisting = 'warehouse_receipt_trade_price_delisting', // 摘牌
+						
+						warehouse_receipt_trade_floating_price_post_buying = 'warehouse_receipt_trade_floating_price_post_buying', // 发布求购
 						
 						warehouse_receipt_trade_floating_price_detail = 'warehouse_receipt_trade_floating_price_detail', // 详情
 						
 						warehouse_receipt_trade_floating_price_delisting = 'warehouse_receipt_trade_floating_price_delisting', // 摘牌
 						
-						warehouse_receipt_trade_price_delisting = 'warehouse_receipt_trade_price_delisting', // 摘牌
+						capacity_pre_sale_purchase = 'capacity_pre_sale_purchase', // 发布求购
 						
 						capacity_pre_sale_detail = 'capacity_pre_sale_detail', // 详情
 						
-						warehouse_receipt_trade_price_detail = 'warehouse_receipt_trade_price_detail', // 详情
-						
-						capacity_pre_sale_purchase = 'capacity_pre_sale_purchase', // 发布求购
-						
 						capacity_pre_sale_delisting = 'capacity_pre_sale_delisting', // 摘牌
 						
 						open = 'open', // 开仓
 						
 						close = 'close', // 平仓
 						
+						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
+						
 						custom_info_btn_delete = 'custom_info_btn_delete', // 删除
 						
-						custom_info_btn_cancel = 'custom_info_btn_cancel', // 撤销
+						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
 						
 						custom_info_btn_check = 'custom_info_btn_check', // 审核
 						
 						custom_info_btn_add = 'custom_info_btn_add', // 新增
 						
-						custom_info_btn_modify = 'custom_info_btn_modify', // 修改
-						
 						custom_info_btn_disable = 'custom_info_btn_disable', // 停用
 						
 						custom_info_btn_recover = 'custom_info_btn_recover', // 恢复
 						
 						goods_info_spot_normal_add = 'goods_info_spot_normal_add', // 新增
 						
+						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
+						
 						goods_info_spot_normal_disable = 'goods_info_spot_normal_disable', // 停用
 						
 						goods_info_hedge_normal_modify = 'goods_info_hedge_normal_modify', // 修改
 						
 						spot_contract_btn_add = 'spot_contract_btn_add', // 新增
 						
-						goods_info_spot_normal_modify = 'goods_info_spot_normal_modify', // 修改
-						
 						none_btn = 'none_btn', // 按钮
 						
 						warehouse_info_btn_add = 'warehouse_info_btn_add', // 新增
 						
+						warehouse_info_btn_modify = 'warehouse_info_btn_modify', // 修改
+						
 						warehouse_info_btn_disable = 'warehouse_info_btn_disable', // 停用
 						
 						warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
 						
 						account_info_business_btn_add = 'account_info_business_btn_add', // 新增
 						
-						warehouse_info_btn_modify = 'warehouse_info_btn_modify', // 修改
-						
 						account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
 						
 						account_info_manager_btn_add = 'account_info_manager_btn_add', // 新增权限模板
 						
 						account_info_manager_btn_setting = 'account_info_manager_btn_setting', // 权限设置
 						
-						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
-						
 						account_info_futures_btn_add = 'account_info_futures_btn_add', // 新增
 						
-						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
-						
-						business_review_settlement_cancel = 'business_review_settlement_cancel', // 撤销
+						plan_btn_add = 'plan_btn_add', // 新增
 						
-						finance_review_funds_audit = 'finance_review_funds_audit', // 审核
+						business_review_someprice_cancel = 'business_review_someprice_cancel', // 撤销
 						
 						business_review_settlement_audit = 'business_review_settlement_audit', // 审核
 						
-						plan_btn_add = 'plan_btn_add', // 新增
+						business_review_settlement_cancel = 'business_review_settlement_cancel', // 撤销
+						
+						business_review_someprice_audit = 'business_review_someprice_audit', // 审核
 						
 						finance_review_funds_cancel = 'finance_review_funds_cancel', // 撤销
 						
+						finance_review_funds_audit = 'finance_review_funds_audit', // 审核
+						
 						finance_review_invoice_audit = 'finance_review_invoice_audit', // 审核
 						
 						finance_review_invoice_cancel = 'finance_review_invoice_cancel', // 撤销
@@ -178,14 +180,14 @@ export enum ModalEnum {
 						
 						platinum_agents_and_stores_add = 'platinum_agents_and_stores_add', // 新增
 						
-						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
-						
 						platinum_agents_and_stores_logout = 'platinum_agents_and_stores_logout', // 注销
 						
 						platinum_spot_and_price_modify = 'platinum_spot_and_price_modify', // 修改
 						
 						platinum_agreement_add = 'platinum_agreement_add', // 新增
 						
+						platinum_agents_and_stores_modify = 'platinum_agents_and_stores_modify', // 修改
+						
 						platinum_capital_flow = 'platinum_capital_flow', // 积分流水
 						
 						platinum_promotion_report = 'platinum_promotion_report', // 推广报表
@@ -198,50 +200,46 @@ export enum ModalEnum {
 						
 						spot_contract_btn_check = 'spot_contract_btn_check', // 审核
 						
-						spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
-						
 						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_locked = 'account_info_business_btn_locked', // 锁定
 						
-						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
-						
 						account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 						
+						account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+						
 						account_info_trade_child_btn_add = 'account_info_trade_child_btn_add', // 新增
 						
 						account_info_trade_btn_modify = 'account_info_trade_btn_modify', // 修改
 						
 						account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 						
+						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
+						
+						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						
 						purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
 						
+						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+						
 						purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
 						
 						purchase_pending_storage = 'purchase_pending_storage', // 入库登记
 						
-						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
-						
 						purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 						
-						purchase_pending_funds = 'purchase_pending_funds', // 款项登记
-						
-						plan_audit_cancel = 'plan_audit_cancel', // 撤销
-						
-						account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
-						
-						account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
+						sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 						
-						plan_audit_audit = 'plan_audit_audit', // 审核
+						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
 						
 						sell_pending_funds = 'sell_pending_funds', // 款项登记
 						
-						sell_pending_settlement = 'sell_pending_settlement', // 交收登记
-						
 						sell_pending_invoice = 'sell_pending_invoice', // 发票登记
 						
 						sell_pending_storage = 'sell_pending_storage', // 出库登记
@@ -250,6 +248,10 @@ export enum ModalEnum {
 						
 						plan_uncommitted_delete = 'plan_uncommitted_delete', // 删除
 						
+						plan_audit_audit = 'plan_audit_audit', // 审核
+						
+						plan_audit_cancel = 'plan_audit_cancel', // 撤销
+						
 						inventory_current_detail_storehouse = 'inventory_current_detail_storehouse', // 仓库明细
 						
 						inventory_current_detail_storesave = 'inventory_current_detail_storesave', // 库存明细
@@ -258,12 +260,12 @@ export enum ModalEnum {
 						
 						platinum_custom_info_normal_stop = 'platinum_custom_info_normal_stop', // 停用
 						
-						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
-						
 						platinum_customer_info_unsubmit_check = 'platinum_customer_info_unsubmit_check', // 审核
 						
 						platinum_customer_info_stop_resume = 'platinum_customer_info_stop_resume', // 恢复
 						
+						platinum_customer_info_stop_delete = 'platinum_customer_info_stop_delete', // 删除
+						
 						platinum_pick_goods_management_modify = 'platinum_pick_goods_management_modify', // 修改
 						
 						platinum_pick_goods_management_logout = 'platinum_pick_goods_management_logout', // 注销
@@ -288,20 +290,20 @@ export enum ModalEnum {
 						
 						account_info_trade_btn_child_modify = 'account_info_trade_btn_child_modify', // 修改
 						
-						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
-						
 						account_info_trade_btn_child_reset = 'account_info_trade_btn_child_reset', // 重置密码
 						
-						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
-						
-						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
+						account_info_trade_btn_child_locked = 'account_info_trade_btn_child_locked', // 锁定
 						
-						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
+						account_info_trade_btn_child_unlocked = 'account_info_trade_btn_child_unlocked', // 解锁
 						
 						account_info_trade_btn_child_logout = 'account_info_trade_btn_child_logout', // 注销
 						
+						account_info_manager_btn_modify = 'account_info_manager_btn_modify', // 修改
+						
 						account_info_manager_btn_locked = 'account_info_manager_btn_locked', // 锁定
 						
+						account_info_manager_btn_reset = 'account_info_manager_btn_reset', // 重置密码
+						
 						account_info_manager_btn_unlocked = 'account_info_manager_btn_unlocked', // 解锁
 						
 						account_info_manager_btn_logout = 'account_info_manager_btn_logout', // 注销

+ 28 - 0
src/views/business/order/spot_warran/components/spot_warrant_inventory_summary/components/listing.vue

@@ -0,0 +1,28 @@
+<template>
+  <!-- 挂单 -->
+  <Drawer :title="'挂牌'"
+          :placement="'bottom'"
+          :visible="visible">
+    <Listed />
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import Drawer from '@/common/components/drawer/index.vue';
+import Trade from '@/views/market/warehouseTrade/components/trade/index.vue';
+import Listed from '@/views/market/warehouseTrade/components/listed/index.vue';
+export default defineComponent({
+    name: enumOrderComponents.spot_warrant_pending_order,
+    components: { Drawer, Listed },
+    setup() {
+        return {
+            visible: true,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

+ 14 - 1
src/views/business/order/spot_warran/components/spot_warrant_inventory_summary/index.vue

@@ -10,7 +10,17 @@
              :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>
 
@@ -26,7 +36,10 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_inventory_summary,
-    components: {},
+    components: {
+        BtnList,
+        [ModalEnum.spot_warrant_inventory_summary_listed]: defineAsyncComponent(() => import('./components/listing.vue')),
+    },
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<QueryWrPositionReq>();