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

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -724,7 +724,7 @@
                 "remark": "",
                 "children": [
                     {
-                        "title": "特点价合同",
+                        "title": "待点价合同",
                         "rulekey": "purchase_pending",
                         "code": "purchase_pending",
                         "path": "purchase_pending",
@@ -1932,12 +1932,70 @@
         ]
     },
     {
+        "title": "库存管理",
+        "rulekey": "inventory",
+        "code": "inventory",
+        "path": "/inventory",
+        "component": "Layout",
+        "sort": 6,
+        "isshow": true,
+        "children": [
+            {
+                "title": "库存管理",
+                "rulekey": "inventory_manage",
+                "code": "inventory_manage",
+                "path": "inventory_manage",
+                "component": "Main",
+                "sort": 1,
+                "isshow": true,
+                "url": "",
+                "remark": "",
+                "children": [
+                    {
+                        "title": "库存管理",
+                        "rulekey": "inventory_management",
+                        "code": "inventory_management",
+                        "path": "inventory_management",
+                        "component": "views/search/inventory/list/inventory_current/index.vue",
+                        "sort": 1,
+                        "isshow": true,
+                        "url": "",
+                        "remark": "",
+                        "auth": [
+                            {
+                                "label": "新增",
+                                "rulekey": "inventory_management_add",
+                                "code": "add",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "入库明细",
+                                "rulekey": "inventory_manager_inbound_details",
+                                "code": "inventory_manager_inbound_details",
+                                "isshow": true,
+                                "remark": ""
+                            },
+                            {
+                                "label": "出库明细",
+                                "rulekey": "inventory_manager_outbound_details",
+                                "code": "inventory_manager_outbound_details",
+                                "isshow": true,
+                                "remark": ""
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    {
         "title": "财务审核",
         "rulekey": "financereview",
         "code": "financereview",
         "path": "/financereview",
         "component": "Layout",
-        "sort": 6,
+        "sort": 7,
         "isshow": true,
         "children": [
             {
@@ -2082,7 +2140,7 @@
         "code": "report",
         "path": "/report",
         "component": "Layout",
-        "sort": 7,
+        "sort": 8,
         "isshow": true,
         "children": [
             {
@@ -2377,63 +2435,5 @@
                 ]
             }
         ]
-    },
-    {
-        "title": "库存管理",
-        "rulekey": "inventory",
-        "code": "inventory",
-        "path": "/inventory",
-        "component": "Layout",
-        "sort": 8,
-        "isshow": true,
-        "children": [
-            {
-                "title": "库存管理",
-                "rulekey": "inventory_manage",
-                "code": "inventory_manage",
-                "path": "inventory_manage",
-                "component": "Main",
-                "sort": 1,
-                "isshow": true,
-                "url": "",
-                "remark": "",
-                "children": [
-                    {
-                        "title": "库存管理",
-                        "rulekey": "inventory_management",
-                        "code": "inventory_management",
-                        "path": "inventory_management",
-                        "component": "views/search/inventory/list/inventory_current/index.vue",
-                        "sort": 1,
-                        "isshow": true,
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "新增",
-                                "rulekey": "inventory_management_add",
-                                "code": "add",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "入库明细",
-                                "rulekey": "inventory_manager_inbound_details",
-                                "code": "inventory_manager_inbound_details",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "出库明细",
-                                "rulekey": "inventory_manager_outbound_details",
-                                "code": "inventory_manager_outbound_details",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
     }
 ]

ERMCP/PCWEB/Menu/pc_menu_shangpingdiaoqi.json

@@ -1118,6 +1118,62 @@
 										"children": []
 									}
 								]
+							},
+							{
+								"code": "warehouse_receipt_trade_designate",
+								"title": "指定挂牌",
+								"sort": 1,
+								"type": 1,
+								"rulekey": "",
+								"isshow": true,
+								"url": "",
+								"remark": "",
+								"children": [
+									{
+										"code": "warehouse_receipt_trade_designate_post_buying",
+										"title": "挂牌求购",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_receipt_trade_designate_delisting",
+										"title": "摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_receipt_trade_designate_bargain_delisting",
+										"title": "议价摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_receipt_trade_designate_detail",
+										"title": "详情",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
 							}
 						]
 					},
@@ -1368,6 +1424,62 @@
 										"children": []
 									}
 								]
+							},
+							{
+								"code": "warehouse_pre_sale_designate",
+								"title": "指定挂牌",
+								"sort": 1,
+								"type": 1,
+								"rulekey": "",
+								"isshow": true,
+								"url": "",
+								"remark": "",
+								"children": [
+									{
+										"code": "warehouse_pre_sale_designate_post_buying",
+										"title": "挂牌求购",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_pre_sale_designate_delisting",
+										"title": "摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_pre_sale_designate_bargain_delisting",
+										"title": "议价摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_pre_sale_designate_detail",
+										"title": "详情",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
 							}
 						]
 					},