Merge remote-tracking branch 'origin/master'

generate-code/pc_menu_企业风管.json

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

src/assets/styles/mixin.less

@@ -734,10 +734,12 @@
 .input-enumdicname-absolute {
     position: absolute;
     top: -8px;
-    right: -23px;
+    right: -110px;
     color: @m-grey10;
     margin-left: 5px;
     font-size: 16px;
+    display: inline-block;
+    min-width: 100px;
   }
 
 .dialogInput {
@@ -876,6 +878,12 @@
 .ml10 {
     margin-left: 10px;
 }
+.ml15 {
+    margin-left: 15px;
+}
+.ml20 {
+    margin-left: 20px;
+}
 .ml35 {
     margin-left: 35px;
 }
@@ -1787,6 +1795,8 @@ input:-internal-autofill-selected {
         div {
             align-self: center;
             align-items: center;
+            height: 40px;
+            line-height: 40px;
         }
         .backIcon {
             width: 52px;
@@ -1921,6 +1931,9 @@ input:-internal-autofill-selected {
         }
     }
 }
+.bdf1 {
+    border-left: 1PX solid @m-grey31;
+}
 // 买卖大厅表格
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
@@ -2314,4 +2327,10 @@ input:-internal-autofill-selected {
 
 .commonSteps > .ant-steps-item-process > .ant-steps-item-container > .ant-steps-item-tail::after {
     background-color: @m-grey30;
+}
+
+// 左侧菜单
+.ant-menu-dark .ant-menu-inline.ant-menu-sub {
+    background: @m-black28;
+    box-shadow: none;
 }

src/assets/styles/theme.css

@@ -1,5 +1,5 @@
 /* 默认主题 */
-:root {
+ :root {
     --m-grey0: #364048 ;
     --m-grey1: #7a8a94;
     --m-grey2: #88a0ae;
@@ -22,10 +22,193 @@
     --m-grey18: #1D2327;
     --m-grey19: #162534;
     --m-grey20: #1B2A38;
+    --m-grey21: #15202B;
+    --m-grey22: #424E59;
+    --m-grey22-hover: rgba(66, 78, 89, .8);
+    --m-grey23: #48545F;
+    --m-grey26: #343e48;
+
+    --m-grey31: #212629;
+    --m-green1: #e8ffef;
+
+    --m-black0: #242a2e;
+    --m-black1: #181e22;
+    --m-black2: #0E0E0F;
+    --m-black3: #4D5A64;
+    --m-black4: #14181B;
+    --m-black5: #121415;
+    --m-black6: #1B2F41;
+    --m-black7: #15293A;
+    --m-black8: #212629;
+    --m-black9: #161A1C;
+    --m-black10: #121618;
+    --m-black11: #0B1620;
+    --m-black12: #13202D;
+    --m-black13: #08131F;
+    --m-black14: #1F262B;
+    --m-black15: #0f161c;
+    --m-black16: #181d1f;
+    --m-black17: #2E3539;
+    --m-black18: rgba(18, 22, 24, 0.36);
+    --m-black19: rgb(26 187 207 / 20%);
+    --m-black20: #4b5861;
+    --m-black21: #182635;
+    --m-black22: #1d2f3f;
+    --m-black23: #173025;
+    --m-black24: #2c3e50;
+    --m-black25: #282e34;
+    --m-black26: #192125;
+    --m-black27: #0E1A25;
+    --m-black28: #000c17;
+    --m-black29: #2B3F52;
+    --m-black30: #15202B;
+
+    --m-blue0: #3a87f7;
+    --m-blue0-hover: rgba(58, 135, 247, .8);
+    --m-blue2: #3270d2;
+    --m-blue2-hover: rgba(58, 135, 247, .8);
+    --m-blue3: #172B56;
+    --m-blue4: #112C43;
+    --m-blue5: #084258;
+    --m-blue6: #26487C;
+    --m-blue6-hover: rgba(38, 72, 124,.8);
+    --m-blue7: #29538C;
+    --m-blue7-hover: rgba(41, 83, 140, .8);
+    --m-blue8: #3163BA;
+    --m-blue8-hover: rgba(49, 99, 186, .8);
+    --m-blue9: #4179DB;
+    --m-blue9-hover: rgba(65, 121, 219, .8);
+    --m-blue10: #0C95FF;
+    --m-blue11: #1271BA;
+    --m-blue12: #1556B5;
+    --m-blue13: #193778;
+    --m-blue14: #1D2F3F;
+    --m-blue15: #0D8AEB;
+    --m-blue16: #334c5c;
+    --m-blue17: #1F3245;
+    --m-blue18:#1b3356;
+    --m-blue19: #102442;
+    --m-blue20: #122d55;
+    --m-blue21: #102e45;
+
+    --body-bg: #e9eef3;
+    --m-white0: #ffffff;
+    --m-white0-hover: rgba(255, 255, 255, .8);
+    --m-white1: #E5E5E5;
+    --m-white5: #fffefe;
+
+    --m-green0: #1FF195;
+    --m-green1: #10251d;
+
+    --m-red2: #271112;
+} 
+/* 白色主题 */
+/* :root[theme="light"] { */
+:root[theme="light"] { 
+    --m-grey0: #5179E2;
+    --m-grey1: #FEFFFF;
+    --m-grey2: #7A8A94;
+    --m-grey5: #B2C4DD;
+    --m-grey6: #ffffff;
+    --m-grey7: #F5FAFC;
+    --m-grey8: #D2DAEF;
+    --m-grey9: #FFFFFF;
+    --m-grey10: #99B5FF;
+    --m-grey11: #ffffff;
+    --m-grey12: #727C98;
+    --m-grey12-hover: rgba(114, 124, 152, .8);
+    --m-grey13: #727C98;
+    --m-grey13-hover: rgba(114, 124, 152, .8);
+    --m-grey14: #ECF2F5;
+    --m-grey15: #727C98;
+    --m-grey15-hover: rgba(114, 124, 152, .8);
+    --m-grey16: #727C98;
+    --m-grey16-hover: rgba(114, 124, 152, .8);
+    --m-grey18: #FFFFFF; /* #ECF2F5 */
+    --m-grey19: #F6F8FA;
+    --m-grey20: #DAE5EC;
+    --m-grey21: #F6F8FA;
+    --m-grey22: #E4F5FF;
+    --m-grey22-hover: rgba(228, 245, 255, .8);
+    --m-grey23: #A5CDFF;
+    --m-grey26: #5179E2;
+
+    --m-grey31: #D6DEE3;
+
+    --m-black0: #F8FBFF;
+    --m-black1: #ECF2F5;
+    --m-black2: #FFFFFF;
+    --m-black3: #718FAE;
+    --m-black4: #EDF2F7;
+    --m-black5: #ECF2F5;
+    --m-black6: #DAE5EC;
+    --m-black7: #D4E0FF;
+    --m-black8: #DAE5EC;
+    --m-black9: #e3ebf1;
+    --m-black10: #ddebed;
+    --m-black11: #ECF2F5;
+    --m-black12: #ECF2F5;
+    --m-black13: #ECF2F5;
+    --m-black14: #FFFFFF;
+    --m-black15: #F6F8FA;
+    --m-black16: #CBD7DD;
+    --m-black17: #DAE5EC;
+    --m-black18: rgba(18, 22, 24, 0.15);
+    --m-black19: rgba(246 248 250 / 20%);
+    --m-black20: #EDF2F7;
+    --m-black21: #182635;
+    --m-black22: #ffffff;
+    --m-black23: #173025;
+    --m-black24: #2c3e50;
+    --m-black25: #E4F5FF;
+    --m-black26: #3A87F7;
+    --m-black27: #ffffff;
+    --m-black28: #DDE3E8;
+    --m-black29: #2B3F52;
+    --m-black30: #15202B;
+
+    --m-blue0: #5179E2;
+    --m-blue0-hover: rgba(81, 121, 226, .8);
+    --m-blue2: #5179E2;
+    --m-blue2-hover: rgba(81, 121, 226, .8);
+    --m-blue3: #DEEFFF;
+    --m-blue4: #5179E2;
+    --m-blue5: #7497F4;
+    --m-blue6: #5179E2;
+    --m-blue6-hover: rgba(81, 121, 226, .8);
+    --m-blue7: #5179E2;
+    --m-blue7-hover: rgba(81, 121, 226, .8);
+    --m-blue8: #5179E2;
+    --m-blue8-hover: rgba(81, 121, 226, .8);
+    --m-blue9: #5179E2;
+    --m-blue9-hover: rgba(81, 121, 226, .8);
+    --m-blue10: #0C95FF;
+    --m-blue11: #ffffff;
+    --m-blue12: #D4E0FF;
+    --m-blue13: #DEEFFF;
+    --m-blue14: #ECF2F5;
+    --m-blue15: #0D8AEB;
+    --m-blue16: #ADBCC5;
+    --m-blue17: #3A87F7;
+    --m-blue18:#5179E2;
+    --m-blue19: #ECF2F5;
+    --m-blue20: #D6E0F0;
+    --m-blue21: #5179E2;
+
+    --body-bg: #FFFFFF;
+    --m-white0: #ffffff;
+    --m-white0-hover: rgba(255, 255, 255, .8);
+    --m-white1: #333333;
+    --m-white5: #FFFFFF;
+
+    --m-green0: #00A843;
+    --m-green1: #e8ffef;
+
+    --m-red2: #ffe2e2;
 }
 
 /* 黑色主题 */
-:root[theme="dark"] {
+:root[theme="black"] {
     --m-grey0: #364048 ;
     --m-grey1: #7a8a94;
     --m-grey2: #88a0ae;
@@ -48,30 +231,84 @@
     --m-grey18: #1D2327;
     --m-grey19: #162534;
     --m-grey20: #1B2A38;
-}
+    --m-grey21: #15202B;
+    --m-grey22: #424E59;
+    --m-grey22-hover: rgba(66, 78, 89, .8);
+    --m-grey23: #48545F;
+    --m-grey26: #343e48;
 
-/* 白色主题 */
-:root[theme="light"] {
-    --m-grey0: #5179E2;
-    --m-grey1: #FEFFFF;
-    --m-grey2: #7A8A94;
-    --m-grey5: #B2C4DD;
-    --m-grey6: #ffffff;
-    --m-grey7: #F5FAFC;
-    --m-grey8: #D2DAEF;
-    --m-grey9: #FFFFFF;
-    --m-grey10: #99B5FF;
-    --m-grey11: #ffffff;
-    --m-grey12: #727C98;
-    --m-grey12-hover: rgba(114, 124, 152, .8);
-    --m-grey13: #727C98;
-    --m-grey13-hover: rgba(114, 124, 152, .8);
-    --m-grey14: #ECF2F5;
-    --m-grey15: #727C98;
-    --m-grey15-hover: rgba(114, 124, 152, .8);
-    --m-grey16: #727C98;
-    --m-grey16-hover: rgba(114, 124, 152, .8);
-    --m-grey18: #FFFFFF; /* #ECF2F5 */
-    --m-grey19: #F6F8FA;
-    --m-grey20: #DAE5EC;
+    --m-grey31: #212629;
+    --m-green1: #e8ffef;
+
+    --m-black0: #242a2e;
+    --m-black1: #181e22;
+    --m-black2: #0E0E0F;
+    --m-black3: #4D5A64;
+    --m-black4: #14181B;
+    --m-black5: #121415;
+    --m-black6: #1B2F41;
+    --m-black7: #15293A;
+    --m-black8: #212629;
+    --m-black9: #161A1C;
+    --m-black10: #121618;
+    --m-black11: #0B1620;
+    --m-black12: #13202D;
+    --m-black13: #08131F;
+    --m-black14: #1F262B;
+    --m-black15: #0f161c;
+    --m-black16: #181d1f;
+    --m-black17: #2E3539;
+    --m-black18: rgba(18, 22, 24, 0.36);
+    --m-black19: rgb(26 187 207 / 20%);
+    --m-black20: #4b5861;
+    --m-black21: #182635;
+    --m-black22: #1d2f3f;
+    --m-black23: #173025;
+    --m-black24: #2c3e50;
+    --m-black25: #282e34;
+    --m-black26: #192125;
+    --m-black27: #0E1A25;
+    --m-black28: #000c17;
+    --m-black29: #2B3F52;
+    --m-black30: #15202B;
+
+    --m-blue0: #3a87f7;
+    --m-blue0-hover: rgba(58, 135, 247, .8);
+    --m-blue2: #3270d2;
+    --m-blue2-hover: rgba(58, 135, 247, .8);
+    --m-blue3: #172B56;
+    --m-blue4: #112C43;
+    --m-blue5: #084258;
+    --m-blue6: #26487C;
+    --m-blue6-hover: rgba(38, 72, 124,.8);
+    --m-blue7: #29538C;
+    --m-blue7-hover: rgba(41, 83, 140, .8);
+    --m-blue8: #3163BA;
+    --m-blue8-hover: rgba(49, 99, 186, .8);
+    --m-blue9: #4179DB;
+    --m-blue9-hover: rgba(65, 121, 219, .8);
+    --m-blue10: #0C95FF;
+    --m-blue11: #1271BA;
+    --m-blue12: #1556B5;
+    --m-blue13: #193778;
+    --m-blue14: #1D2F3F;
+    --m-blue15: #0D8AEB;
+    --m-blue16: #334c5c;
+    --m-blue17: #1F3245;
+    --m-blue18:#1b3356;
+    --m-blue19: #102442;
+    --m-blue20: #122d55;
+    --m-blue21: #102e45;
+
+    --body-bg: #e9eef3;
+    --m-white0: #ffffff;
+    --m-white0-hover: rgba(255, 255, 255, .8);
+    --m-white1: #E5E5E5;
+    --m-white5: #fffefe;
+
+    --m-green0: #1FF195;
+    --m-green1: #10251d;
+
+    --m-red2: #271112;
 }
+

src/assets/styles/variables.less

@@ -23,98 +23,101 @@
 @m-grey15-hover: var(--m-grey15-hover);
 @m-grey16: var(--m-grey16);
 @m-grey16-hover: var(--m-grey16-hover);
-@m-grey17: #556772;    // orderTable颜色没用到
+@m-grey17: #556772;                         // orderTable颜色没用到
 @m-grey18: var(--m-grey18);
 @m-grey19: var(--m-grey19);
 @m-grey20: var(--m-grey20);
-@m-grey21: #15202B;
-@m-grey22: #424E59;
-@m-grey22-hover: rgba(@m-grey22, .8);
-@m-grey23: #48545F;
+@m-grey21: var(--m-grey21);
+@m-grey22: var(--m-grey22);
+@m-grey22-hover: var(--m-grey22-hover);
+@m-grey23: var(--m-grey23);
 @m-grey24: #444444;
 @m-grey25: #3b444a;
-@m-grey26: #343e48;
+@m-grey26: var(--m-grey26);
 @m-grey27: #34444E;
 @m-grey28: #36506B;
 @m-grey29: #4D647A;
 @m-grey30: #223548;
-
-
-@m-black: rgba(0, 0, 0, 0);
-@m-black0: #242a2e;
-@m-black1: #181e22;
-@m-black2: #0E0E0F;
-@m-black3: #4D5A64;
-@m-black4: #14181B;
-@m-black5: #121415;
-@m-black6: #1B2F41;
-@m-black7: #15293A;
-@m-black8: #212629;
-@m-black9: #161A1C;
-@m-black10: #121618;
-@m-black11: #0B1620;
-@m-black12: #13202D;
-@m-black13: #08131F;
-@m-black14: #1F262B;
-@m-black15: #0f161c;
-@m-black16: #181d1f;
-@m-black17: #2E3539;
-@m-black18: rgba(18, 22, 24, 0.36);
-@m-black19: rgb(26 187 207 / 20%);
-@m-black20: #4b5861;
-@m-black21: #070808;
-@m-black22: #1d2f3f;
-@m-black23: #173025;
-@m-black24: #2c3e50;
-@m-black25: #282e34;
-@m-black26: #192125;
-@m-black27: #0E1A25;
-
-
-@m-blue0: #3a87f7;
-@m-blue0-hover: rgba(@m-blue0, .8);
-@m-blue1: #4885eb;
-@m-blue2: #3270d2;
-@m-blue2-hover: rgba(@m-blue2, .8);
-@m-blue3: #172B56;
-@m-blue4: #112C43;
-@m-blue5: #084258;
-@m-blue6: #26487C;
-@m-blue6-hover: rgba(@m-blue6, .8);
-@m-blue7: #29538C;
-@m-blue7-hover: rgba(@m-blue7, .8);
-@m-blue8: #3163BA;
-@m-blue8-hover: rgba(@m-blue8, .8);
-@m-blue9: #4179DB;
-@m-blue9-hover: rgba(@m-blue9, .8);
-@m-blue10: #0C95FF;
-@m-blue11: #1271BA;
-@m-blue12: #1556B5;
-@m-blue13: #193778;
-@m-blue14: #1D2F3F;
-@m-blue15: #0D8AEB;
-@m-blue16: #334c5c;
-@m-blue17: #1F3245;
-@m-blue18: #1b3356;
-@m-blue19: #102442;
-@m-blue20: #122d55;
-@m-blue21: #102e45;
-@m-blue22: #0e2f4c;
-@m-blue23: #223F7E;
-@m-blue24: #2484FC;
+@m-grey31: var(--m-grey31);
+
+@m-black: #000000;
+@m-black0: var(--m-black0);
+@m-black1: var(--m-black1);
+@m-black2: var(--m-black2);
+@m-black3: var(--m-black3);
+@m-black4: var(--m-black4);
+@m-black5: var(--m-black5);
+@m-black6: var(--m-black6);
+@m-black7: var(--m-black7);
+@m-black8: var(--m-black8);
+@m-black9: var(--m-black9);
+@m-black10: var(--m-black10);
+@m-black11: var(--m-black11);
+@m-black12: var(--m-black12);
+@m-black13: var(--m-black13);
+@m-black14: var(--m-black14);
+@m-black15: var(--m-black15);
+@m-black16: var(--m-black16);
+@m-black17: var(--m-black17);
+@m-black18: var(--m-black18);
+@m-black19: var(--m-black19);
+@m-black20: var(--m-black20);
+@m-black21: var(--m-black21);                // 角色详情复选框未选中背景色   白色版本等色值修改
+@m-black22: var(--m-black22);                // 交易弹窗背景色
+@m-black23: var(--m-black23);
+@m-black24: var(--m-black24);
+@m-black25: var(--m-black25);
+@m-black26: var(--m-black26);
+@m-black27: var(--m-black27);
+@m-black28: var(--m-black28);
+@m-black29: var(--m-black29);                // 角色详情复选框未选中边框色   白色版本等色值修改
+@m-black30: var(--m-black30);                // 角色详情复选框选中背景色   白色版本等色值修改
+
+
+@m-blue0: var(--m-blue0);
+@m-blue0-hover: var(--m-blue0-hover);
+@m-blue1: #4885eb;               // 登录界面色值
+@m-blue2: var(--m-blue2);
+@m-blue2-hover: var(--m-blue2-hover);
+@m-blue3: var(--m-blue3);
+@m-blue4: var(--m-blue4);
+@m-blue5: var(--m-blue5);
+@m-blue6: var(--m-blue6);
+@m-blue6-hover: var(--m-blue6-hover);
+@m-blue7: var(--m-blue7);
+@m-blue7-hover: var(--m-blue7-hover);
+@m-blue8: var(--m-blue8);
+@m-blue8-hover: var(--m-blue8-hover);
+@m-blue9: var(--m-blue9);
+@m-blue9-hover: var(--m-blue9-hover);
+@m-blue10: var(--m-blue10);
+@m-blue11: var(--m-blue11);
+@m-blue12: var(--m-blue12);
+@m-blue13: var(--m-blue13);                           // 白色版本买卖大厅小行情背景色
+@m-blue14: var(--m-blue14);
+@m-blue15: var(--m-blue15);
+@m-blue16: var(--m-blue16);
+@m-blue17: var(--m-blue17);
+@m-blue18: var(--m-blue18);
+@m-blue19: var(--m-blue19);
+@m-blue20: var(--m-blue20);
+@m-blue21: var(--m-blue21);
+@m-blue22: #0e2f4c;                                 // 交易界面色值
+@m-blue23: #223F7E;                                 // 履约明细界面色值
+@m-blue24: #2484FC;                                 // 履约明细界面色值
 
 @body-bg: #e9eef3;
-@m-white0: #ffffff;
-@m-white0-hover: rgba(@m-white0, .8);
-@m-white1: #E5E5E5;
+@m-white0: var(--m-white0);
+@m-white0-hover: var(--m-white0-hover);
+@m-white1: var(--m-white1);
 @m-white2: rgb(240, 240, 240);
 @m-white3: rgb(54 187 207);
 @m-white4: #FEFEFE;
-@m-white5: #fffefe;
+@m-white5: var(--m-white5);
 
 
-@m-green0: #1FF195;
-@m-green1: #10251d;
+@m-green0: var(--m-green0);
+@m-green1: var(--m-green1);
 @m-green2: rgb(26, 187, 207);
 @m-green3: #1abbcf;
 @m-green4: #1ee18c;
@@ -124,13 +127,13 @@
 @m-red0-hover: rgba(@m-red0, .8);
 @m-red1: #FF2B2B;
 @m-red1-hover: rgba(@m-red1, .8);
-@m-red2: #271112;
-@m-red3: #ff2b2f;
-@m-red4: #2c1b1b;
-@m-red5: #691010;
-@m-red6: #422b0d;
-@m-red7: #f52b2b;
-@m-red8: #f12a2d;
+@m-red2: var(--m-red2);
+@m-red3: #ff2b2f;                // 交易界面色值
+@m-red4: #2c1b1b;                // 交易界面色值
+@m-red5: #691010;                // 交易界面色值
+@m-red6: #422b0d;                // 交易界面色值
+@m-red7: #f52b2b;                // 交易界面色值
+@m-red8: #f12a2d;                // 交易界面色值
 @m-red9: #FF5C6F;
 @m-red9-hover: rgba(@m-red9, .8);
 @m-red10: #FB7F75;

src/common/constants/enumOrderComponents.ts

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

src/common/constants/enumRouterName.ts

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

src/common/constants/modalNameEnum.ts

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

src/router/index.ts

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

src/services/go/commonService/index.ts

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

src/views/information/account_info/compoments/managers-permission-detail/index.vue

@@ -299,12 +299,13 @@ export default defineComponent({
             margin-right: 2px;
             .ant-checkbox-inner {
                 background: @m-grey21;
-                border: 1px solid @m-black21;
+                border: 1px solid @m-black29;
                 border-radius: 3px;
             }
         }
         .ant-checkbox.ant-checkbox-checked {
             .ant-checkbox-inner {
+                background: @m-black30;
                 &::after {
                     border-color: @m-blue0;
                 }

src/views/information/goods/components/leftMenu/index.vue

@@ -1,26 +1,25 @@
 <template>
-  <div class="leftMenu">
-    <a-menu theme="dark"
+    <div class="leftMenu">
+        <a-menu
+            theme="dark"
             mode="inline"
             class="left-menu"
             v-model:selectedKeys="selectedKeys"
             v-model:openKeys="openKeys"
-            @click="menuClick">
-      <a-sub-menu v-for="item in menuList"
-                  :key="item.key">
-        <template #title>
-          <span>
-            <span class="menu-item_title"
-                  v-show="!collapsed">{{ item.title }}</span>
-          </span>
-        </template>
-        <a-menu-item :key="subItem.key"
-                     v-for="subItem in item.children">
-          <span>{{ subItem.title }}</span>
-        </a-menu-item>
-      </a-sub-menu>
-    </a-menu>
-  </div>
+            @click="menuClick"
+        >
+            <a-sub-menu v-for="item in menuList" :key="item.key">
+                <template #title>
+                    <span>
+                        <span class="menu-item_title" v-show="!collapsed">{{ item.title }}</span>
+                    </span>
+                </template>
+                <a-menu-item :key="subItem.key" v-for="subItem in item.children">
+                    <span>{{ subItem.title }}</span>
+                </a-menu-item>
+            </a-sub-menu>
+        </a-menu>
+    </div>
 </template>
 
 <script lang="ts">
@@ -96,7 +95,7 @@ export default defineComponent({
                 }
             }
             .ant-menu-inline.ant-menu-sub {
-                background-color: transparent;
+                background-color: transparent !important;
                 box-shadow: none;
                 .ant-menu-item {
                     padding-left: 64px !important;

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

@@ -19,6 +19,9 @@
                class="btn-list-sticky"
                @click="openComponent" />
     </template>
+    <template #username="{text, record }">
+      <span>{{record.userid}}{{text}}</span>
+    </template>
   </a-table>
   <component :is="componentId"
              v-if="componentId"

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

@@ -132,7 +132,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
             }
         } else {
             // 摘牌金额=挂牌价格*摘牌数量
-            result = formState.num * orderqty
+            result = formState.num * fixedprice
         }
         return Number(result.toFixed(2))
     }

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

@@ -154,7 +154,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
             }
         } else {
             // 摘牌金额=挂牌价格*摘牌数量
-            result = formState.num * orderqty
+            result = formState.num * fixedprice
         }
         return Number(result.toFixed(2))
     }

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

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

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

@@ -1,104 +1,101 @@
 <template>
-  <!-- 买卖大厅 -->
-  <div class="buy-sell-market">
-    <div class="buy-sell-market-title">
-      <a class="backIcon"
-         @click="cancel">
-        <LeftOutlined />
-      </a>
-      <div class="titleBtn">
-        <div class="name">{{selectedRow.deliverygoodsname}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn2">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">{{selectedRow.wrgoodsname}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn2">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">{{selectedRow.warehousename}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn3"
-           v-if="!isWR(enumName)">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">
-          <a-month-picker :allowClear="false"
-                          v-model:value="time"
-                          @change="timeChange"
-                          class="commonDatePicker conditionPicker" />
+    <!-- 买卖大厅 -->
+    <div class="buy-sell-market">
+        <div class="buy-sell-market-title">
+            <a class="backIcon" @click="cancel">
+                <LeftOutlined />
+            </a>
+            <div class="titleBtn">
+                <div class="name">{{selectedRow.deliverygoodsname}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn2">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">{{selectedRow.wrgoodsname}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn2">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">{{selectedRow.warehousename}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn3" v-if="!isWR(enumName)">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">
+                    <a-month-picker
+                        :allowClear="false"
+                        v-model:value="time"
+                        @change="timeChange"
+                        class="commonDatePicker conditionPicker"
+                    />
+                </div>
+                <DownOutlined />
+            </div>
+            <div class="green bdf1 ml20">
+                <div class="numBlock ml15" v-if="isFloat()">
+                    <div class="first">卖基差</div>
+                    <div class="last">{{selectedRow.sellpricemove}}</div>
+                </div>
+                <div class="numBlock ml15" v-else>
+                    <div class="first">卖价</div>
+                    <div class="last">{{selectedRow.sellprice}}</div>
+                </div>
+                <div class="numBlock">
+                    <div class="first">卖量</div>
+                    <div class="last">{{selectedRow.sellqty}}</div>
+                </div>
+            </div>
+            <div class="red ml35">
+                <div class="numBlock" v-if="isFloat()">
+                    <div class="first">买基差</div>
+                    <div class="last">{{selectedRow.buypricemove}}</div>
+                </div>
+                <div class="numBlock" v-else>
+                    <div class="first">买价</div>
+                    <div class="last">{{selectedRow.buyprice}}</div>
+                </div>
+                <div class="numBlock">
+                    <div class="first">买量</div>
+                    <div class="last">{{selectedRow.buyqty}}</div>
+                </div>
+            </div>
+            <div class="market" v-if="isFloat()">
+                <div class="first">{{selectedRow.goodscode}}</div>
+                <div class="last red">{{getGoodsPrice()}}</div>
+                <LineChartOutlined />
+            </div>
+            <BtnList :btnList="firstBtn" :record="selectedRow" @click="openComponent" />
         </div>
-        <DownOutlined />
-      </div>
-      <div class="green">
-        <div class="numBlock"
-             v-if="isFloat()">
-          <div class="first">卖基差</div>
-          <div class="last">{{selectedRow.sellpricemove}}</div>
-        </div>
-        <div class="numBlock"
-             v-else>
-          <div class="first">卖价</div>
-          <div class="last">{{selectedRow.sellprice}}</div>
-        </div>
-        <div class="numBlock">
-          <div class="first">卖量</div>
-          <div class="last">{{selectedRow.sellqty}}</div>
-        </div>
-      </div>
-      <div class="red ml35">
-        <div class="numBlock"
-             v-if="isFloat()">
-          <div class="first">买基差</div>
-          <div class="last">{{selectedRow.buypricemove}}</div>
-        </div>
-        <div class="numBlock"
-             v-else>
-          <div class="first">买价</div>
-          <div class="last">{{selectedRow.buyprice}}</div>
-        </div>
-        <div class="numBlock">
-          <div class="first">买量</div>
-          <div class="last">{{selectedRow.buyqty}}</div>
-        </div>
-      </div>
-      <div class="market"
-           v-if="isFloat()">
-        <div class="first">{{selectedRow.goodscode}}</div>
-        <div class="last red">{{getGoodsPrice()}}</div>
-        <LineChartOutlined />
-      </div>
-      <BtnList :btnList="firstBtn"
-               :record="selectedRow"
-               @click="openComponent" />
+        <a-row class="buySellHall">
+            <a-col :span="12" v-if="sellMarket.isMarket">
+                <Sell
+                    :enumName="enumName"
+                    ref="sellRef"
+                    :parantSelectedRow="selectedRow"
+                    :time="time"
+                    :btnList="handleBtnList(sellMarket.btnList)"
+                />
+            </a-col>
+            <a-col :span="12" v-if="buyMarket.isMarket">
+                <Buy
+                    :enumName="enumName"
+                    ref="buyRef"
+                    :time="time"
+                    :parantSelectedRow="selectedRow"
+                    :btnList="handleBtnList(buyMarket.btnList)"
+                />
+            </a-col>
+        </a-row>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            :goodsPrice="getGoodsPrice()"
+            :enumName="enumName"
+            :time="time"
+            @cancel="closeComponent"
+        ></component>
     </div>
-    <a-row class="buySellHall">
-      <a-col :span="12"
-             v-if="sellMarket.isMarket">
-        <Sell :enumName="enumName"
-              ref="sellRef"
-              :parantSelectedRow="selectedRow"
-              :time="time"
-              :btnList="handleBtnList(sellMarket.btnList)" />
-      </a-col>
-      <a-col :span="12"
-             v-if="buyMarket.isMarket">
-        <Buy :enumName="enumName"
-             ref="buyRef"
-             :time="time"
-             :parantSelectedRow="selectedRow"
-             :btnList="handleBtnList(buyMarket.btnList)" />
-      </a-col>
-    </a-row>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               :goodsPrice="getGoodsPrice()"
-               :enumName="enumName"
-               :time="time"
-               @cancel="closeComponent"></component>
-  </div>
 </template>
 
 <script lang="ts">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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