| 
					
				 | 
			
			
				@@ -28,7 +28,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			</template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		</el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column label="操作" min-width="200"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column label="操作" min-width="260"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template slot-scope="scope"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		  <el-button @click="opdendrawer(scope.row)" size="small" type="primary">设置权限</el-button> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -41,6 +41,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <el-button type="danger" icon="el-icon-delete" size="small" slot="reference">删除</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-popover> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		  <el-popover placement="top" width="160" v-model="scope.row._reset" class="ml20"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		    <p>确定要重置密码?重置后密码为123456</p> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		    <div style="text-align: right; margin: 0"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		      <el-button size="mini" type="text" @click="scope.row._reset = false">取消</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		      <el-button type="primary" size="mini" @click="resetUser(scope.row)">确定</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		    </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		    <el-button type="warning" icon="el-icon-reset" size="small" slot="reference">重置密码</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		  </el-popover> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-table> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -118,6 +129,7 @@ import { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   getUserList, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   setUserAuthority, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   register, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  resetUser, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   deleteUser 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } from "@/api/user"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { getAuthorityList } from "@/api/authority"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -187,12 +199,21 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     async deleteUser(row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const res = await deleteUser({ id: row.ID }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      const res = await deleteUser({ id: row.userId }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (res.code == 200){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.getTableData(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		this.$message.successMsg("删除用户成功", 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         row.visible = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	async resetUser( row ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		const res = await resetUser({ id: row.userId}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if (res.code == 200){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		  this.getTableData(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		  this.$message.successMsg("密码重置成功", 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		  row._reset = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	saveRole(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		let param ={userId:this.userId, roleList:[] } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		for( let i in this.departments){ 
			 |