From ef97ebbec12f6f6c482736ab6621a0d7015994a7 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 29 Oct 2024 21:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E-=E8=A1=A8=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authority/role/components/rolePopup.vue   |   3 +-
 frontend/src/views/authority/role/index.vue   | 469 ++++++++----------
 2 files changed, 212 insertions(+), 260 deletions(-)

diff --git a/frontend/src/views/authority/role/components/rolePopup.vue b/frontend/src/views/authority/role/components/rolePopup.vue
index d7df66e..4fa535e 100644
--- a/frontend/src/views/authority/role/components/rolePopup.vue
+++ b/frontend/src/views/authority/role/components/rolePopup.vue
@@ -47,7 +47,7 @@
   } from '@/api/role/role'
 
   const dictStore = useDictStore()
-  const {dialogVisible,title,data,openType,updataList}  = defineProps<{
+  const {dialogVisible,title,data,openType}  = defineProps<{
     dialogVisible:boolean;
     title:string;
     openType:string;
@@ -58,7 +58,6 @@
       type: number;
       remark:string;   //角色描述
     }
-    updataList:Function
   }>();
 
   // const value = computed({
diff --git a/frontend/src/views/authority/role/index.vue b/frontend/src/views/authority/role/index.vue
index 648b282..2808e04 100644
--- a/frontend/src/views/authority/role/index.vue
+++ b/frontend/src/views/authority/role/index.vue
@@ -1,281 +1,234 @@
 <template>
-    <div class='table-box'>
-      <ProTable
-        ref='proTable'
-        :columns='columns'
-        :data='roleData'
-     >
-        <!-- :requestApi="getRoleList" -->
-        <!-- 表格 header 按钮 -->
-        <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
-          <el-button type='primary' :icon='Download' plain >导出数据</el-button>
-          <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
-                     @click='batchDelete(scope.selectedListIds)'>
-            批量删除
-          </el-button>
-        </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>
+  <div class='table-box'>
+    <ProTable
+      ref='proTable'
+      :columns='columns'
+      :request-api="getTableList"
+      :data-callback="dataCallback"
+    >
+      <!-- :requestApi="getRoleList" -->
+      <!-- 表格 header 按钮 -->
+      <template #tableHeader='scope'>
+        <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
+        <el-button type='primary' :icon='Download' plain>导出数据</el-button>
+        <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+                   @click='batchDelete(scope.selectedListIds)'>
+          批量删除
+        </el-button>
+      </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>
-   <rolePopup 
-   :dialogVisible = rolePopupVisible 
-   :title = rolePopupTitle 
-   :data = rolePopupData 
-   :openType = openType
-   :updataList = "updataList"
-   @update:visible="rolePopupVisible = $event"
-   />
-  <permissionUnit 
-  :dialogVisible = permissionUnitVisible 
-  :title = permissionUnitTitle 
-  :data = permissionUnitData
-  @update:visible="permissionUnitVisible = $event"
+    </ProTable>
+  </div>
+  <rolePopup
+    :dialogVisible=rolePopupVisible
+    :title=rolePopupTitle
+    :data=rolePopupData
+    :openType=openType
+    @update:visible='rolePopupVisible = $event'
   />
-  </template>
+  <permissionUnit
+    :dialogVisible=permissionUnitVisible
+    :title=permissionUnitTitle
+    :data=permissionUnitData
+    @update:visible='permissionUnitVisible = $event'
+  />
+</template>
 
