update

ERMCP/PCWEB/Menu_v6/pcweb_menu_qyfg.json

@@ -825,7 +825,7 @@
                 "code": "hedgeditem_trade",
                 "path": "hedgeditem_trade",
                 "component": "Main",
-                "sort": 2,
+                "sort": 1,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -970,78 +970,85 @@
                 ]
             },
             {
-                "title": "期货成交关联",
-                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures",
-                "code": "hedgeditem_futures",
-                "path": "hedgeditem_futures",
+                "title": "套期项目关联",
+                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot",
+                "code": "hedgeditem_spot",
+                "path": "hedgeditem_spot",
                 "component": "Main",
-                "sort": 3,
+                "sort": 2,
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
                     {
-                        "title": "外部成交单关联",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_out",
-                        "code": "hedgeditem_futures_out",
-                        "path": "hedgeditem_futures_out",
-                        "component": "views/iframe/index.vue",
+                        "title": "未关联采购合同",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_purchase",
+                        "code": "hedgeditem_spot_purchase",
+                        "path": "hedgeditem_spot_purchase",
+                        "component": "views/hedgeditem/spot/contract/index.vue",
                         "sort": 1,
                         "isshow": true,
-                        "url": "/link/patradelink/initcommonview",
-                        "remark": "管理端",
+                        "url": "",
+                        "remark": "",
                         "auth": [
                             {
-                                "label": "关联",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_out_bind",
-                                "code": "relation",
+                                "label": "关联项目",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_purchase_bind",
+                                "code": "bind",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "解除关联",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_out_unbind",
-                                "code": "del",
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
                                 "isshow": true,
                                 "remark": ""
                             }
                         ]
                     },
                     {
-                        "title": "期现单据关联",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_in",
-                        "code": "hedgeditem_futures_in",
-                        "path": "hedgeditem_futures_in",
-                        "component": "views/hedgeditem/futures/in/index.vue",
+                        "title": "未关联销售合同",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_sell",
+                        "code": "hedgeditem_spot_sell",
+                        "path": "hedgeditem_spot_sell",
+                        "component": "views/hedgeditem/spot/contract/index.vue",
                         "sort": 2,
                         "isshow": true,
                         "url": "",
                         "remark": "",
                         "auth": [
                             {
-                                "label": "关联",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_in_bind",
+                                "label": "关联项目",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_sell_bind",
                                 "code": "bind",
                                 "isshow": true,
                                 "remark": ""
+                            },
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
                             }
                         ]
                     },
                     {
-                        "title": "关联记录",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_record",
-                        "code": "hedgeditem_futures_record",
-                        "path": "hedgeditem_futures_record",
-                        "component": "views/iframe/index.vue",
+                        "title": "未关联购销计划",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_plan",
+                        "code": "hedgeditem_spot_plan",
+                        "path": "hedgeditem_spot_plan",
+                        "component": "views/hedgeditem/spot/plan/index.vue",
                         "sort": 3,
                         "isshow": true,
-                        "url": "/link/patradelink/initcommonview",
-                        "remark": "管理端",
+                        "url": "",
+                        "remark": "",
                         "auth": [
                             {
-                                "label": "解除关联",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_record_unbind",
-                                "code": "del",
+                                "label": "关联项目",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_plan_bind",
+                                "code": "bind",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -1050,85 +1057,85 @@
                 ]
             },
             {
-                "title": "套期项目关联",
-                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot",
-                "code": "hedgeditem_spot",
-                "path": "hedgeditem_spot",
+                "title": "期货成交关联",
+                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures",
+                "code": "hedgeditem_futures",
+                "path": "hedgeditem_futures",
                 "component": "Main",
-                "sort": 4,
+                "sort": 3,
                 "isshow": true,
                 "url": "",
                 "remark": "",
                 "children": [
                     {
-                        "title": "未关联采购合同",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_purchase",
-                        "code": "hedgeditem_spot_purchase",
-                        "path": "hedgeditem_spot_purchase",
-                        "component": "views/hedgeditem/spot/contract/index.vue",
+                        "title": "外部成交单关联",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_out",
+                        "code": "hedgeditem_futures_out",
+                        "path": "hedgeditem_futures_out",
+                        "component": "views/iframe/index.vue",
                         "sort": 1,
                         "isshow": true,
-                        "url": "",
-                        "remark": "",
+                        "url": "/link/patradelink/initcommonview",
+                        "remark": "管理端",
                         "auth": [
                             {
-                                "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_purchase_bind",
-                                "code": "bind",
+                                "label": "关联",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_out_bind",
+                                "code": "relation",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
+                                "label": "解除关联",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_out_unbind",
+                                "code": "del",
                                 "isshow": true,
                                 "remark": ""
                             }
                         ]
                     },
                     {
-                        "title": "未关联销售合同",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_sell",
-                        "code": "hedgeditem_spot_sell",
-                        "path": "hedgeditem_spot_sell",
-                        "component": "views/hedgeditem/spot/contract/index.vue",
+                        "title": "期现单据关联",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_in",
+                        "code": "hedgeditem_futures_in",
+                        "path": "hedgeditem_futures_in",
+                        "component": "views/hedgeditem/futures/in/index.vue",
                         "sort": 2,
                         "isshow": true,
                         "url": "",
                         "remark": "",
                         "auth": [
                             {
-                                "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_sell_bind",
-                                "code": "bind",
+                                "label": "补单关联",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_in_add",
+                                "code": "add",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
+                                "label": "关联",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_in_bind",
+                                "code": "bind",
                                 "isshow": true,
                                 "remark": ""
                             }
                         ]
                     },
                     {
-                        "title": "未关联购销计划",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_plan",
-                        "code": "hedgeditem_spot_plan",
-                        "path": "hedgeditem_spot_plan",
-                        "component": "views/hedgeditem/spot/plan/index.vue",
+                        "title": "关联记录",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_record",
+                        "code": "hedgeditem_futures_record",
+                        "path": "hedgeditem_futures_record",
+                        "component": "views/iframe/index.vue",
                         "sort": 3,
                         "isshow": true,
-                        "url": "",
-                        "remark": "",
+                        "url": "/link/patradelink/initcommonview",
+                        "remark": "管理端",
                         "auth": [
                             {
-                                "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_plan_bind",
-                                "code": "bind",
+                                "label": "解除关联",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_futures_record_unbind",
+                                "code": "del",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -1142,7 +1149,7 @@
                 "code": "hedgeditem_exposure",
                 "path": "hedgeditem_exposure",
                 "component": "Main",
-                "sort": 1,
+                "sort": 4,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2706,12 +2713,37 @@
         "isshow": true,
         "children": [
             {
+                "title": "项目报表",
+                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_report",
+                "code": "hedgeditem_report",
+                "path": "hedgeditem_report",
+                "component": "Main",
+                "sort": 1,
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                    {
+                        "title": "项目报表",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_report_hedgeditem",
+                        "code": "hedgeditem_report_hedgeditem",
+                        "path": "hedgeditem_report_hedgeditem",
+                        "component": "views/report/hedgeditem/list/hedgeditem/index.vue",
+                        "sort": 1,
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "auth": []
+                    }
+                ]
+            },
+            {
                 "title": "现货报表",
                 "rulekey": "client_pc_web_qiyefengguan_spot_report",
                 "code": "spot_report",
                 "path": "spot_report",
                 "component": "Main",
-                "sort": 1,
+                "sort": 2,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2744,7 +2776,7 @@
                 "code": "exposure_report",
                 "path": "exposure_report",
                 "component": "Main",
-                "sort": 2,
+                "sort": 3,
                 "isshow": false,
                 "url": "",
                 "remark": "",
@@ -2798,7 +2830,7 @@
                 "code": "future_report",
                 "path": "future_report",
                 "component": "Main",
-                "sort": 3,
+                "sort": 4,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2831,7 +2863,7 @@
                 "code": "finance_report",
                 "path": "finance_report",
                 "component": "Main",
-                "sort": 4,
+                "sort": 5,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2871,7 +2903,7 @@
                 "code": "inventory_report",
                 "path": "inventory_report",
                 "component": "Main",
-                "sort": 5,
+                "sort": 6,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2911,7 +2943,7 @@
                 "code": "warehouse_report",
                 "path": "warehouse_report",
                 "component": "Main",
-                "sort": 6,
+                "sort": 7,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2944,7 +2976,7 @@
                 "code": "sum_pl_report",
                 "path": "sum_pl_report",
                 "component": "Main",
-                "sort": 7,
+                "sort": 8,
                 "isshow": true,
                 "url": "",
                 "remark": "",
@@ -2977,8 +3009,8 @@
                 "code": "price_report",
                 "path": "price_report",
                 "component": "Main",
-                "sort": 8,
-                "isshow": true,
+                "sort": 9,
+                "isshow": false,
                 "url": "",
                 "remark": "",
                 "children": [
@@ -2995,31 +3027,6 @@
                         "auth": []
                     }
                 ]
-            },
-            {
-                "title": "套期项目报表",
-                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_report",
-                "code": "hedgeditem_report",
-                "path": "hedgeditem_report",
-                "component": "Main",
-                "sort": 9,
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": [
-                    {
-                        "title": "套期项目报表",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_report_hedgeditem",
-                        "code": "hedgeditem_report_hedgeditem",
-                        "path": "hedgeditem_report_hedgeditem",
-                        "component": "views/report/hedgeditem/list/hedgeditem/index.vue",
-                        "sort": 1,
-                        "isshow": true,
-                        "url": "",
-                        "remark": "",
-                        "auth": []
-                    }
-                ]
             }
         ]
     },

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -2971,7 +2971,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position
 -- 套期 -- 敞口监控 -- 现货变动明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_exposure_spot_details', 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_hedgeditem_exposure_spot_details', 'tradedate', '日期时间', '0', 10, 1, 1, '', '', 'tradedate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'createtime', '日期时间', '0', 10, 1, 1, '', '', 'createtime', 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_hedgeditem_exposure_spot_details', 'exetype', '执行类型', '0', 20, 1, 1, '', '', 'exetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3120,7 +3120,7 @@ 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_hedgeditem_trade_position_details', 'ordertype', '套期工具', '0', 10, 1, 1, '', '', 'ordertype', 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_hedgeditem_trade_position_details', 'goodsid', '期货合约', '0', 20, 1, 1, '', '', 'goodsid', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_position_details', 'optioncode', '期货合约', '0', 20, 1, 1, '', '', 'optioncode', 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_hedgeditem_trade_position_details', 'closepl', '期货损益', '0', 30, 1, 1, '', '', 'closepl', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)