Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/views/authority/role/index.vue

frontend/src/views/authority/role/index.vue

@@ -16,14 +16,15 @@
         </template>
         <!-- 表格操作 -->
         <template #operation='scope'>
+
           <el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
           <el-button type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
+
           <el-button type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)">设置权限</el-button>
       </template>
-  
+
       </ProTable>
     </div>
-
    <roleUnit 
    :dialogVisible = roleUnitVisible 
    :title = roleUnitTitle 
@@ -37,7 +38,7 @@
   @update:visible="permissionUnitVisible = $event"
   />
   </template>
-  
+
   <script setup lang='tsx' name='useRole'>
   import { Role } from '@/api/role/interface'
   import { useHandleData } from '@/hooks/useHandleData'
@@ -48,10 +49,11 @@
   import permissionUnit from './components/permissionUnit.vue'
   import ImportExcel from '@/components/ImportExcel/index.vue'
   import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+
   import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
   import roleDataList from '@/api/role/roleData'
   import { useDictStore } from '@/stores/modules/dict'
-  import {
+   import {
     getRoleList,
     addRole,
     BatchAddRole,
@@ -60,6 +62,7 @@
     changeRoleStatus,
     exportRoleInfo,
     getRoleDepartment,
+  
     getRoleStatus,
   } from '@/api/role/role'
 
@@ -75,15 +78,15 @@
   }
 
   const dictStore = useDictStore()
-  
+
   const roleData = roleDataList
-  
+
   // ProTable 实例
   const proTable = ref<ProTableInstance>()
-  
+
   // 如果表格需要初始化请求参数，直接定义传给 ProTable (之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
   const initParam = reactive({ type: 1 })
-  
+
   // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
   // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
   const dataCallback = (data: any) => {
@@ -92,7 +95,7 @@
       total: data.total,
     }
   }
-  
+
   // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
   // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
   const getTableList = (params: any) => {
@@ -102,10 +105,10 @@
     delete newParams.createTime
     return getRoleList(newParams)
   }
-  
+
   // 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
   const { BUTTONS } = useAuthButtons()
-  
+
   // 表格配置项
   const columns = reactive<ColumnProps<Role.ResRoleList>[]>([
     { type: 'selection', fixed: 'left', width: 70 },
@@ -118,15 +121,18 @@
     },
     {
       prop: 'id',
+
       label: '编码',
       search: { el: 'input' },
       minWidth: 180,
     },
     {
       prop: 'status',
+
       label: '状态',
       enum: dictStore.getDictData('status'),
       search: { el: 'tree-select', props: { filterable: true } },
+
       minWidth: 100,
       fieldNames: { label: 'label', value: 'code' },
       render: scope => {
@@ -142,22 +148,21 @@
     },
     { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
   ])
-  
+
   // 删除角色信息
   const deleteAccount = async (params: Role.ResRoleList) => {
     await useHandleData(deleteRole, { id: [params.id] }, `删除【${params.rolename}】角色`)
     proTable.value?.getTableList()
   }
-  
+
   // 批量删除角色信息
   const batchDelete = async (id: string[]) => {
     await useHandleData(deleteRole, { id }, '删除所选角色信息')
     proTable.value?.clearSelection()
     proTable.value?.getTableList()
   }
-  
- 
-  // 切换角色状态
+
+ // 切换角色状态
   const changeStatus = async (row: Role.ResRoleList) => {
     await useHandleData(changeRoleStatus, {
       id: row.id,
@@ -165,14 +170,14 @@
     }, `切换【${row.rolename}】角色状态`)
     proTable.value?.getTableList()
   }
-  
+
   // 导出角色列表
   const downloadFile = async () => {
     ElMessageBox.confirm('确认导出角色数据?', '温馨提示', { type: 'warning' }).then(() =>
       useDownload(exportRoleInfo, '角色列表', proTable.value?.searchParam),
     )
   }
-  
+
   // 批量添加角色
   const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
   const batchAdd = () => {
@@ -184,10 +189,9 @@
     }
     dialogRef.value?.acceptParams(params)
   }
-  
+
   // 打开 drawer(新增、查看、编辑)
   const openDrawer = (title: string, row: Partial<Role.ResRoleList> = {}) => {
-    
     if(title === "新增" || title === '编辑' )
     {
       roleUnitVisible.value = true
@@ -214,6 +218,5 @@
       }
     }
   }
-
   </script>