li.shaoyi 3 yıl önce
ebeveyn
işleme
e0d5c660e4

+ 88 - 23
ERMCP/PCWEB/Menu_v6/pcweb_menu_qyfg.json

@@ -1051,9 +1051,9 @@
             },
             {
                 "title": "套期项目关联",
-                "rulekey": "client_pc_web_qiyefengguan_search_spot",
-                "code": "search_spot",
-                "path": "search_spot",
+                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation",
+                "code": "hedgeditem_relation",
+                "path": "hedgeditem_relation",
                 "component": "Main",
                 "sort": 4,
                 "isshow": true,
@@ -1062,10 +1062,10 @@
                 "children": [
                     {
                         "title": "未关联采购合同",
-                        "rulekey": "client_pc_web_qiyefengguan_search_purchase",
-                        "code": "search_purchase",
-                        "path": "search_purchase",
-                        "component": "views/business/search/spot/index.vue",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_purchase",
+                        "code": "hedgeditem_relation_purchase",
+                        "path": "hedgeditem_relation_purchase",
+                        "component": "views/hedgeditem/relation/contract/index.vue",
                         "sort": 1,
                         "isshow": true,
                         "url": "",
@@ -1073,8 +1073,8 @@
                         "auth": [
                             {
                                 "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_search_purchase_bind",
-                                "code": "search_purchase_bind",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_purchase_bind",
+                                "code": "bind",
                                 "isshow": true,
                                 "remark": ""
                             },
@@ -1089,10 +1089,10 @@
                     },
                     {
                         "title": "未关联销售合同",
-                        "rulekey": "client_pc_web_qiyefengguan_search_sell",
-                        "code": "search_sell",
-                        "path": "search_sell",
-                        "component": "views/business/search/spot/index.vue",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_sell",
+                        "code": "hedgeditem_relation_sell",
+                        "path": "hedgeditem_relation_sell",
+                        "component": "views/hedgeditem/relation/contract/index.vue",
                         "sort": 2,
                         "isshow": true,
                         "url": "",
@@ -1100,8 +1100,8 @@
                         "auth": [
                             {
                                 "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_search_sell_bind",
-                                "code": "search_sell_bind",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_sell_bind",
+                                "code": "bind",
                                 "isshow": true,
                                 "remark": ""
                             },
@@ -1116,10 +1116,10 @@
                     },
                     {
                         "title": "未关联购销计划",
-                        "rulekey": "client_pc_web_qiyefengguan_search_plan",
-                        "code": "search_plan",
-                        "path": "search_plan",
-                        "component": "views/business/search/plan/index.vue",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_plan",
+                        "code": "hedgeditem_relation_plan",
+                        "path": "hedgeditem_relation_plan",
+                        "component": "views/hedgeditem/relation/plan/index.vue",
                         "sort": 3,
                         "isshow": true,
                         "url": "",
@@ -1127,8 +1127,8 @@
                         "auth": [
                             {
                                 "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_search_plan_bind",
-                                "code": "search_plan_bind",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_plan_bind",
+                                "code": "bind",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -1207,7 +1207,7 @@
                 ]
             },
             {
-                "title": "现货参考价",
+                "title": "现货市场价",
                 "rulekey": "client_pc_web_qiyefengguan_spotmarket",
                 "code": "spotmarket",
                 "path": "spotmarket",
@@ -1218,7 +1218,7 @@
                 "remark": "",
                 "children": [
                     {
-                        "title": "现货参考价",
+                        "title": "现货市场价",
                         "rulekey": "client_pc_web_qiyefengguan_spotmarket_price",
                         "code": "spotmarket_price",
                         "path": "spotmarket_price",
@@ -1720,6 +1720,71 @@
                 ]
             },
             {
+                "title": "现货查询",
+                "rulekey": "client_pc_web_qiyefengguan_search_spot",
+                "code": "search_spot",
+                "path": "search_spot",
+                "component": "Main",
+                "sort": 4,
+                "isshow": false,
+                "url": "",
+                "remark": "",
+                "children": [
+                    {
+                        "title": "采购合同",
+                        "rulekey": "client_pc_web_qiyefengguan_search_purchase",
+                        "code": "search_purchase",
+                        "path": "search_purchase",
+                        "component": "views/business/search/spot/index.vue",
+                        "sort": 1,
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "销售合同",
+                        "rulekey": "client_pc_web_qiyefengguan_search_sell",
+                        "code": "search_sell",
+                        "path": "search_sell",
+                        "component": "views/business/search/spot/index.vue",
+                        "sort": 2,
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "购销计划",
+                        "rulekey": "client_pc_web_qiyefengguan_search_plan",
+                        "code": "search_plan",
+                        "path": "search_plan",
+                        "component": "views/business/search/plan/index.vue",
+                        "sort": 3,
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "auth": []
+                    }
+                ]
+            },
+            {
                 "title": "期现关联",
                 "rulekey": "client_pc_web_qiyefengguan_futures_spot",
                 "code": "futures_spot",

+ 34 - 3
ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -3243,8 +3243,8 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in', 'rel
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in', 'enableqty', '项目可关联手数', '0', 90, 1, 1, '', '', 'enableqty', 0, 0, '');
 
--- 套期 -- 套期交易 -- 内部未关联成交单 -- 关联项目 --
-insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_futures_in_relation', 2, '套期-套期交易-内部未关联成交单-关联项目', '', 'web端-套期-套期交易-内部未关联成交单-关联项目');
+-- 套期 -- 套期交易 -- 内部成交单关联项目 --
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_futures_in_relation', 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_futures_in_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)
@@ -3256,4 +3256,35 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relati
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relation', 'undefined', '应套保数量', '0', 50, 1, 1, '', '', 'undefined', 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_futures_in_relation', 'futurehedgeqty', '已关联数量', '0', 60, 1, 1, '', '', 'futurehedgeqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relation', 'futurehedgeqty', '已关联数量', '0', 60, 1, 1, '', '', 'futurehedgeqty', 0, 0, '');
+
+
+-- 套期 -- 套期交易 -- 合同关联项目 --
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_contract_relation', 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_spot_contract_relation', 'undefined', '项目编号', '0', 10, 1, 1, '', '', 'undefined', 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', 'undefined', '项目名称', '0', 20, 1, 1, '', '', 'undefined', 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', 'undefined', '计划开始', '0', 30, 1, 1, '', '', 'undefined', 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', 'undefined', '计划结束', '0', 40, 1, 1, '', '', 'undefined', 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', 'undefined', '套期主体', '0', 50, 1, 1, '', '', 'undefined', 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', 'undefined', '套期类型', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+
+-- 套期 -- 套期交易 -- 计划关联项目 --
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_plan_relation', 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_spot_plan_relation', 'undefined', '项目编号', '0', 10, 1, 1, '', '', 'undefined', 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', 'undefined', '项目名称', '0', 20, 1, 1, '', '', 'undefined', 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', 'undefined', '计划开始', '0', 30, 1, 1, '', '', 'undefined', 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', 'undefined', '计划结束', '0', 40, 1, 1, '', '', 'undefined', 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', 'undefined', '套期主体', '0', 50, 1, 1, '', '', 'undefined', 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', 'undefined', '套期类型', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');