与后端接口进行首次联调

frontend/src/views/authority/role/components/rolePopup.vue

@@ -41,6 +41,7 @@
   
   <script lang="ts" setup>
   import { FormInstance,FormItemRule } from 'element-plus'
+  import { ProTableInstance } from '@/components/ProTable/interface'
   import { ref,computed  } from 'vue'
   import { Role } from '@/api/role/interface'
   import {dialogSmall} from '@/utils/elementBind'
@@ -51,10 +52,11 @@
   } from '@/api/role/role'
 
   const dictStore = useDictStore()
-  const {dialogVisible,title,data,openType}  = defineProps<{
+  const {dialogVisible,title,data,openType,getTableList}  = defineProps<{
     dialogVisible:boolean;
     title:string;
     openType:string;
+    getTableList:Function;
     data:{
       id?: string;     //角色类型ID
       name: string;   //角色类型名称
@@ -81,11 +83,9 @@
   }
   
   const handleOK = () => {
-
-    console.log(data,11111)
     ElMessage.info('角色数据提交')
-  try {
-    formRuleRef.value?.validate((valid: boolean) => {
+    try {
+      formRuleRef.value?.validate((valid: boolean) => {
       if (valid) {
         // 将表单数据转为json,发送到后端
         // let confirmFormData = JSON.parse(JSON.stringify(form.value))
@@ -96,7 +96,7 @@
             if(res.code === "200")
             {
               ElMessage.success(res.message)
-              updataList()
+              getTableList()
             }
             else
               ElMessage.error(res.message)
@@ -109,7 +109,7 @@
             if(res.code === "200")
             {
               ElMessage.success(res.message)
-              updataList()
+              getTableList()
             }
             else
               ElMessage.error(res.message)

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

@@ -30,8 +30,10 @@
     :title=rolePopupTitle
     :data=rolePopupData
     :openType=openType
+    :getTableList="proTable?.getTableList || (() => {})"
     @update:visible='rolePopupVisible = $event'
   />
+  <!-- :proTable="proTable || {} as ProTableInstance" -->
   <permissionUnit
     :dialogVisible=permissionUnitVisible
     :title=permissionUnitTitle
@@ -55,8 +57,6 @@ import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } f
 import { useDictStore } from '@/stores/modules/dict'
 import {
   getRoleList,
-  addRole,
-  editRole,
   deleteRole,
 } from '@/api/role/role'
 import { deleteUser } from '@/api/user/user'
@@ -89,9 +89,9 @@ const proTable = ref<ProTableInstance>()
 const dataCallback = (data: any) => {
   return {
     list: data.list,
-    total: Number(data.total),
-    pageNum: Number(data.pageNum),
-    pageSize: Number(data.pageSize),
+    total: data.total,
+    pageNum: data.pageNum,
+    pageSize: data.pageSize,
   }
 }
 
@@ -125,11 +125,11 @@ const columns = reactive<ColumnProps<Role.RoleBO>[]>([
     minWidth: 180,
   },
   {
-    prop: 'Type',
+    prop: 'type',
     label: '类型',
     enum: dictStore.getDictData('roleType'),
     fieldNames: { label: 'label', value: 'code' },
-    search: { el: 'input' },
+    search: { el: 'select' },
     minWidth: 180,
   },
   {
@@ -143,16 +143,10 @@ const columns = reactive<ColumnProps<Role.RoleBO>[]>([
 // 删除角色信息
 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)
-        proTable.value?.getTableList();
-      } else
-        ElMessage.error(res.message)
-    })
+  await useHandleData(deleteRole, { id:[params.id] }, '删除所选角色信息')
+  proTable.value?.clearSelection()
+  proTable.value?.getTableList()
   }
-
 }
 
 // 批量删除角色信息