Showing
1 changed file
with
17 additions
and
7 deletions
| @@ -18,7 +18,9 @@ | @@ -18,7 +18,9 @@ | ||
| 18 | import { UserDTO } from '/@/api/tenant/tenantInfo'; | 18 | import { UserDTO } from '/@/api/tenant/tenantInfo'; |
| 19 | import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules'; | 19 | import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules'; |
| 20 | import { chineseAndEnlishRule } from '/@/utils/rules'; | 20 | import { chineseAndEnlishRule } from '/@/utils/rules'; |
| 21 | - import { getAllRoleList } from '/@/api/system/system'; | 21 | + import { findCurrentUserRelation, getAllRoleList } from '/@/api/system/system'; |
| 22 | + import { RoleEnum } from '/@/enums/roleEnum'; | ||
| 23 | + import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel'; | ||
| 22 | 24 | ||
| 23 | export default defineComponent({ | 25 | export default defineComponent({ |
| 24 | name: 'TenantAdminFormDrawer', | 26 | name: 'TenantAdminFormDrawer', |
| @@ -100,24 +102,29 @@ | @@ -100,24 +102,29 @@ | ||
| 100 | component: 'Input', | 102 | component: 'Input', |
| 101 | rules: phoneRule, | 103 | rules: phoneRule, |
| 102 | }, | 104 | }, |
| 103 | - { | ||
| 104 | - field: 'email', | ||
| 105 | - label: '邮件', | ||
| 106 | - component: 'Input', | ||
| 107 | - rules: emailRule, | ||
| 108 | - }, | 105 | + |
| 109 | { | 106 | { |
| 110 | field: 'roleIds', | 107 | field: 'roleIds', |
| 111 | label: '租户角色', | 108 | label: '租户角色', |
| 112 | component: 'ApiSelect', | 109 | component: 'ApiSelect', |
| 110 | + required: true, | ||
| 113 | componentProps: { | 111 | componentProps: { |
| 114 | mode: 'multiple', | 112 | mode: 'multiple', |
| 115 | api: getAllRoleList, | 113 | api: getAllRoleList, |
| 114 | + params: { | ||
| 115 | + roleType: RoleEnum.TENANT_ADMIN, | ||
| 116 | + }, | ||
| 116 | labelField: 'name', | 117 | labelField: 'name', |
| 117 | valueField: 'id', | 118 | valueField: 'id', |
| 118 | }, | 119 | }, |
| 119 | }, | 120 | }, |
| 120 | { | 121 | { |
| 122 | + field: 'email', | ||
| 123 | + label: '邮件', | ||
| 124 | + component: 'Input', | ||
| 125 | + rules: emailRule, | ||
| 126 | + }, | ||
| 127 | + { | ||
| 121 | field: 'enabled', | 128 | field: 'enabled', |
| 122 | label: '状态', | 129 | label: '状态', |
| 123 | required: true, | 130 | required: true, |
| @@ -144,9 +151,12 @@ | @@ -144,9 +151,12 @@ | ||
| 144 | tenantId.value = data?.tenantId; | 151 | tenantId.value = data?.tenantId; |
| 145 | isJudgeUserNameExist.value = data.judgeExistUserName; | 152 | isJudgeUserNameExist.value = data.judgeExistUserName; |
| 146 | if (unref(isUpdate)) { | 153 | if (unref(isUpdate)) { |
| 154 | + const roleParams = new RoleOrOrganizationParam(data.record.id, true, false); | ||
| 155 | + const roleIds = await findCurrentUserRelation(roleParams); | ||
| 147 | await updateSchema({ field: 'username', componentProps: { disabled: true } }); | 156 | await updateSchema({ field: 'username', componentProps: { disabled: true } }); |
| 148 | await setFieldsValue({ | 157 | await setFieldsValue({ |
| 149 | ...data.record, | 158 | ...data.record, |
| 159 | + roleIds, | ||
| 150 | }); | 160 | }); |
| 151 | } else { | 161 | } else { |
| 152 | await updateSchema({ field: 'username', componentProps: { disabled: false } }); | 162 | await updateSchema({ field: 'username', componentProps: { disabled: false } }); |