-  <script setup lang='tsx' name='useRole'>
-  import { Role } from '@/api/role/interface'
-  import { useHandleData } from '@/hooks/useHandleData'
-  import { useDownload } from '@/hooks/useDownload'
-  import { useAuthButtons } from '@/hooks/useAuthButtons'
-  import ProTable from '@/components/ProTable/index.vue'
-  import rolePopup from './components/rolePopup.vue'
-  import permissionUnit from './components/permissionUnit.vue'
-  import ImportExcel from '@/components/ImportExcel/index.vue'
-  import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+<script setup lang='tsx' name='useRole'>
+import { Role } from '@/api/role/interface'
+import { useHandleData } from '@/hooks/useHandleData'
+import { useDownload } from '@/hooks/useDownload'
+import { useAuthButtons } from '@/hooks/useAuthButtons'
+import ProTable from '@/components/ProTable/index.vue'
+import rolePopup from './components/rolePopup.vue'
+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 {
-    getRoleList,
-    addRole,
-    editRole,
-    deleteRole,
-  } from '@/api/role/role'
+import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
+import { useDictStore } from '@/stores/modules/dict'
+import {
+  getRoleList,
+  addRole,
+  editRole,
+  deleteRole,
+} from '@/api/role/role'
+import { deleteUser } from '@/api/user/user'
 
 
-  const {rolePopupVisible,permissionUnitVisible,rolePopupTitle,permissionUnitTitle,rolePopupData,permissionUnitData} = useCount();
-  function useCount() {
-    const rolePopupVisible = ref(false)
-    const permissionUnitVisible = ref(false)
-    const rolePopupTitle = ref()
-    const permissionUnitTitle = ref()
-    const rolePopupData = ref<Role.RoleBO>({} as Role.RoleBO)
-    const permissionUnitData = ref<Role.RoleBO>({} as Role.RoleBO)
-    // const permissionUnitData = ref<Role.Permission[]>([])
-    return {rolePopupVisible,permissionUnitVisible,rolePopupTitle,permissionUnitTitle,rolePopupData,permissionUnitData};
+const { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData } = useCount()
+
+function useCount() {
+  const rolePopupVisible = ref(false)
+  const permissionUnitVisible = ref(false)
+  const rolePopupTitle = ref()
+  const permissionUnitTitle = ref()
+  const rolePopupData = ref<Role.RoleBO>({} as Role.RoleBO)
+  const permissionUnitData = ref<Role.RoleBO>({} as Role.RoleBO)
+  // const permissionUnitData = ref<Role.Permission[]>([])
+  return { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData }
+}
+
+const dictStore = useDictStore()
+let openType = ''
+
+
+// ProTable 实例
+const proTable = ref<ProTableInstance>()
+
+
+
+// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
+// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+const dataCallback = (data: any) => {
+  return {
+    list: data.list,
+    total: Number(data.total),
+    pageNum: Number(data.pageNum),
+    pageSize: Number(data.pageSize),
   }
+}
 
-  const dictStore = useDictStore()
-  let openType = ''
+// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+const getTableList = (params: any) => {
+  let newParams = JSON.parse(JSON.stringify(params))
+  newParams.createTime && (newParams.startTime = newParams.createTime[0])
+  newParams.createTime && (newParams.endTime = newParams.createTime[1])
+  delete newParams.createTime
+  return getRoleList(newParams)
+}
 
-  //const roleData = roleDataList
-  const roleData = ref<Role.RoleBO[]>([])
+// 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
+const { BUTTONS } = useAuthButtons()
 
