| 
					
				 | 
			
			
				@@ -52,7 +52,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       v-if="refreshTable" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       v-loading="loading" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       :data="menuList" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      row-key="menuId" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      row-key="id" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       :default-expand-all="isExpandAll" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       :tree-props="{children: 'children', hasChildren: 'hasChildren'}" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     > 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -334,7 +334,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getList() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.loading = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       listMenu(this.queryParams).then(response => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.menuList = this.handleTree(response.data, "menuId"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.menuList = this.handleTree(response.data, "id"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.loading = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -344,7 +344,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         delete node.children; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        id: node.menuId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        id: node.id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         label: node.menuName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         children: node.children 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -353,8 +353,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getTreeselect() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       listMenu().then(response => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.menuOptions = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const menu = { menuId: 0, menuName: '主类目', children: [] }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        menu.children = this.handleTree(response.data, "menuId"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const menu = { id: 0, menuName: '主类目', children: [] }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        menu.children = this.handleTree(response.data, "id"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.menuOptions.push(menu); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -366,7 +366,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 表单重置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     reset() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.form = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        menuId: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        id: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         parentId: 0, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         menuName: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         icon: undefined, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -392,8 +392,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleAdd(row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.reset(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.getTreeselect(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (row != null && row.menuId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.form.parentId = row.menuId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if (row != null && row.id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.form.parentId = row.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.form.parentId = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -412,7 +412,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleUpdate(row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.reset(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.getTreeselect(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      getMenu(row.menuId).then(response => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      getMenu(row.id).then(response => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.form = response.data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.open = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.title = "修改菜单"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -422,7 +422,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     submitForm: function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs["form"].validate(valid => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (valid) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (this.form.menuId != undefined) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          if (this.form.id != undefined) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             updateMenu(this.form).then(response => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               this.$modal.msgSuccess("修改成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               this.open = false; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -441,7 +441,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 删除按钮操作 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleDelete(row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return delMenu(row.menuId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return delMenu(row.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }).then(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.getList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.$modal.msgSuccess("删除成功"); 
			 |