Showing
1 changed file
with
0 additions
and
23 deletions
| @@ -18,9 +18,6 @@ | @@ -18,9 +18,6 @@ | ||
| 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 { findCurrentUserRelation, getAllRoleList } from '/@/api/system/system'; | ||
| 22 | - import { RoleEnum } from '/@/enums/roleEnum'; | ||
| 23 | - import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel'; | ||
| 24 | 21 | ||
| 25 | export default defineComponent({ | 22 | export default defineComponent({ |
| 26 | name: 'TenantAdminFormDrawer', | 23 | name: 'TenantAdminFormDrawer', |
| @@ -102,22 +99,6 @@ | @@ -102,22 +99,6 @@ | ||
| 102 | component: 'Input', | 99 | component: 'Input', |
| 103 | rules: phoneRule, | 100 | rules: phoneRule, |
| 104 | }, | 101 | }, |
| 105 | - | ||
| 106 | - { | ||
| 107 | - field: 'roleIds', | ||
| 108 | - label: '租户角色', | ||
| 109 | - component: 'ApiSelect', | ||
| 110 | - required: true, | ||
| 111 | - componentProps: { | ||
| 112 | - mode: 'multiple', | ||
| 113 | - api: getAllRoleList, | ||
| 114 | - params: { | ||
| 115 | - roleType: RoleEnum.TENANT_ADMIN, | ||
| 116 | - }, | ||
| 117 | - labelField: 'name', | ||
| 118 | - valueField: 'id', | ||
| 119 | - }, | ||
| 120 | - }, | ||
| 121 | { | 102 | { |
| 122 | field: 'email', | 103 | field: 'email', |
| 123 | label: '邮件', | 104 | label: '邮件', |
| @@ -151,12 +132,9 @@ | @@ -151,12 +132,9 @@ | ||
| 151 | tenantId.value = data?.tenantId; | 132 | tenantId.value = data?.tenantId; |
| 152 | isJudgeUserNameExist.value = data.judgeExistUserName; | 133 | isJudgeUserNameExist.value = data.judgeExistUserName; |
| 153 | if (unref(isUpdate)) { | 134 | if (unref(isUpdate)) { |
| 154 | - const roleParams = new RoleOrOrganizationParam(data.record.id, true, false); | ||
| 155 | - const roleIds = await findCurrentUserRelation(roleParams); | ||
| 156 | await updateSchema({ field: 'username', componentProps: { disabled: true } }); | 135 | await updateSchema({ field: 'username', componentProps: { disabled: true } }); |
| 157 | await setFieldsValue({ | 136 | await setFieldsValue({ |
| 158 | ...data.record, | 137 | ...data.record, |
| 159 | - roleIds, | ||
| 160 | }); | 138 | }); |
| 161 | } else { | 139 | } else { |
| 162 | await updateSchema({ field: 'username', componentProps: { disabled: false } }); | 140 | await updateSchema({ field: 'username', componentProps: { disabled: false } }); |
| @@ -181,7 +159,6 @@ | @@ -181,7 +159,6 @@ | ||
| 181 | ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss') | 159 | ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss') |
| 182 | : null, | 160 | : null, |
| 183 | tenantId: tenantId.value, | 161 | tenantId: tenantId.value, |
| 184 | - roleIds: values.roleIds, | ||
| 185 | }; | 162 | }; |
| 186 | await saveTenantAdmin(requestParams as any as UserDTO); | 163 | await saveTenantAdmin(requestParams as any as UserDTO); |
| 187 | closeDrawer(); //关闭侧框 | 164 | closeDrawer(); //关闭侧框 |