From 7ce7b95f33ff7c4d436c33152a454a2758dde0c8 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 9 Jan 2026 15:03:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86]?=
=?UTF-8?q?=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E4=B8=8B=E7=9A=84?=
=?UTF-8?q?=E5=8F=8C=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/lang/en/system/user.js | 5 ++--
src/lang/zh/system/user.js | 1 +
src/views/system/dept/index.vue | 8 ++---
src/views/system/role/index.vue | 6 ++--
src/views/system/user/index.vue | 65 +++++++++++++++++++++++------------------
5 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/src/lang/en/system/user.js b/src/lang/en/system/user.js
index d54813f..d30d1b1 100644
--- a/src/lang/en/system/user.js
+++ b/src/lang/en/system/user.js
@@ -2,6 +2,7 @@ export default {
userName: 'User',
name: 'Name',
phone: 'Phone',
+ email: 'Email',
department: 'Department',
role: 'Owned Role',
status: 'Status',
@@ -16,7 +17,5 @@ export default {
history: 'Role History',
addUser: 'Create',
- modifyUser: 'Edit',
- notEmpty: ' Can Not Be Empty',
- phoneError: 'Please Enter A Correct Phone Number'
+ modifyUser: 'Edit'
}
diff --git a/src/lang/zh/system/user.js b/src/lang/zh/system/user.js
index af36762..91f77d4 100644
--- a/src/lang/zh/system/user.js
+++ b/src/lang/zh/system/user.js
@@ -2,6 +2,7 @@ export default {
userName: '账号',
name: '姓名',
phone: '手机',
+ email: '邮箱',
department: '所属部门/学科',
role: '所属角色',
status: '状态',
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 2efce70..8297bc3 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -74,7 +74,7 @@
{{ parseTime(scope.row.createTime) }}
-->
-
+
-
+
-
+
-
+
@@ -34,7 +34,7 @@
v-model="queryParams.status"
:placeholder="$t('form.placeholderSelect')"
clearable
- style="width: 100px"
+ style="width: 150px"
>
@@ -73,14 +73,15 @@
-
+
+
{{getRoleName(scope.row)}}
-
+
{{$t('page.system.user.statusEnable')}}
{{$t('page.system.user.statusDisable')}}
@@ -154,10 +155,15 @@
-
+
+
+
+
+
@@ -347,11 +353,11 @@ export default {
// 表单校验
rules: {
userName: [
- { required: true, message: this.$t('page.system.user.userName')+ this.$t('page.system.user.notEmpty'), trigger: "blur" },
+ { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" },
// { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
- { required: true, message: this.$t('page.system.user.name')+ this.$t('page.system.user.notEmpty'), trigger: "blur" }
+ { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" }
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
@@ -359,29 +365,30 @@ export default {
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
],
deptId: [
- { required: true, message: this.$t('page.system.user.department')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+ { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
],
roleIds: [
- { required: true, message: this.$t('page.system.user.role')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+ { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
],
status: [
- { required: true, message: this.$t('page.system.user.status')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+ { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
],
- // email: [
- // {
- // type: "email",
- // message: "请输入正确的邮箱地址",
- // trigger: ["blur", "change"]
- // }
- // ],
- phonenumber: [
- { required: true, message: this.$t('page.system.user.phone')+ this.$t('page.system.user.notEmpty'), trigger: "blur" },
+ email: [
+ { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" },
{
- pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
- message: this.$t('page.system.user.phoneError'),
- trigger: "blur"
+ type: "email",
+ message: this.$t('form.placeholderInput'),
+ trigger: ["blur", "change"]
}
- ]
+ ],
+ // phonenumber: [
+ // { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" },
+ // {
+ // pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ // message: this.$t('page.system.user.phoneError'),
+ // trigger: "blur"
+ // }
+ // ]
}
}
},
@@ -394,9 +401,9 @@ export default {
created() {
this.getList()
this.getDeptTree()
- this.getConfigKey("sys.user.initPassword").then(response => {
- this.initPassword = response.msg
- })
+ // this.getConfigKey("sys.user.initPassword").then(response => {
+ // this.initPassword = response.msg
+ // })
},
methods: {
/** 查询用户列表 */