update

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json → ERMCP/PCWEB/Menu_v6/pc_menu_ermcp.json

@@ -74,213 +74,6 @@
                 ]
             },
             {
-                "title": "现货仓单",
-                "rulekey": "client_pc_web_qiyefengguan_spot_warrant",
-                "code": "spot_warrant",
-                "sort": 1,
-                "isshow": true,
-                "component": "views/order/spot_warran/index.vue",
-                "path": "",
-                "url": "",
-                "remark": "",
-                "children": [
-                    {
-                        "title": "现货汇总",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_spot_summary",
-                        "code": "spot_warrant_spot_summary",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_spot_summary/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "查看库存",
-                                "rulekey": "",
-                                "code": "check",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "库存汇总",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_inventory_summary",
-                        "code": "spot_warrant_inventory_summary",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_inventory_summary/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": []
-                    },
-                    {
-                        "title": "现货明细",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_spot_details",
-                        "code": "spot_warrant_spot_details",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_spot_details/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "挂牌",
-                                "rulekey": "",
-                                "code": "listed",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "提货",
-                                "rulekey": "",
-                                "code": "pick_up",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "挂单",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_pending_order",
-                        "code": "spot_warrant_pending_order",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_pending_order/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "撤单",
-                                "rulekey": "",
-                                "code": "cancel",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "议价单",
-                                "rulekey": "",
-                                "code": "bargain",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "议价",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_bargain",
-                        "code": "spot_warrant_bargain",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_bargain/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "成交",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_deal",
-                        "code": "spot_warrant_deal",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_deal/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "指定成交",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_designated_deal",
-                        "code": "spot_warrant_designated_deal",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_designated_deal/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "purchase",
-                                "rulekey": "",
-                                "code": "确定购买",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "ignore",
-                                "rulekey": "",
-                                "code": "忽略",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "resell",
-                                "rulekey": "",
-                                "code": "撤销出售",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "提货",
-                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_in_and_out_warehouse",
-                        "code": "spot_warrant_in_and_out_warehouse",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_in_and_out_warehouse/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "pick_up",
-                                "rulekey": "",
-                                "code": "确认提货",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "cacel",
-                                "rulekey": "",
-                                "code": "撤销",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    }
-                ]
-            },
-            {
                 "title": "资金信息",
                 "rulekey": "client_pc_web_qiyefengguan_funding_information",
                 "code": "funding_information",
@@ -321,7 +114,7 @@
     },
     {
         "title": "市场",
-        "rulekey": "",
+        "rulekey": "client_pc_web_common_market",
         "code": "market",
         "path": "/market",
         "component": "Layout",
@@ -330,7 +123,7 @@
         "children": [
             {
                 "title": "期货市场",
-                "rulekey": "",
+                "rulekey": "client_pc_web_market_futures",
                 "code": "market_futures",
                 "path": "market_futures",
                 "component": "Main",
@@ -341,7 +134,7 @@
                 "children": [
                     {
                         "title": "期货市场",
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_market_futures_tab",
                         "code": "market_futures_tab",
                         "path": "market_futures_tab",
                         "component": "views/market/futures/index.vue",
@@ -366,18 +159,6 @@
                         ]
                     }
                 ]
-            },
-            {
-                "title": "现货市场",
-                "rulekey": "client_pc_web_market_spot",
-                "code": "market_spot",
-                "path": "market_spot",
-                "component": "Main",
-                "sort": 20,
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": []
             }
         ]
     },

ERMCP/PCWEB/Menu_v6/pc_menu_trade.json

