li.shaoyi 3 лет назад
Родитель
Сommit
456e57839d

+ 4 - 4
ERMCP/PCWEB/Menu_v6/pcweb_menu_qyfg.json

@@ -924,7 +924,7 @@
                             {
                                 "title": "期货持仓明细",
                                 "rulekey": "client_pc_web_qiyefengguan_hedgeditem_trade_finish_position",
-                                "code": "exposure_realtime_index",
+                                "code": "hedgeditem_trade_finish_position",
                                 "path": "",
                                 "component": "views/hedgeditem/trade/components/position/index.vue",
                                 "sort": 1,
@@ -935,7 +935,7 @@
                             {
                                 "title": "套期计划明细",
                                 "rulekey": "client_pc_web_qiyefengguan_hedgeditem_trade_finish_plan",
-                                "code": "exposure_realtime_index",
+                                "code": "hedgeditem_trade_finish_plan",
                                 "path": "",
                                 "component": "views/hedgeditem/trade/components/plan/index.vue",
                                 "sort": 2,
@@ -946,7 +946,7 @@
                             {
                                 "title": "现货成交明细",
                                 "rulekey": "client_pc_web_qiyefengguan_hedgeditem_trade_finish_spot",
-                                "code": "exposure_realtime_index",
+                                "code": "hedgeditem_trade_finish_spot",
                                 "path": "",
                                 "component": "views/hedgeditem/trade/components/spot/index.vue",
                                 "sort": 3,
@@ -957,7 +957,7 @@
                             {
                                 "title": "期货成交明细",
                                 "rulekey": "client_pc_web_qiyefengguan_hedgeditem_trade_finish_futures",
-                                "code": "exposure_realtime_index",
+                                "code": "hedgeditem_trade_finish_futures",
                                 "path": "",
                                 "component": "views/hedgeditem/trade/components/futures/index.vue",
                                 "sort": 4,

+ 8 - 4
ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -3284,13 +3284,15 @@ 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_spot_contract_relation', 'hedgeditemnum', '项目编号', '0', 10, 1, 1, '', '', 'hedgeditemnum', 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_spot_contract_relation', 'planstartdate', '计划开始', '0', 20, 1, 1, '', '', 'planstartdate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_relation', '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_hedgeditem_spot_contract_relation', 'planenddate', '计划结束', '0', 30, 1, 1, '', '', 'planenddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_relation', 'planstartdate', '计划开始', '0', 30, 1, 1, '', '', 'planstartdate', 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_spot_contract_relation', 'accountname', '套期主体', '0', 40, 1, 1, '', '', 'accountname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_relation', 'planenddate', '计划结束', '0', 40, 1, 1, '', '', 'planenddate', 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_spot_contract_relation', 'hedgedtype', '套期类型', '0', 50, 1, 1, '', '', 'hedgedtype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_relation', 'accountname', '套期主体', '0', 50, 1, 1, '', '', 'accountname', 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_spot_contract_relation', 'hedgedtype', '套期类型', '0', 60, 1, 1, '', '', 'hedgedtype', 0, 0, '');
 
 -- 套期 -- 套期交易 -- 未关联购销计划 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_plan', 2, '套期-套期交易-未关联购销计划', '', 'web端-套期-套期交易-未关联购销计划');
@@ -3314,6 +3316,8 @@ 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_spot_plan_relation', 'hedgeditemnum', '项目编号', '0', 10, 1, 1, '', '', 'hedgeditemnum', 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_spot_plan_relation', '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_hedgeditem_spot_plan_relation', 'planstartdate', '计划开始', '0', 30, 1, 1, '', '', 'planstartdate', 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_spot_plan_relation', 'planenddate', '计划结束', '0', 40, 1, 1, '', '', 'planenddate', 0, 0, '');