ytslOA-client.git

			@@ -141,9 +141,9 @@
			<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
			<el-table-column type="selection" width="50" align="center" />
			<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
			<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
			<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
			<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
			<el-table-column label="用户账户" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
			<el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
			<el-table-column label="所在部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
			<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
			<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
			<template slot-scope="scope">
			@@ -213,8 +213,8 @@
			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
			<el-row>
			<el-col :span="12">
			<el-form-item v-if="form.userId == undefined" label="账号" prop="userName">
			<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
			<el-form-item v-if="form.userId == undefined" label="用户账户" prop="userName">
			<el-input v-model="form.userName" placeholder="请输入用户账户" maxlength="30" />
			</el-form-item>
			</el-col>
			<el-col :span="12">