fix: 用户管理修改角色分配权限标识

This commit is contained in:
TsMask
2023-12-01 19:26:34 +08:00
parent e23438d910
commit cc234ee081

View File

@@ -135,7 +135,7 @@ let tableColumns: ColumnsType = [
{ {
title: t('views.system.user.permission'), title: t('views.system.user.permission'),
key: 'roles', key: 'roles',
align: 'center', align: 'left',
}, },
{ {
title: t('views.system.user.className'), title: t('views.system.user.className'),
@@ -1258,7 +1258,12 @@ onMounted(() => {
@ok="fnModalOk" @ok="fnModalOk"
@cancel="fnModalCancel" @cancel="fnModalCancel"
> >
<a-form name="modalStateFromByEdit" layout="horizontal"> <a-form
name="modalStateFromByEdit"
layout="horizontal"
:label-col="{ span: 6 }"
:labelWrap="true"
>
<a-row :gutter="16" v-if="!modalState.from.userId"> <a-row :gutter="16" v-if="!modalState.from.userId">
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
@@ -1309,22 +1314,20 @@ onMounted(() => {
></a-input> ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="6" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item :label="t('views.system.user.sex')" name="sex"> <a-form-item
<a-select :label="t('views.system.user.userWork')"
v-model:value="modalState.from.sex" name="postIds"
default-value="1"
:options="dict.sysUserSex"
> >
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="6" :xs="24">
<a-form-item :label="t('views.system.user.status')" name="status">
<a-select <a-select
v-model:value="modalState.from.status" v-model:value="modalState.from.postIds"
default-value="0" allow-clear
:options="dict.sysNormalDisable" mode="multiple"
show-search
option-filter-prop="postName"
option-label-prop="postName"
:options="modalState.options.posts"
:field-names="{ label: 'postName', value: 'postId' }"
> >
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -1360,7 +1363,53 @@ onMounted(() => {
</a-col> </a-col>
</a-row> </a-row>
<a-form-item :label="t('views.system.user.fromClass')" name="deptId"> <a-row :gutter="16">
<a-col :lg="12" :md="12" :xs="24">
<a-form-item :label="t('views.system.user.sex')" name="sex">
<a-select
v-model:value="modalState.from.sex"
default-value="1"
:options="dict.sysUserSex"
>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="12" :md="12" :xs="24">
<a-form-item :label="t('views.system.user.status')" name="status">
<a-select
v-model:value="modalState.from.status"
default-value="0"
:options="dict.sysNormalDisable"
>
</a-select>
</a-form-item>
</a-col>
</a-row>
<a-form-item
:label="t('views.system.user.permission')"
name="roleIds"
:label-col="{ span: 3 }"
v-perms:has="['system:user:editRole']"
>
<a-select
v-model:value="modalState.from.roleIds"
:allow-clear="false"
mode="multiple"
show-search
option-filter-prop="roleName"
option-label-prop="roleName"
:options="modalState.options.roles"
:field-names="{ label: 'roleName', value: 'roleId' }"
>
</a-select>
</a-form-item>
<a-form-item
:label="t('views.system.user.fromClass')"
name="deptId"
:label-col="{ span: 3 }"
>
<a-tree-select <a-tree-select
v-model:value="modalState.from.deptId" v-model:value="modalState.from.deptId"
show-search show-search
@@ -1379,46 +1428,11 @@ onMounted(() => {
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
<a-row :gutter="16">
<a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
:label="t('views.system.user.userWork')" :label="t('views.system.user.userTip')"
name="postIds" name="remark"
:label-col="{ span: 3 }"
> >
<a-select
v-model:value="modalState.from.postIds"
allow-clear
mode="multiple"
show-search
option-filter-prop="postName"
option-label-prop="postName"
:options="modalState.options.posts"
:field-names="{ label: 'postName', value: 'postId' }"
>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="12" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.permission')"
name="roleIds"
>
<a-select
v-model:value="modalState.from.roleIds"
:allow-clear="false"
mode="multiple"
show-search
option-filter-prop="roleName"
option-label-prop="roleName"
:options="modalState.options.roles"
:field-names="{ label: 'roleName', value: 'roleId' }"
>
</a-select>
</a-form-item>
</a-col>
</a-row>
<a-form-item :label="t('views.system.user.userTip')" name="remark">
<a-textarea <a-textarea
v-model:value="modalState.from.remark" v-model:value="modalState.from.remark"
:auto-size="{ minRows: 4, maxRows: 6 }" :auto-size="{ minRows: 4, maxRows: 6 }"