Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/Configuration

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -531,9 +531,9 @@
                     },
                     {
                         "title": "管理账户",
-                        "rulekey": "account_manager",
-                        "code": "account_manager",
-                        "path": "account_manager",
+                        "rulekey": "account_info_manager",
+                        "code": "account_info_manager",
+                        "path": "account_info_manager",
                         "component": "views/information/account_info/list/account_info_manager/index.vue",
                         "sort": 3,
                         "isshow": true,
@@ -1135,9 +1135,9 @@
             },
             {
                 "title": "现货查询",
-                "rulekey": "search",
-                "code": "search",
-                "path": "search",
+                "rulekey": "search_spot",
+                "code": "search_spot",
+                "path": "search_spot",
                 "component": "Main",
                 "sort": 4,
                 "isshow": true,
@@ -2421,7 +2421,7 @@
                 "remark": "",
                 "children": [
                     {
-                        "title": "现货报表",
+                        "title": "定价报表",
                         "rulekey": "price_report_spot",
                         "code": "price_report_spot",
                         "path": "price_report_spot",
@@ -2512,7 +2512,7 @@
                                 "label": "修改",
                                 "rulekey": "platinum_custom_normal_modify",
                                 "code": "modify",
-                                "isshow": true,
+                                "isshow": false,
                                 "remark": ""
                             },
                             {

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -469,8 +469,6 @@ insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, Colum
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'relateNo', '合同（计划）编号 ', '0', 70, 1, 1, '', '', 'relateNo', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'convertfactor', '折算系数', '0', 80, 1, 1, '', '', 'convertfactor', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'convertratio', '套保系数 ', '0', 90, 1, 1, '', '', 'convertratio', 0, 0, '');
 
 -- 实时敞口--期货明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_exposure_futures_detail', 2, '实时敞口--期货明细', '', 'web端--实时敞口--期货明细');