|
@@ -17,8 +17,8 @@
|
|
|
<pane size="84">
|
|
|
<el-col>
|
|
|
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="用户名称" prop="userName">
|
|
|
- <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
|
|
|
+ <el-form-item label="登陆账号" prop="userName">
|
|
|
+ <el-input v-model="queryParams.userName" placeholder="请输入登陆账号" clearable style="width: 240px" @keyup.enter="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="手机号码" prop="phonenumber">
|
|
|
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter="handleQuery" />
|
|
@@ -59,7 +59,7 @@
|
|
|
<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="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" />
|
|
@@ -130,13 +130,13 @@
|
|
|
</el-row>
|
|
|
<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">
|
|
|
- <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
|
|
- <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
|
|
|
+ <el-form-item v-if="form.userId == undefined" label="登陆密码" prop="password">
|
|
|
+ <el-input v-model="form.password" placeholder="请输入登陆密码" type="password" maxlength="20" show-password />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -259,7 +259,7 @@ const upload = reactive({
|
|
|
// 列显隐信息
|
|
|
const columns = ref([
|
|
|
{ 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 },
|
|
@@ -278,9 +278,9 @@ const data = reactive({
|
|
|
deptId: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
- userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
|
|
|
+ userName: [{ required: true, message: "登陆账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "登陆账号长度必须介于 2 和 20 之间", trigger: "blur" }],
|
|
|
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
|
|
|
- password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符:< > \" ' \\\ |", trigger: "blur" }],
|
|
|
+ password: [{ required: true, message: "登陆密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "登陆密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符:< > \" ' \\\ |", trigger: "blur" }],
|
|
|
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
|
|
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
|
|
|
roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
|
|
@@ -410,7 +410,7 @@ function handleResetPwd(row) {
|
|
|
cancelButtonText: "取消",
|
|
|
closeOnClickModal: false,
|
|
|
inputPattern: /^.{5,20}$/,
|
|
|
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
|
|
|
+ inputErrorMessage: "登陆密码长度必须介于 5 和 20 之间",
|
|
|
inputValidator: (value) => {
|
|
|
if (/<|>|"|'|\||\\/.test(value)) {
|
|
|
return "不能包含非法字符:< > \" ' \\\ |"
|