huangbin 4 years ago
parent
commit
721d6d1d37

+ 319 - 3
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": []
       }
     ]
   },

+ 1 - 1
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))
     }

+ 1 - 1
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))
     }