From 5f4ea2eb0b4c936ab942a14d4fffe0bf4ae52ac2 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 27 Apr 2024 17:32:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/system/type.ts                    |  3 ---
 src/views/system/role/RoleAddModal.vue     | 12 ------------
 src/views/system/role/RoleDetailDrawer.vue | 10 +++-------
 src/views/system/role/index.vue            | 15 ---------------
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts
index 5fe20ab..1461ab5 100644
--- a/src/apis/system/type.ts
+++ b/src/apis/system/type.ts
@@ -39,7 +39,6 @@ export interface RoleResp {
   sort: number
   description: string
   dataScope: number
-  status: 1 | 2
   isSystem: boolean
   createUserString: string
   createTime: string
@@ -56,7 +55,6 @@ export interface RoleDetailResp {
   menuIds: Array<number>
   dataScope: number
   deptIds: Array<number>
-  status: 1 | 2
   isSystem: boolean
   createUserString: string
   createTime: string
@@ -66,7 +64,6 @@ export interface RoleDetailResp {
 }
 export interface RoleQuery extends PageQuery {
   description?: string
-  status?: number
 }
 
 /** 系统菜单类型 */
diff --git a/src/views/system/role/RoleAddModal.vue b/src/views/system/role/RoleAddModal.vue
index 2910dd4..443a4e5 100644
--- a/src/views/system/role/RoleAddModal.vue
+++ b/src/views/system/role/RoleAddModal.vue
@@ -32,17 +32,6 @@
             :auto-size="{ minRows: 3, maxRows: 5 }"
           />
         </a-form-item>
-        <a-form-item label="状态" field="status">
-          <a-switch
-            v-model="form.status"
-            :disabled="form.isSystem"
-            type="round"
-            :checked-value="1"
-            :unchecked-value="2"
-            checked-text="启用"
-            unchecked-text="禁用"
-          />
-        </a-form-item>
       </fieldset>
       <fieldset>
         <legend>功能权限</legend>
@@ -123,7 +112,6 @@ const { form, resetForm } = useForm({
   name: '',
   code: '',
   sort: 999,
-  status: 1,
   description: undefined,
   menuIds: undefined,
   dataScope: 4,
diff --git a/src/views/system/role/RoleDetailDrawer.vue b/src/views/system/role/RoleDetailDrawer.vue
index 5192bb0..c968a52 100644
--- a/src/views/system/role/RoleDetailDrawer.vue
+++ b/src/views/system/role/RoleDetailDrawer.vue
@@ -1,16 +1,12 @@
 <template>
   <a-drawer v-model:visible="visible" title="角色详情" :width="width >= 600 ? 600 : '100%'" :footer="false">
     <a-descriptions title="基础信息" :column="2" size="large" class="general-description">
-      <a-descriptions-item label="ID" :span="2">{{ dataDetail?.id }}</a-descriptions-item>
-      <a-descriptions-item label="名称">{{ dataDetail?.name }}</a-descriptions-item>
-      <a-descriptions-item label="编码">{{ dataDetail?.code }}</a-descriptions-item>
-      <a-descriptions-item label="状态">
-        <a-tag v-if="dataDetail?.status === 1" color="green">启用</a-tag>
-        <a-tag v-else color="red">禁用</a-tag>
-      </a-descriptions-item>
+      <a-descriptions-item label="ID">{{ dataDetail?.id }}</a-descriptions-item>
       <a-descriptions-item label="数据权限">
         <GiCellTag :value="dataDetail?.dataScope" :dict="data_scope_enum" />
       </a-descriptions-item>
+      <a-descriptions-item label="名称">{{ dataDetail?.name }}</a-descriptions-item>
+      <a-descriptions-item label="编码">{{ dataDetail?.code }}</a-descriptions-item>
       <a-descriptions-item label="创建人">{{ dataDetail?.createUserString }}</a-descriptions-item>
       <a-descriptions-item label="创建时间">{{ dataDetail?.createTime }}</a-descriptions-item>
       <a-descriptions-item label="修改人">{{ dataDetail?.updateUserString }}</a-descriptions-item>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f881511..fec66dd 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -15,14 +15,6 @@
           <a-input v-model="queryForm.description" placeholder="请输入关键词" allow-clear @change="search">
             <template #prefix><icon-search /></template>
           </a-input>
-          <a-select
-            v-model="queryForm.status"
-            :options="DisEnableStatusList"
-            placeholder="请选择状态"
-            allow-clear
-            style="width: 150px"
-            @change="search"
-          />
           <a-button @click="reset">重置</a-button>
         </template>
         <template #custom-right>
@@ -34,9 +26,6 @@
         <template #name="{ record }">
           <a-link @click="onDetail(record)">{{ record.name }}</a-link>
         </template>
-        <template #status="{ record }">
-          <GiCellStatus :status="record.status" />
-        </template>
         <template #dataScope="{ record }">
           <GiCellTag :value="record.dataScope" :dict="data_scope_enum" />
         </template>
@@ -75,7 +64,6 @@ import { useTable } from '@/hooks'
 import { useDict } from '@/hooks/app'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
-import { DisEnableStatusList } from '@/constant/common'
 
 defineOptions({ name: 'SystemRole' })
 
@@ -90,7 +78,6 @@ const columns: TableInstanceColumns[] = [
   },
   { title: '名称', dataIndex: 'name', slotName: 'name', ellipsis: true, tooltip: true },
   { title: '编码', dataIndex: 'code', ellipsis: true, tooltip: true },
-  { title: '状态', slotName: 'status', align: 'center' },
   { title: '数据权限', dataIndex: 'dataScope', slotName: 'dataScope', ellipsis: true, tooltip: true },
   { title: '排序', dataIndex: 'sort', align: 'center', show: false },
   { title: '系统内置', slotName: 'isSystem', align: 'center', show: false },
@@ -111,7 +98,6 @@ const columns: TableInstanceColumns[] = [
 
 const queryForm = reactive({
   description: undefined,
-  status: undefined,
   sort: ['createTime,desc']
 })
 
@@ -126,7 +112,6 @@ const {
 // 重置
 const reset = () => {
   queryForm.description = undefined
-  queryForm.status = undefined
   search()
 }