|
@@ -37,10 +37,10 @@
|
|
|
<!--用户数据-->
|
|
|
<el-col :span="20" :xs="24">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="用户名称" prop="userName">
|
|
|
+ <el-form-item label="用户账号" prop="userName">
|
|
|
<el-input
|
|
|
v-model="queryParams.userName"
|
|
|
- placeholder="请输入用户名称"
|
|
|
+ placeholder="请输入用户账号"
|
|
|
clearable
|
|
|
style="width: 240px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
@@ -145,7 +145,7 @@
|
|
|
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" ref="table">
|
|
|
<el-table-column type="selection" width="50" align="center" :selectable="selectable" />
|
|
|
<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="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="userType" prop="userType" 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" />
|
|
@@ -247,8 +247,8 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item v-if="form.userId == undefined && form.userType == '00'" label="用户名称" prop="userName">
|
|
|
- <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
|
|
+ <el-form-item v-if="form.userId == undefined && form.userType == '00'" label="用户账号" prop="userName">
|
|
|
+ <el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
@@ -463,7 +463,7 @@ export default {
|
|
|
// 列信息
|
|
|
columns: [
|
|
|
{ key: 0, label: `用户编号`, visible: true },
|
|
|
- { key: 1, label: `用户名称`, visible: true },
|
|
|
+ { key: 1, label: `用户账号`, visible: true },
|
|
|
{ key: 2, label: `用户昵称`, visible: true },
|
|
|
{ key: 3, label: `部门`, visible: true },
|
|
|
{ key: 4, label: `手机号码`, visible: true },
|
|
@@ -473,8 +473,8 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
userName: [
|
|
|
- { required: true, message: "用户名称不能为空", trigger: "blur" },
|
|
|
- { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
|
|
+ { required: true, message: "用户账号不能为空", trigger: "blur" },
|
|
|
+ { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
|
|
|
],
|
|
|
nickName: [
|
|
|
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
|