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

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -183,10 +183,10 @@
                 "remark": "",
                 "children": [
                     {
-                        "title": "待审核",
-                        "rulekey": "client_pc_web_qiyefengguan_custom_checkpending",
-                        "code": "custom_checkpending",
-                        "path": "custom_checkpending",
+                        "title": "未提交",
+                        "rulekey": "client_pc_web_qiyefengguan_custom_unsubmit",
+                        "code": "custom_unsubmit",
+                        "path": "custom_unsubmit",
                         "component": "views/information/custom/index.vue",
                         "sort": 1,
                         "isshow": true,
@@ -194,30 +194,57 @@
                         "remark": "",
                         "auth": [
                             {
-                                "label": "新增",
-                                "rulekey": "client_pc_web_qiyefengguan_custom_checkpending_add",
-                                "code": "add",
+                                "label": "修改",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_unsubmit_modify",
+                                "code": "modify",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "审核",
-                                "rulekey": "client_pc_web_qiyefengguan_custom_checkpending_check",
-                                "code": "check",
+                                "label": "删除",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_unsubmit_delete",
+                                "code": "delete",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
                                 "label": "撤销",
-                                "rulekey": "client_pc_web_qiyefengguan_custom_checkpending_cancel",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_unsubmit_cancel",
                                 "code": "cancel",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "重新提交",
-                                "rulekey": "client_pc_web_qiyefengguan_custom_checkpending_modify",
-                                "code": "modify",
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    },
+                    {
+                        "title": "待审核",
+                        "rulekey": "client_pc_web_qiyefengguan_custom_checkpending",
+                        "code": "custom_checkpending",
+                        "path": "custom_checkpending",
+                        "component": "views/information/custom/index.vue",
+                        "sort": 1,
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "新增",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_checkpending_add",
+                                "code": "add",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "审核",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_checkpending_check",
+                                "code": "check",
                                 "isshow": true,
                                 "remark": ""
                             },
@@ -249,6 +276,13 @@
                                 "remark": ""
                             },
                             {
+                                "label": "修改",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_normal_modify",
+                                "code": "modify",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "停用",
                                 "rulekey": "client_pc_web_qiyefengguan_custom_normal_disable",
                                 "code": "disable",
@@ -290,6 +324,13 @@
                                 "remark": ""
                             },
                             {
+                                "label": "删除",
+                                "rulekey": "client_pc_web_qiyefengguan_custom_disabled_delete",
+                                "code": "delete",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "详情",
                                 "rulekey": "",
                                 "code": "detail",

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -192,7 +192,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'address', '详
 -- 采购合同--待点价
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_purchase_pointprice', 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_purchase_pointprice', 'accountname', '销售方', '200', 10, 1, 1, '', '', 'accountname,', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'nickname', '销售方', '200', 10, 1, 1, '', '', 'nickname,', 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_purchase_pointprice', 'contractno', '合同编号 ', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -227,7 +227,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'start
 -- 采购合同--履约结算
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_purchase_settle', 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_purchase_settle', 'accountname', '销售方', '200', 10, 1, 1, '', '', 'accountname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'nickname', '销售方', '200', 10, 1, 1, '', '', 'nickname', 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_purchase_settle', 'contractno', '合同编号 ', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -264,7 +264,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_purchase_all', 'contracctstatus', '状态', '0', 10, 1, 1, '', '', 'contracctstatus', 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_purchase_all', 'accountname', '销售方 ', '200', 20, 1, 1, '', '', 'accountname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_all', 'nickname', '销售方 ', '200', 20, 1, 1, '', '', 'nickname', 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_purchase_all', 'contractno', '合同编号 ', '0', 30, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -1505,7 +1505,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_aggregate_profit_and_loss',
 -- 报表 - 敞口报表 - 现货合同变动量明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_change_in_spot_contract', 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_change_in_spot_contract', 'buyusername', '交易用户', '200', 10, 1, 1, '', '', 'buyusername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_spot_contract', 'username', '交易用户', '200', 10, 1, 1, '', '', 'username', 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_change_in_spot_contract', 'contractno', '合同编号', '200', 20, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -1517,7 +1517,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_spot_contract', 's
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_spot_contract', 'deliverygoodsname', '现货品种', '0', 60, 1, 1, '', '', 'deliverygoodsname', 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_change_in_spot_contract', 'wrstandardname', '现货品类', '0', 70, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_spot_contract', 'wrstandardname', '现货商品', '0', 70, 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_change_in_spot_contract', 'biztype', '期现用途', '0', 80, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -1540,7 +1540,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_hedging_plan', 'co
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_hedging_plan', 'deliverygoodsname', '现货品种', '0', 40, 1, 1, '', '', 'spotfloatpl', 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_change_in_hedging_plan', 'wrstandardname', '现货品类', '0', 50, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_change_in_hedging_plan', 'wrstandardname', '现货商品', '0', 50, 1, 1, '', '', 'deliverygoodsname', 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_change_in_hedging_plan', 'qty', '计划量', '0', 60, 1, 1, '', 'FormatterUnit,enumdicname', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)