-  function updataList() {
-    getRoleList({
-    id: '',
-    name: '',
-    code: '',
-    type: 0,
-    remark: '',
-    pageNum: 1,
-    pageSize: 10,
-  }).then(res => {
-
-    if(res.code == '200') {
-      roleData.value = res.data.list
-  }
-  else{
-    ElMessage.error(res.message)
-  }
-  })
-  }
-  updataList()
-
-  // ProTable 实例
-  const proTable = ref<ProTableInstance>()
-
-  // 如果表格需要初始化请求参数，直接定义传给 ProTable (之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
-  const initParam = reactive({ type: 1 })
-
-  // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
-  // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
-  const dataCallback = (data: any) => {
-    return {
-      list: data.list,
-      total: data.total,
-    }
-  }
-
-  // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
-  // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
-  const getTableList = (params: any) => {
-    let newParams = JSON.parse(JSON.stringify(params))
-    newParams.createTime && (newParams.startTime = newParams.createTime[0])
-    newParams.createTime && (newParams.endTime = newParams.createTime[1])
-    delete newParams.createTime
-    return getRoleList(newParams)
-  }
-
-  // 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
-  const { BUTTONS } = useAuthButtons()
-
-  // 表格配置项
-  const columns = reactive<ColumnProps<Role.RoleBO>[]>([
-    { type: 'selection', fixed: 'left', width: 70 },
-    { type: 'index', fixed: 'left', width: 70, label: '序号' },
-    {
-      prop: 'name',
-      label: '名称',
-      search: { el: 'input' },
-      minWidth: 150,
-    },
-    {
-      prop: 'code',
-      label: '编码',
-      search: { el: 'input' },
-      minWidth: 180,
-    },
-    {
-      prop: 'Type',
-      label: '类型',
-      enum: dictStore.getDictData('roleType'),
-      fieldNames: { label: 'label', value: 'code' },
-      search: { el: 'input' },
-      minWidth: 180,
-    },
-    {
-      prop: 'remark',
-      label: '描述',
-      minWidth: 380,
-    },
-    // {
-    //   prop: 'status',
-
-    //   label: '状态',
-    //   enum: dictStore.getDictData('status'),
-    //   search: { el: 'tree-select', props: { filterable: true } },
-
-    //   minWidth: 100,
-    //   fieldNames: { label: 'label', value: 'code' },
-    //   render: scope => {
-    //     return (
-    //        <el-tag type={scope.row.state ? 'success' : 'danger'}>{scope.row.state ? '启用' : '禁用'}</el-tag>
-    //     )
-    //   },
-    // },
-    { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
-  ])
-
-  // 删除角色信息
-  const deleteAccount = async (params: Role.RoleBO) => {
-  if(params.id)
+// 表格配置项
+const columns = reactive<ColumnProps<Role.RoleBO>[]>([
+  { type: 'selection', fixed: 'left', width: 70 },
+  { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
-    let deleteData = {id:[params.id]}
+    prop: 'name',
+    label: '名称',
+    search: { el: 'input' },
+    minWidth: 150,
+  },
+  {
+    prop: 'code',
+    label: '编码',
+    search: { el: 'input' },
+    minWidth: 180,
+  },
+  {
+    prop: 'Type',
+    label: '类型',
+    enum: dictStore.getDictData('roleType'),
+    fieldNames: { label: 'label', value: 'code' },
+    search: { el: 'input' },
+    minWidth: 180,
+  },
+  {
+    prop: 'remark',
+    label: '描述',
+    minWidth: 380,
+  },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
+])
 
+// 删除角色信息
+const deleteAccount = async (params: Role.RoleBO) => {
+  if (params.id) {
+    let deleteData = { id: [params.id] }
     deleteRole(deleteData).then(res => {
-    if(res.code === "200")
-    {
-      ElMessage.success(res.message)
-      updataList()
+      if (res.code === '200') {
+        ElMessage.success(res.message)
+        proTable.value?.getTableList();
+      } else
+        ElMessage.error(res.message)
+    })
+  }
+
+}
+
+// 批量删除角色信息
+const batchDelete = async (id: string[]) => {
+  await useHandleData(deleteRole, { id }, '删除所选角色信息')
+  proTable.value?.clearSelection()
+  proTable.value?.getTableList()
+}
+
+// 切换角色状态
+const changeStatus = async (row: Role.RoleBO) => {
+  // await useHandleData(changeRoleStatus, {
+  //   id: row.id,
+  //   status: row.status == 1 ? 0 : 1,
+  // }, `切换【${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 = () => {
+  // const params = {
+  //   title: '角色',
+  //   tempApi: exportRoleInfo,
+  //   importApi: BatchAddRole,
+  //   getTableList: proTable.value?.getTableList,
+  // }
+  // dialogRef.value?.acceptParams(params)
+}
+
+// 打开 drawer(新增、查看、编辑)
+const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
+  if (title === '新增角色' || title === '编辑角色') {
+    if (title === '新增角色')
+      openType = 'add'
+    else if (title === '编辑角色')
+      openType = 'edit'
+
+    rolePopupVisible.value = true
+    rolePopupTitle.value = title
+
+    const safeRow: Role.RoleBO = {
+      id: row.id || '',
+      name: row.name || '',
+      code: row.code || '',
+      type: row.type || 0,
+      remark: row.remark || '',
     }
-    else
-      ElMessage.error(res.message)
-  })
 
-  }
-    
-    // await useHandleData(deleteRole, { id: [params.id] }, `删除【${params.name}】角色`)
-    // proTable.value?.getTableList()
-    updataList()
-  }
+    rolePopupData.value = safeRow
+  } else if (title === '设置权限') {
+    permissionUnitVisible.value = true
+    permissionUnitTitle.value = title
 
-  // 批量删除角色信息
-  const batchDelete = async (id: string[]) => {
-    await useHandleData(deleteRole, { id }, '删除所选角色信息')
-    proTable.value?.clearSelection()
-    proTable.value?.getTableList()
-  }
+    const safeRow: Role.RoleBO = {
+      id: row.id || '',
+      name: row.name || '',
+      code: row.code || '',
+      type: row.type || 0,
+      remark: row.remark || '',
+    }
 
- // 切换角色状态
-  const changeStatus = async (row: Role.RoleBO) => {
-    // await useHandleData(changeRoleStatus, {
-    //   id: row.id,
-    //   status: row.status == 1 ? 0 : 1,
-    // }, `切换【${row.rolename}】角色状态`)
-    // proTable.value?.getTableList()
-  }
+    permissionUnitData.value = safeRow
 
-  // 导出角色列表
-  //const downloadFile = async () => {
-    // ElMessageBox.confirm('确认导出角色数据?', '温馨提示', { type: 'warning' }).then(() =>
-    //   useDownload(exportRoleInfo, '角色列表', proTable.value?.searchParam),
-    // )
-  //}
-
-  // 批量添加角色
-  const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
-  const batchAdd = () => {
-    // const params = {
-    //   title: '角色',
-    //   tempApi: exportRoleInfo,
-    //   importApi: BatchAddRole,
-    //   getTableList: proTable.value?.getTableList,
+    // if (row.permissionList)
+    // {
+    //   permissionUnitData.value = row.permissionList;
     // }
-    // dialogRef.value?.acceptParams(params)
   }
-
-  // 打开 drawer(新增、查看、编辑)
-  const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
-    if(title === "新增角色" || title === '编辑角色' )
-    {
-      if(title === "新增角色")
-        openType = "add"
-      else if(title === '编辑角色')
-        openType = "edit"
-
-      rolePopupVisible.value = true
-      rolePopupTitle.value = title
-    
-      const safeRow: Role.RoleBO = {
-        id: row.id || '',
-        name: row.name || '',
-        code: row.code || '',
-        type: row.type || 0,
-        remark: row.remark || '',
-      };
-
-      rolePopupData.value = safeRow;
-    }
-    else if(title === "设置权限")
-    {
-      permissionUnitVisible.value = true
-      permissionUnitTitle.value = title
-
-      const safeRow: Role.RoleBO = {
-        id: row.id || '',
-        name: row.name || '',
-        code: row.code || '',
-        type: row.type || 0,
-        remark: row.remark || '',
-      };
-
-      permissionUnitData.value = safeRow;
-
-      // if (row.permissionList) 
-      // {
-      //   permissionUnitData.value = row.permissionList; 
-      // }
-    }
-  }
-  </script>
+}
+</script>
   
\ No newline at end of file