-
+
-
+
- Query
- Add
+ 查询
+ 新增
- {{ "Export" }}
+ {{ "导出" }}
@@ -60,17 +60,17 @@
header-align="center"
align="center"
width="220"
- label="Actions">
+ label="操作">
- Edit
+ 编辑
|
- Delete
- |
+ 删除
+ |
- Add Member
+ 新增成员
@@ -105,16 +105,24 @@
header-align="center"
align="center"
width="130"
- label="Actions">
+ label="操作">
- edit
- delete
+ 编辑
+ 删除
+
+
+
+
+ {{ formatUserWithDisplay(scope.row.username, scope.row.userDisplay) }}
+
+
+
+
+
+
+ {{ formatUserWithDisplay(scope.row.superiorUsername, scope.row.superiorUserDisplay) }}
-
-
-
-
- UserName
+ 用户名
-
+
-
+
-
+
-
-
+
+
-
-
+
+
+ :key="u.value"
+ :label="u.label"
+ :value="u.value">
- Save
- Cancel
+ 保存
+ 关闭
-
+
-
+
-
+
@@ -191,8 +199,8 @@
-->
- Save
- Cancel
+ 保存
+ 关闭
@@ -315,7 +323,7 @@ export default {
columnProp: 'departmentId',
headerAlign: "center",
align: "center",
- columnLabel: 'Department Id',
+ columnLabel: '部门编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -333,7 +341,7 @@ export default {
columnProp: 'departmentName',
headerAlign: "center",
align: "left",
- columnLabel: 'Department Name',
+ columnLabel: '部门名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -388,7 +396,7 @@ export default {
columnProp: 'createDate',
headerAlign: "center",
align: "center",
- columnLabel: 'Create Date',
+ columnLabel: '创建日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -406,7 +414,7 @@ export default {
columnProp: 'createBy',
headerAlign: "center",
align: "left",
- columnLabel: 'Creator',
+ columnLabel: '创建人',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -424,7 +432,7 @@ export default {
columnProp: 'updateDate',
headerAlign: "center",
align: "center",
- columnLabel: 'Update Date',
+ columnLabel: '更新日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -442,7 +450,7 @@ export default {
columnProp: 'updateBy',
headerAlign: "center",
align: "left",
- columnLabel: 'Update By',
+ columnLabel: '更新人',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -498,8 +506,11 @@ export default {
}
const self = (this.memberForm.username || '').trim().toLowerCase()
return this.memberList
- .map(r => r.username)
- .filter(u => u && u.trim().toLowerCase() !== self)
+ .filter(r => (r.username || '').trim() !== '' && (r.username || '').trim().toLowerCase() !== self)
+ .map(r => ({
+ value: r.username,
+ label: this.formatUserWithDisplay(r.username, r.userDisplay)
+ }))
}
},
@@ -530,6 +541,13 @@ export default {
methods: {
isAuth,
+ formatUserWithDisplay (username, userDisplay) {
+ const u = (username || '').trim()
+ const d = (userDisplay || '').trim()
+ if (!u) return ''
+ if (!d) return u
+ return `${u}(${d})`
+ },
clearDeptMemberSelection () {
this.currentDept = null
this.memberList = []
@@ -583,11 +601,11 @@ export default {
},
openAddMember () {
if (!this.currentDept) {
- this.$message.warning('Please select a department first')
+ this.$message.warning('请先选择部门')
return
}
this.memberFormMode = 'add'
- this.memberDialogTitle = 'Add Member'
+ this.memberDialogTitle = '新增成员'
this.memberForm = {
username: '',
jobTitle: '',
@@ -599,7 +617,7 @@ export default {
openEditMember (row) {
if (!this.currentDept) return
this.memberFormMode = 'edit'
- this.memberDialogTitle = 'Edit Member'
+ this.memberDialogTitle = '编辑成员'
const dm = (row.deptManagerFlag || 'N').toString().toUpperCase()
this.memberForm = {
username: row.username,
@@ -611,7 +629,7 @@ export default {
},
openMemberUserChooser () {
if (!this.currentDept || !this.currentDept.site) {
- this.$message.warning('Please select a department first')
+ this.$message.warning('请先选择部门')
return
}
this.memberPickerActive = true
@@ -649,7 +667,7 @@ export default {
if (!this.currentDept) return
const username = (this.memberForm.username || '').trim()
if (!username) {
- this.$message.warning('Please pick an account (click Account)')
+ this.$message.warning('请选择用户账号（点击用户名）')
return
}
const payload = {
@@ -665,26 +683,26 @@ export default {
const req = this.memberFormMode === 'add' ? saveAccessDeptMember(payload) : updateAccessDeptMember(payload)
req.then(({ data }) => {
if (data && data.code === 0) {
- this.$message.success('Saved')
+ this.$message.success('保存成功')
this.memberDialogVisible = false
this.loadMembers()
} else {
- this.$message.error((data && data.msg) || 'Save failed')
+ this.$message.error((data && data.msg) || '保存失败')
}
}).catch(e => {
- const msg = (e.response && e.response.data && e.response.data.msg) || e.message || 'Save failed'
+ const msg = (e.response && e.response.data && e.response.data.msg) || e.message || '保存失败'
this.$message.error(msg)
})
}
if (this.memberFormMode === 'add') {
this.verifyUserExistsInSite(username).then(exists => {
if (!exists) {
- this.$message.warning('User does not exist or has no access to this site')
+ this.$message.warning('用户不存在或没有当前工厂权限')
return
}
const dup = this.memberList.some(m => (m.username || '').trim().toLowerCase() === username.toLowerCase())
if (dup) {
- this.$message.warning('This member is already in the department')
+ this.$message.warning('该成员已在此部门中')
return
}
doSave()
@@ -857,9 +875,9 @@ export default {
// 删除
deleteDepartment (row) {
- this.$confirm(`Delete this department?`, 'Prompt', {
- confirmButtonText: 'Confirm',
- cancelButtonText: 'Cancel',
+ this.$confirm(`确定删除该部门吗？`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
type: 'warning'
}).then(() => {
departmentDelete(row).then(({data}) => {