@@ -0,0 +1,243 @@
+[
+    {
+        "title": "底部单据菜单",
+        "rulekey": "client_pc_web_order_bottom",
+        "code": "bottom",
+        "sort": 1,
+        "isshow": true,
+        "component": "layout/index.vue",
+        "path": "",
+        "children": [
+            {
+                "title": "现货仓单",
+                "rulekey": "client_pc_web_qiyefengguan_spot_warrant",
+                "code": "spot_warrant",
+                "sort": 1,
+                "isshow": true,
+                "component": "views/order/spot_warran/index.vue",
+                "path": "",
+                "url": "",
+                "remark": "",
+                "children": [
+                    {
+                        "title": "现货汇总",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_spot_summary",
+                        "code": "spot_warrant_spot_summary",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_spot_summary/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "查看库存",
+                                "rulekey": "",
+                                "code": "check",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "库存汇总",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_inventory_summary",
+                        "code": "spot_warrant_inventory_summary",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_inventory_summary/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": []
+                    },
+                    {
+                        "title": "现货明细",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_spot_details",
+                        "code": "spot_warrant_spot_details",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_spot_details/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "挂牌",
+                                "rulekey": "",
+                                "code": "listed",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "提货",
+                                "rulekey": "",
+                                "code": "pick_up",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "挂单",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_pending_order",
+                        "code": "spot_warrant_pending_order",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_pending_order/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "撤单",
+                                "rulekey": "",
+                                "code": "cancel",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "议价单",
+                                "rulekey": "",
+                                "code": "bargain",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "议价",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_bargain",
+                        "code": "spot_warrant_bargain",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_bargain/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "成交",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_deal",
+                        "code": "spot_warrant_deal",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_deal/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "指定成交",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_designated_deal",
+                        "code": "spot_warrant_designated_deal",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_designated_deal/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "purchase",
+                                "rulekey": "",
+                                "code": "确定购买",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "ignore",
+                                "rulekey": "",
+                                "code": "忽略",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "resell",
+                                "rulekey": "",
+                                "code": "撤销出售",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "提货",
+                        "rulekey": "client_pc_web_qiyefengguan_spot_warrant_in_and_out_warehouse",
+                        "code": "spot_warrant_in_and_out_warehouse",
+                        "sort": 1,
+                        "isshow": true,
+                        "component": "components/spot_warrant_in_and_out_warehouse/index.vue",
+                        "path": "",
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "pick_up",
+                                "rulekey": "",
+                                "code": "确认提货",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "cacel",
+                                "rulekey": "",
+                                "code": "撤销",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "title": "市场",
+        "rulekey": "client_pc_web_common_market",
+        "code": "market",
+        "path": "/market",
+        "component": "Layout",
+        "sort": 1,
+        "isshow": true,
+        "children": [
+            {
+                "title": "现货市场",
+                "rulekey": "client_pc_web_market_spot",
+                "code": "market_spot",
+                "path": "market_spot",
+                "component": "Main",
+                "sort": 20,
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": []
+            }
+        ]
+    }
+]

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -401,43 +401,43 @@ insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) valu
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'MiddleGoodsName', '套保品种', '0', 10, 1, 1, '', '', 'MiddleGoodsName', 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', 'enumdicname', '单位', '0', 20, 1, 1, '', '', 'enumdicname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'ENUMDICNAME', '单位', '0', 20, 1, 1, '', '', 'ENUMDICNAME', 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', 'TotalExposure', '总敞口', '0', 30, 1, 1, '', '', 'TotalExposure', 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', 'DiffQty', '总敞口变动量', '150', 40, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffQty', '总敞口变动量', '150', 40, 1, 1, '', '', 'diffQty', 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', 'NeedHedgeExposoure', '套保敞口', '0', 50, 1, 1, '', '', 'NeedHedgeExposoure', 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', 'DiffExposoureQty', '套保敞口变动量', '150', 60, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffExposoureQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffExposoureQty', '套保敞口变动量', '150', 60, 1, 1, '', '', 'diffExposoureQty', 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', 'TotalNeedHedgeQty', '现货应套保总量', '150', 70, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalNeedHedgeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalNeedHedgeQty', '现货应套保总量', '150', 70, 1, 1, '', '', 'TotalNeedHedgeQty', 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', 'DiffSpotHedgeQty', '现货应套保总量变动量', '200', 80, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffSpotHedgeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffSpotHedgeQty', '现货应套保总量变动量', '200', 80, 1, 1, '', '', 'diffSpotHedgeQty', 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', 'TotalFutureQty', '期货总量', '0', 90, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalFutureQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalFutureQty', '期货总量', '0', 90, 1, 1, '', '', 'TotalFutureQty', 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', 'DiffFutuQty', '期货总量变动量', '0', 100, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffFutuQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffFutuQty', '期货总量变动量', '0', 100, 1, 1, '', '', 'diffFutuQty', 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', 'TotalSpotQty', '现货总量', '0', 110, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalSpotQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalSpotQty', '现货总量', '0', 110, 1, 1, '', '', 'TotalSpotQty', 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', 'DiffSpotQty', '现货总量变动量', '150', 120, 1, 1, '', '', 'DiffSpotQty', 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', 'hedgeqty', '套保量', '0', 130, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'hedgeqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'hedgeqty', '套保量', '0', 130, 1, 1, '', '', 'hedgeqty', 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', 'DiffHedgeQty', '套保变动量', '0', 140, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffHedgeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffHedgeQty', '套保变动量', '0', 140, 1, 1, '', '', 'diffHedgeQty', 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', 'MiddleGoodsHedgeRatio', '套保比例', '0', 150, 1, 1, '', 'FromatterPercent', 'MiddleGoodsHedgeRatio', 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', 'needhedgeqty', '应套保量', '0', 160, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'needhedgeqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needhedgeqty', '应套保量', '0', 160, 1, 1, '', '', 'needhedgeqty', 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', 'arbitrageqty', '套利量', '0', 170, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'arbitrageqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'arbitrageqty', '套利量', '0', 170, 1, 1, '', '', 'arbitrageqty', 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', 'DiffArbitrageQty', '套利变动量', '0', 180, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffArbitrageQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffArbitrageQty', '套利变动量', '0', 180, 1, 1, '', '', 'diffArbitrageQty', 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', 'needarbitrageratio', '套利比例', '0', 190, 1, 1, '', 'FromatterPercent', 'needarbitrageratio', 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', 'needarbitrageqty', '应套利量', '0', 200, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'needarbitrageqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needarbitrageqty', '应套利量', '0', 200, 1, 1, '', '', 'needarbitrageqty', 0, 0, '');
 
 -- 实时敞口--现货明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_exposure_detail', 2, '实时敞口--现货明细', '', 'web端--实时敞口--现货明细');
@@ -450,9 +450,9 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'wrstandar
 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', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 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', 'qty', '现货商品变动量', '0', 50, 1, 1, '', 'FormatterUnit,enumdicname', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'qty', '现货商品变动量', '0', 50, 1, 1, '', '', 'qty', 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', 'changeQty', '套保品种变动量', '0', 60, 1, 1, '', 'FormatterUnit,enumdicname', 'changeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'changeQty', '套保品种变动量', '0', 60, 1, 1, '', '', 'changeQty', 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)
@@ -1027,21 +1027,17 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_manage_applylog', 'use
 -- 业务 - 计划 -
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedging_plan', 2, '业务-套保计划', '', 'web端-业务-套保计划');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanstatus', '状态', '0', 10, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanno', '计划名称', '0', 10, 1, 1, '', '', 'hedgeplanno', 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_hedging_plan', 'hedgeplanno', '计划名称', '0', 20, 1, 1, '', '', 'hedgeplanno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'wrstandardname', '商品', '0', 20, 1, 1, '', '', 'wrstandardname', 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_hedging_plan', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 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_hedging_plan', 'wrstandardname', '商品', '0', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'currencyname', '结算币种', '0', 40, 1, 1, '', '', 'currencyname', 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_hedging_plan', 'currencyname', '结算币种', '0', 50, 1, 1, '', '', 'currencyname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'planqty', '计划量', '0', 50, 1, 1, '', '', 'planqty', 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_hedging_plan', 'planqty', '计划量', '0', 60, 1, 1, '', '', 'planqty', 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_hedging_plan', 'tradeusername', '交易用户', '0', 70, 1, 1, '', '', 'tradeusername', 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_hedging_plan', 'remark', '备注', '0', 80, 1, 1, '', '', 'remark', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanstatus', '状态', '0', 60, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
 
 -- 查询-库存查询-当前库存
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_current_inventory', 2, '库存查询-当前库存', '', 'web端-库存查询-当前库存');
@@ -1236,7 +1232,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_report', 'diffexpos
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_report', 'totalneedhedgeqty', '现货应套保总量', '160', 80, 1, 1, '', '', 'totalneedhedgeqty', 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_report', 'diffhedgeqty', '现货应套保总量变动量', '160', 90, 1, 1, '', '', 'diffhedgeqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_report', 'diffhedgeqty', '现货应套保总量变动量', '200', 90, 1, 1, '', '', 'diffhedgeqty', 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_report', 'totalfutureqty', '期货总量', '0', 100, 1, 1, '', '', 'totalfutureqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)