diff --git a/src/lang/en.js b/src/lang/en.js
index bc193fb..861fe4c 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -5,6 +5,8 @@ import menu from './en/system/menu'
import role from './en/system/role'
// 部门管理
import dept from './en/system/dept'
+// 部门管理
+import user from './en/system/user'
//资源库管理
// 仪器管理
@@ -25,8 +27,8 @@ export default {
search: 'search',
reset: 'reset',
add: 'Create',
- edit: 'edit',
- export: 'export',
+ edit: 'Edit',
+ export: 'Export',
saveConfirm: 'confirm',
confirm: 'confirm',
cancel: 'cancel',
@@ -80,7 +82,8 @@ export default {
system: {
menu,
role,
- dept
+ dept,
+ user
},
business: {
zykgl: {
diff --git a/src/lang/en/system/user.js b/src/lang/en/system/user.js
new file mode 100644
index 0000000..f1474de
--- /dev/null
+++ b/src/lang/en/system/user.js
@@ -0,0 +1,22 @@
+export default {
+ userName: 'User',
+ name: 'Name',
+ phone: 'Phone',
+ department: 'Department',
+ role: 'Owned Role',
+ status: 'Status',
+
+ statusEnable: 'Enabled',
+ statusDisable: 'Disabled',
+
+ enable: 'Enable',
+ disable: 'Disable',
+
+ edit: 'Edit',
+ history: 'Role History',
+
+ addRole: 'Create',
+ modifyRole: 'Edit',
+ notEmpty: ' can not be empty',
+ phoneError: 'Please Enter A Correct Phone Number'
+}
diff --git a/src/lang/zh.js b/src/lang/zh.js
index f7419a0..570b683 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -5,6 +5,8 @@ import menu from './zh/system/menu'
import role from './zh/system/role'
// 部门管理
import dept from './zh/system/dept'
+// 部门管理
+import user from './zh/system/user'
//资源库管理
// 仪器管理
@@ -80,7 +82,8 @@ export default {
system: {
menu,
role,
- dept
+ dept,
+ user
},
business: {
zykgl: {
diff --git a/src/lang/zh/system/user.js b/src/lang/zh/system/user.js
new file mode 100644
index 0000000..6f72ee0
--- /dev/null
+++ b/src/lang/zh/system/user.js
@@ -0,0 +1,22 @@
+export default {
+ userName: '账号',
+ name: '姓名',
+ phone: '手机',
+ department: '所属部门/学科',
+ role: '所属角色',
+ status: '状态',
+
+ statusEnable: '启用',
+ statusDisable: '禁用',
+
+ enable: '启用',
+ disable: '禁用',
+
+ edit: '编辑',
+ history: '角色变更历史',
+
+ addRole: '新增角色',
+ modifyRole: '编辑角色',
+ notEmpty: '不能为空',
+ phoneError: '请输入正确的手机号码'
+}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ed32ea3..18c5b3c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -3,7 +3,7 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
-
+
{{ $t('form.search') }}
{{ $t('form.reset') }}
@@ -39,9 +51,9 @@
- 新增
+ {{$t('form.add')}}
-
+
- 导出
+ {{$t('form.export')}}
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+ {{getRoleName(scope.row)}}
-
+
- {{ parseTime(scope.row.createTime) }}
+ {{$t('page.system.user.statusEnable')}}
+ {{$t('page.system.user.statusDisable')}}
-
+
+
- 修改
- 删除
+ {{$t('page.system.user.edit')}}
+ {{$t('page.system.user.disable')}}
+
+ {{$t('page.system.user.enable')}}
+
+ {{$t('page.system.user.history')}}
+
+ 删除
更多
@@ -95,45 +136,67 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -272,9 +329,11 @@ export default {
pageNum: 1,
pageSize: 10,
userName: undefined,
+ nickName: undefined,
phonenumber: undefined,
status: undefined,
- deptId: undefined
+ deptId: undefined,
+ status:''
},
// 列信息
columns: {
@@ -289,28 +348,38 @@ export default {
// 表单校验
rules: {
userName: [
- { required: true, message: "用户名称不能为空", trigger: "blur" },
- { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+ { required: true, message: this.$t('page.system.user.userName')+ this.$t('page.system.user.notEmpty'), trigger: "blur" },
+ // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
- { required: true, message: "用户昵称不能为空", trigger: "blur" }
+ { required: true, message: this.$t('page.system.user.name')+ this.$t('page.system.user.notEmpty'), 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"]
- }
+ deptId: [
+ { required: true, message: this.$t('page.system.user.department')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
],
+ roleIds: [
+ { required: true, message: this.$t('page.system.user.role')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+ ],
+ status: [
+ { required: true, message: this.$t('page.system.user.status')+ this.$t('page.system.user.notEmpty'), 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" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
- message: "请输入正确的手机号码",
+ message: this.$t('page.system.user.phoneError'),
trigger: "blur"
}
]
@@ -372,14 +441,18 @@ export default {
},
// 用户状态修改
handleStatusChange(row) {
- let text = row.status === "0" ? "启用" : "停用"
- this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
- return changeUserStatus(row.userId, row.status)
- }).then(() => {
- this.$modal.msgSuccess(text + "成功")
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0"
+ changeUserStatus(row.userId, row.status === "0"?'1':'0').then(response => {
+ this.getList()
})
+
+ // let text = row.status === "0" ? "启用" : "停用"
+ // this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+ // return changeUserStatus(row.userId, row.status)
+ // }).then(() => {
+ // this.$modal.msgSuccess(text + "成功")
+ // }).catch(function() {
+ // row.status = row.status === "0" ? "1" : "0"
+ // })
},
// 取消按钮
cancel() {
@@ -552,6 +625,12 @@ export default {
return
}
this.$refs.upload.submit()
+ },
+ getRoleName(row){
+ if(row && row.roles && row.roles.length>0){
+ return _.map(row.roles,'roleName').join('，')
+ }
+ return ''
}
}
}