Przeglądaj źródła

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

huangbin 4 lat temu
rodzic
commit
995fd10626
1 zmienionych plików z 130 dodań i 31 usunięć
  1. 130 31
      ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

+ 130 - 31
ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -267,6 +267,13 @@
                                 "code": "disable",
                                 "isshow": true,
                                 "remark": ""
+                            },
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
                             }
                         ]
                     },
@@ -275,7 +282,7 @@
                         "rulekey": "warehouse_disabled",
                         "code": "warehouse_disabled",
                         "path": "warehouse_disabled",
-                        "component": "views/information/warehouse-info/list/stop-use/index.vue",
+                        "component": "views/information/warehouse-info/list/normal-use/index.vue",
                         "sort": 2,
                         "isshow": true,
                         "url": "",
@@ -294,6 +301,13 @@
                                 "code": "recover",
                                 "isshow": true,
                                 "remark": ""
+                            },
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
                             }
                         ]
                     }
@@ -318,7 +332,7 @@
                         "component": "views/iframe/index.vue",
                         "sort": 1,
                         "isshow": true,
-                        "url": "",
+                        "url": "/ermcp/ermcppaareasubject/jyztinit",
                         "remark": "管理端",
                         "auth": [
                             {
@@ -338,7 +352,7 @@
                             {
                                 "label": "停用",
                                 "rulekey": "company_normal_disable",
-                                "code": "stop",
+                                "code": "del",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -352,13 +366,13 @@
                         "component": "views/iframe/index.vue",
                         "sort": 2,
                         "isshow": true,
-                        "url": "",
+                        "url": "/ermcp/ermcppaareasubject/jyztinit",
                         "remark": "管理端",
                         "auth": [
                             {
                                 "label": "恢复",
                                 "rulekey": "company_disabled_recover",
-                                "code": "recover",
+                                "code": "active",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -417,6 +431,13 @@
                                 "remark": ""
                             },
                             {
+                                "label": "解锁",
+                                "rulekey": "account_spot_unlocked",
+                                "code": "unlocked",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "注销",
                                 "rulekey": "account_spot_cancel",
                                 "code": "account_spot_cancel",
@@ -458,6 +479,13 @@
                                 "remark": ""
                             },
                             {
+                                "label": "新增",
+                                "rulekey": "account_trade_child_add",
+                                "code": "account_trade_child_add",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "修改",
                                 "rulekey": "account_trade_child_modify",
                                 "code": "account_trade_child_modify",
@@ -479,9 +507,16 @@
                                 "remark": ""
                             },
                             {
+                                "label": "解锁",
+                                "rulekey": "account_trade_child_unlocked",
+                                "code": "account_trade_child_unlocked",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "注销",
-                                "rulekey": "account_trade_child_logout",
-                                "code": "account_trade_child_logout",
+                                "rulekey": "account_trade_child_cancel",
+                                "code": "account_trade_child_cancel",
                                 "isshow": true,
                                 "remark": ""
                             },
@@ -506,11 +541,11 @@
                         "remark": "",
                         "auth": [
                             {
-                                "label": "新增",
+                                "label": "新增权限模板",
                                 "rulekey": "account_manager_add",
                                 "code": "account_manager_add",
                                 "isshow": true,
-                                "remark": "管理账户 - 新增管理员"
+                                "remark": ""
                             },
                             {
                                 "label": "权限设置",
@@ -520,9 +555,44 @@
                                 "remark": ""
                             },
                             {
+                                "label": "新增",
+                                "rulekey": "account_manager_child_add",
+                                "code": "account_manager_child_add",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "修改",
+                                "rulekey": "account_manager_child_modify",
+                                "code": "account_manager_child_modify",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "重置密码",
+                                "rulekey": "account_manager_child_reset",
+                                "code": "account_manager_child_reset",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "锁定",
+                                "rulekey": "account_manager_child_locked",
+                                "code": "account_manager_child_locked",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "解锁",
-                                "rulekey": "account_manager_unlocked",
-                                "code": "account_manager_unlocked",
+                                "rulekey": "account_manager_child_unlocked",
+                                "code": "account_manager_child_unlocked",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "注销",
+                                "rulekey": "account_manager_child_cancel",
+                                "code": "account_manager_child_cancel",
                                 "isshow": true,
                                 "remark": ""
                             },
@@ -550,7 +620,7 @@
                                 "label": "账户设置",
                                 "rulekey": "account_futures_setting",
                                 "code": "account_futures_setting",
-                                "isshow": true,
+                                "isshow": false,
                                 "remark": ""
                             },
                             {
@@ -989,7 +1059,15 @@
                         "isshow": true,
                         "url": "",
                         "remark": "",
-                        "auth": []
+                        "auth": [
+                            {
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
                     },
                     {
                         "title": "新增计划",
@@ -1010,6 +1088,20 @@
                                 "remark": ""
                             },
                             {
+                                "label": "修改",
+                                "rulekey": "plan_uncommitted_modify",
+                                "code": "modify",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "审核",
+                                "rulekey": "plan_uncommitted_check",
+                                "code": "check",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "重新提交",
                                 "rulekey": "plan_uncommitted_resubmit",
                                 "code": "resubmit",
@@ -1024,16 +1116,16 @@
                                 "remark": ""
                             },
                             {
-                                "label": "修改",
-                                "rulekey": "plan_uncommitted_modify",
-                                "code": "modify",
+                                "label": "删除",
+                                "rulekey": "plan_uncommitted_delete",
+                                "code": "delete",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "删除",
-                                "rulekey": "plan_uncommitted_delete",
-                                "code": "delete",
+                                "label": "详情",
+                                "rulekey": "",
+                                "code": "detail",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -1057,7 +1149,7 @@
                         "rulekey": "search_purchase",
                         "code": "search_purchase",
                         "path": "search_purchase",
-                        "component": "views/business/search/list/purchase/index.vue",
+                        "component": "views/business/search/spot/index.vue",
                         "sort": 1,
                         "isshow": true,
                         "url": "",
@@ -1069,7 +1161,7 @@
                         "rulekey": "search_sell",
                         "code": "search_sell",
                         "path": "search_sell",
-                        "component": "views/business/search/list/sell/index.vue",
+                        "component": "views/business/search/spot/index.vue",
                         "sort": 2,
                         "isshow": true,
                         "url": "",
@@ -1081,7 +1173,7 @@
                         "rulekey": "search_plan",
                         "code": "search_plan",
                         "path": "search_plan",
-                        "component": "views/business/search/list/plan/index.vue",
+                        "component": "views/business/search/plan/index.vue",
                         "sort": 3,
                         "isshow": true,
                         "url": "",
@@ -1109,20 +1201,20 @@
                         "component": "views/iframe/index.vue",
                         "sort": 1,
                         "isshow": true,
-                        "url": "/link/patradelink/initview",
+                        "url": "/link/patradelink/initcommonview",
                         "remark": "管理端",
                         "auth": [
                             {
                                 "label": "关联",
                                 "rulekey": "futures_spot_finish_bind",
-                                "code": "bind",
+                                "code": "relation",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
                                 "label": "解除关联",
                                 "rulekey": "futures_spot_finish_unbind",
-                                "code": "unbind",
+                                "code": "del",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -1136,20 +1228,20 @@
                         "component": "views/iframe/index.vue",
                         "sort": 2,
                         "isshow": true,
-                        "url": "/link/patradelink/initview",
+                        "url": "/link/patradelink/initcommonview",
                         "remark": "管理端",
                         "auth": [
                             {
                                 "label": "补单关联",
                                 "rulekey": "futures_spot_order_add",
-                                "code": "add",
+                                "code": "supplerelation",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
                                 "label": "关联",
                                 "rulekey": "futures_spot_order_bind",
-                                "code": "bind",
+                                "code": "relation",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -1163,13 +1255,13 @@
                         "component": "views/iframe/index.vue",
                         "sort": 3,
                         "isshow": true,
-                        "url": "/link/patradelink/initview",
+                        "url": "/link/patradelink/initcommonview",
                         "remark": "管理端",
                         "auth": [
                             {
                                 "label": "解除关联",
                                 "rulekey": "futures_spot_record_unbind",
-                                "code": "unbind",
+                                "code": "del",
                                 "isshow": true,
                                 "remark": ""
                             }
@@ -2278,7 +2370,7 @@
                         "component": "views/iframe/index.vue",
                         "sort": 1,
                         "isshow": true,
-                        "url": "",
+                        "url": "/reckon/scmiddlegoods/init",
                         "remark": "管理端",
                         "auth": []
                     }
@@ -2318,6 +2410,13 @@
                         "remark": "",
                         "auth": [
                             {
+                                "label": "新增",
+                                "rulekey": "inventory_management_add",
+                                "code": "add",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "入库明细",
                                 "rulekey": "inventory_manager_inbound_details",
                                 "code": "inventory_manager_inbound_details",