diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index fa549593..54626222 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -8,7 +8,7 @@
-
+
@@ -23,20 +23,20 @@
-
-
+
+
-
+
-
-
+
+
{{ $t('pleaseSelect') }}
{{ $t('normal') }}
{{ $t('user.frozen') }}
@@ -246,7 +246,7 @@ export default {
// scopedSlots: { customRender: 'avatarslot' }
// },
{
- title: this.$t('user.account'),
+ title: this.$t('user.userAccount'),
align: 'center',
dataIndex: 'username',
width: 150,
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index 0961a78d..165d3d7d 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -21,7 +21,7 @@
添加已有用户
-
新建用户
+
@@ -111,7 +111,7 @@ export default {
dataIndex: 'username'
},
{
- title: '用户名称',
+ title: '用户姓名',
align: 'center',
dataIndex: 'realname'
},
@@ -265,17 +265,17 @@ export default {
this.$refs.modalForm.disableSubmit = false
this.$refs.modalForm.edit(record)
},
- handleAdd: function () {
- if (!this.currentDeptId) {
- this.$message.warning('请选择一个部门!')
- } else {
- this.$refs.modalForm.departDisabled = true
- // 初始化负责部门
- this.$refs.modalForm.nextDepartOptions = [{ value: this.currentDept.key, label: this.currentDept.title }]
- this.$refs.modalForm.title = '新增'
- this.$refs.modalForm.edit({ activitiSync: '1', userIdentity: 1, selecteddeparts: this.currentDeptId })
- }
- },
+ // handleAdd: function () {
+ // if (!this.currentDeptId) {
+ // this.$message.warning('请选择一个部门!')
+ // } else {
+ // this.$refs.modalForm.departDisabled = true
+ // // 初始化负责部门
+ // this.$refs.modalForm.nextDepartOptions = [{ value: this.currentDept.key, label: this.currentDept.title }]
+ // this.$refs.modalForm.title = '新增'
+ // this.$refs.modalForm.edit({ activitiSync: '1', userIdentity: 1, selecteddeparts: this.currentDeptId })
+ // }
+ // },
selectOK (data) {
const params = {}
params.depId = this.currentDeptId