[update] 用户管理-组织机构多选变单选;组织机构管理去掉添加用户的功能
This commit is contained in:
@@ -120,7 +120,10 @@
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol">
|
||||
<a-tree-select
|
||||
multiple
|
||||
:multiple="false"
|
||||
show-search
|
||||
tree-default-expand-all
|
||||
tree-node-filter-prop="title"
|
||||
style="width:100%"
|
||||
:dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
|
||||
:treeData="treeDepartData"
|
||||
@@ -350,6 +353,7 @@ export default {
|
||||
that.initialRoleList()
|
||||
that.checkedDepartNameString = ''
|
||||
that.form.resetFields()
|
||||
// eslint-disable-next-line no-prototype-builtins
|
||||
if (record.hasOwnProperty('id')) {
|
||||
that.loadUserRoles(record.id).then(res => {
|
||||
that.form.setFieldsValue({selectedroles:res})
|
||||
@@ -361,8 +365,15 @@ export default {
|
||||
that.userId = record.id
|
||||
that.visible = true
|
||||
that.model = Object.assign({}, record)
|
||||
// 组织机构修改成了单选,此处不需要了
|
||||
if(record.departIds !== '' && record.id){
|
||||
that.model.selecteddeparts = record.departIds.split(',')
|
||||
// 部门是数组的时候以逗号拼接
|
||||
if(Object.prototype.toString.call(record.departIds) === '[object Array]') {
|
||||
that.model.selecteddeparts = record.departIds.split(',')
|
||||
} else {
|
||||
that.model.selecteddeparts = record.departIds
|
||||
}
|
||||
|
||||
}
|
||||
that.$nextTick(() => {
|
||||
that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts'))
|
||||
@@ -481,8 +492,9 @@ export default {
|
||||
// 触发表单验证
|
||||
this.form.validateFields((err, values) => {
|
||||
if (!err) {
|
||||
console.log("values=======", values)
|
||||
let formData = Object.assign(this.model, values)
|
||||
if (that.fileList != '') {
|
||||
if (that.fileList !== '') {
|
||||
formData.avatar = that.fileList
|
||||
} else {
|
||||
formData.avatar = null
|
||||
@@ -498,7 +510,11 @@ export default {
|
||||
formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
|
||||
//update-end-author:taoyan date:2020710 for:多租户配置
|
||||
formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(',') : ''
|
||||
formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
|
||||
// 部门由多选改成单选 所以不需要单独处理了,但为了历史数据可以使用,对values.selecteddeparts类型进行判断,如果是数组则以逗号分隔转成字符串,若是字符串则直接显示
|
||||
if(Object.prototype.toString.call(values.selecteddeparts) === '[object Array]') {
|
||||
formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
|
||||
}
|
||||
// formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(',') : ''
|
||||
formData.userIdentity = this.identity
|
||||
//如果是上级择传入departIds,否则为空
|
||||
if (this.identity === '2') {
|
||||
|
||||
Reference in New Issue
Block a user