|  |  | @ -40,7 +40,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |         <el-table-column label="用户账号" prop="userName"></el-table-column> |  |  |  |         <el-table-column label="用户账号" prop="userName"></el-table-column> | 
			
		
	
		
		
			
				
					
					|  |  |  |         <el-table-column label="用户名称" prop="employeeName"></el-table-column> |  |  |  |         <el-table-column label="用户名称" prop="employeeName"></el-table-column> | 
			
		
	
		
		
			
				
					
					|  |  |  |         <el-table-column label="所属部门" prop="deptName"></el-table-column> |  |  |  |         <el-table-column label="所属部门" prop="deptName"></el-table-column> | 
			
		
	
		
		
			
				
					
					|  |  |  |         <el-table-column label="所属仓库" prop="warehouseName"></el-table-column> |  |  |  |         <!--<el-table-column label="所属仓库" prop="warehouseName"></el-table-column>--> | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         <el-table-column label="状态"> |  |  |  |         <el-table-column label="状态"> | 
			
		
	
		
		
			
				
					
					|  |  |  |           <template slot-scope="scope"> |  |  |  |           <template slot-scope="scope"> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <el-tag :type="scope.row.userFlag | statusFilterType">{{ |  |  |  |             <el-tag :type="scope.row.userFlag | statusFilterType">{{ | 
			
		
	
	
		
		
			
				
					|  |  | @ -165,6 +165,15 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |               </el-form-item> |  |  |  |               </el-form-item> | 
			
		
	
		
		
			
				
					
					|  |  |  |             </el-col> |  |  |  |             </el-col> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             <el-col :span="11" type="flex"> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |               <el-form-item label="状态" prop="userFlag"> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1"> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                   <el-radio :label="1">正常</el-radio> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                   <el-radio :label="0">禁用</el-radio> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 </el-radio-group> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |               </el-form-item> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             </el-col> | 
			
		
	
		
		
			
				
					
					|  |  |  |           <!-- <el-col :span="11" type="flex"> |  |  |  |           <!-- <el-col :span="11" type="flex"> | 
			
		
	
		
		
			
				
					
					|  |  |  |               <el-form-item label="所属仓库" prop="locInvCode"> |  |  |  |               <el-form-item label="所属仓库" prop="locInvCode"> | 
			
		
	
		
		
			
				
					
					|  |  |  |                 <el-select |  |  |  |                 <el-select | 
			
		
	
	
		
		
			
				
					|  |  | @ -197,7 +206,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |           <el-row :gutter="20" type="flex"> |  |  |  |           <el-row :gutter="20" type="flex"> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <el-col :span="11" type="flex"> |  |  |  |             <el-col :span="11" type="flex"> | 
			
		
	
		
		
			
				
					
					|  |  |  |               <el-form-item label="角色"> |  |  |  |               <el-form-item label="角色"> | 
			
		
	
		
		
			
				
					
					|  |  |  |                 <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1"> |  |  |  |                 <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1" > | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                   <el-checkbox |  |  |  |                   <el-checkbox | 
			
		
	
		
		
			
				
					
					|  |  |  |                     v-for="item in roles" |  |  |  |                     v-for="item in roles" | 
			
		
	
		
		
			
				
					
					|  |  |  |                     :key="item.roleId" |  |  |  |                     :key="item.roleId" | 
			
		
	
	
		
		
			
				
					|  |  | @ -209,15 +218,6 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |               </el-form-item> |  |  |  |               </el-form-item> | 
			
		
	
		
		
			
				
					
					|  |  |  |             </el-col> |  |  |  |             </el-col> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |             <el-col :span="11" type="flex"> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |               <el-form-item label="状态" prop="userFlag"> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                 <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1"> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                   <el-radio :label="1">正常</el-radio> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                   <el-radio :label="0">禁用</el-radio> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                 </el-radio-group> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |               </el-form-item> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             </el-col> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |           </el-row> |  |  |  |           </el-row> | 
			
		
	
		
		
			
				
					
					|  |  |  |           <el-row type="flex"> |  |  |  |           <el-row type="flex"> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <el-col :span="23" type="flex"> |  |  |  |             <el-col :span="23" type="flex"> | 
			
		
	
	
		
		
			
				
					|  |  | 
 |