Skip to content

Commit 5f4ea2e

Browse files
committed
refactor: 移除角色状态字段
1 parent f130d5e commit 5f4ea2e

File tree

4 files changed

+3
-37
lines changed

4 files changed

+3
-37
lines changed

src/apis/system/type.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export interface RoleResp {
3939
sort: number
4040
description: string
4141
dataScope: number
42-
status: 1 | 2
4342
isSystem: boolean
4443
createUserString: string
4544
createTime: string
@@ -56,7 +55,6 @@ export interface RoleDetailResp {
5655
menuIds: Array<number>
5756
dataScope: number
5857
deptIds: Array<number>
59-
status: 1 | 2
6058
isSystem: boolean
6159
createUserString: string
6260
createTime: string
@@ -66,7 +64,6 @@ export interface RoleDetailResp {
6664
}
6765
export interface RoleQuery extends PageQuery {
6866
description?: string
69-
status?: number
7067
}
7168

7269
/** 系统菜单类型 */

src/views/system/role/RoleAddModal.vue

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@
3232
:auto-size="{ minRows: 3, maxRows: 5 }"
3333
/>
3434
</a-form-item>
35-
<a-form-item label="状态" field="status">
36-
<a-switch
37-
v-model="form.status"
38-
:disabled="form.isSystem"
39-
type="round"
40-
:checked-value="1"
41-
:unchecked-value="2"
42-
checked-text="启用"
43-
unchecked-text="禁用"
44-
/>
45-
</a-form-item>
4635
</fieldset>
4736
<fieldset>
4837
<legend>功能权限</legend>
@@ -123,7 +112,6 @@ const { form, resetForm } = useForm({
123112
name: '',
124113
code: '',
125114
sort: 999,
126-
status: 1,
127115
description: undefined,
128116
menuIds: undefined,
129117
dataScope: 4,

src/views/system/role/RoleDetailDrawer.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<template>
22
<a-drawer v-model:visible="visible" title="角色详情" :width="width >= 600 ? 600 : '100%'" :footer="false">
33
<a-descriptions title="基础信息" :column="2" size="large" class="general-description">
4-
<a-descriptions-item label="ID" :span="2">{{ dataDetail?.id }}</a-descriptions-item>
5-
<a-descriptions-item label="名称">{{ dataDetail?.name }}</a-descriptions-item>
6-
<a-descriptions-item label="编码">{{ dataDetail?.code }}</a-descriptions-item>
7-
<a-descriptions-item label="状态">
8-
<a-tag v-if="dataDetail?.status === 1" color="green">启用</a-tag>
9-
<a-tag v-else color="red">禁用</a-tag>
10-
</a-descriptions-item>
4+
<a-descriptions-item label="ID">{{ dataDetail?.id }}</a-descriptions-item>
115
<a-descriptions-item label="数据权限">
126
<GiCellTag :value="dataDetail?.dataScope" :dict="data_scope_enum" />
137
</a-descriptions-item>
8+
<a-descriptions-item label="名称">{{ dataDetail?.name }}</a-descriptions-item>
9+
<a-descriptions-item label="编码">{{ dataDetail?.code }}</a-descriptions-item>
1410
<a-descriptions-item label="创建人">{{ dataDetail?.createUserString }}</a-descriptions-item>
1511
<a-descriptions-item label="创建时间">{{ dataDetail?.createTime }}</a-descriptions-item>
1612
<a-descriptions-item label="修改人">{{ dataDetail?.updateUserString }}</a-descriptions-item>

src/views/system/role/index.vue

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
<a-input v-model="queryForm.description" placeholder="请输入关键词" allow-clear @change="search">
1616
<template #prefix><icon-search /></template>
1717
</a-input>
18-
<a-select
19-
v-model="queryForm.status"
20-
:options="DisEnableStatusList"
21-
placeholder="请选择状态"
22-
allow-clear
23-
style="width: 150px"
24-
@change="search"
25-
/>
2618
<a-button @click="reset">重置</a-button>
2719
</template>
2820
<template #custom-right>
@@ -34,9 +26,6 @@
3426
<template #name="{ record }">
3527
<a-link @click="onDetail(record)">{{ record.name }}</a-link>
3628
</template>
37-
<template #status="{ record }">
38-
<GiCellStatus :status="record.status" />
39-
</template>
4029
<template #dataScope="{ record }">
4130
<GiCellTag :value="record.dataScope" :dict="data_scope_enum" />
4231
</template>
@@ -75,7 +64,6 @@ import { useTable } from '@/hooks'
7564
import { useDict } from '@/hooks/app'
7665
import { isMobile } from '@/utils'
7766
import has from '@/utils/has'
78-
import { DisEnableStatusList } from '@/constant/common'
7967
8068
defineOptions({ name: 'SystemRole' })
8169
@@ -90,7 +78,6 @@ const columns: TableInstanceColumns[] = [
9078
},
9179
{ title: '名称', dataIndex: 'name', slotName: 'name', ellipsis: true, tooltip: true },
9280
{ title: '编码', dataIndex: 'code', ellipsis: true, tooltip: true },
93-
{ title: '状态', slotName: 'status', align: 'center' },
9481
{ title: '数据权限', dataIndex: 'dataScope', slotName: 'dataScope', ellipsis: true, tooltip: true },
9582
{ title: '排序', dataIndex: 'sort', align: 'center', show: false },
9683
{ title: '系统内置', slotName: 'isSystem', align: 'center', show: false },
@@ -111,7 +98,6 @@ const columns: TableInstanceColumns[] = [
11198
11299
const queryForm = reactive({
113100
description: undefined,
114-
status: undefined,
115101
sort: ['createTime,desc']
116102
})
117103
@@ -126,7 +112,6 @@ const {
126112
// 重置
127113
const reset = () => {
128114
queryForm.description = undefined
129-
queryForm.status = undefined
130115
search()
131116
}
132117

0 commit comments

Comments
 (0)