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

ERMCP/PCWEB/Menu/REDEAM.MD

@@ -11,7 +11,7 @@ interface PcwebMenuAuth {
 interface PcwebMenu {
     title: string, // 标题
     code: string,  // 路由名称
-    path: string, // 路由路径
+    path?: string, // 路由路径(为空当成组件)
     component: string, // 组件名或文件地址
     sort: number, // 排序
     rulekey: string, // 权限唯一key

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -90,6 +90,13 @@
                                 "remark": ""
                             },
                             {
+                                "label": "重新提交",
+                                "rulekey": "custom_checkpending_modify",
+                                "code": "modify",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "详情",
                                 "rulekey": "",
                                 "code": "detail",
@@ -117,13 +124,6 @@
                                 "remark": ""
                             },
                             {
-                                "label": "修改",
-                                "rulekey": "custom_normal_modify",
-                                "code": "modify",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
                                 "label": "停用",
                                 "rulekey": "custom_normal_disable",
                                 "code": "disable",
@@ -740,9 +740,17 @@
                         "component": "views/iframe/index.vue",
                         "sort": 1,
                         "isshow": true,
-                        "url": "",
+                        "url": "/ermcp/paAreaAuditConfig/init",
                         "remark": "管理端",
-                        "auth": []
+                        "auth": [
+                            {
+                                "label": "修改",
+                                "rulekey": "",
+                                "code": "edit",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
                     }
                 ]
             }
@@ -884,12 +892,19 @@
                             },
                             {
                                 "label": "撤回",
-                                "rulekey": "purchase_contract_delete",
+                                "rulekey": "purchase_contract_cancel",
                                 "code": "cancel",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
+                                "label": "删除",
+                                "rulekey": "purchase_contract_delete",
+                                "code": "delete",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "详情",
                                 "rulekey": "",
                                 "code": "detail",
@@ -2527,6 +2542,13 @@
                                 "remark": ""
                             },
                             {
+                                "label": "重新提交",
+                                "rulekey": "platinum_custom_normal_modify",
+                                "code": "modify",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
                                 "label": "详情",
                                 "rulekey": "",
                                 "code": "detail",
@@ -2554,13 +2576,6 @@
                                 "remark": ""
                             },
                             {
-                                "label": "修改",
-                                "rulekey": "platinum_custom_normal_modify",
-                                "code": "modify",
-                                "isshow": false,
-                                "remark": ""
-                            },
-                            {
                                 "label": "停用",
                                 "rulekey": "platinum_custom_normal_disable",
                                 "code": "disable",