新增-表单校验

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({

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

@@ -3,7 +3,8 @@
     <ProTable
       ref='proTable'
       :columns='columns'
-        :data='roleData'
+      :request-api="getTableList"
+      :data-callback="dataCallback"
     >
       <!-- :requestApi="getRoleList" -->
       <!-- 表格 header 按钮 -->
@@ -29,14 +30,13 @@
     :title=rolePopupTitle
     :data=rolePopupData
     :openType=openType
-   :updataList = "updataList"
+    @update:visible='rolePopupVisible = $event'
-   @update:visible="rolePopupVisible = $event"
   />
   <permissionUnit
     :dialogVisible=permissionUnitVisible
     :title=permissionUnitTitle
     :data=permissionUnitData
-  @update:visible="permissionUnitVisible = $event"
+    @update:visible='permissionUnitVisible = $event'
   />
 </template>
 
@@ -52,7 +52,6 @@
 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,
@@ -60,9 +59,11 @@
   editRole,
   deleteRole,
 } from '@/api/role/role'
+import { deleteUser } from '@/api/user/user'
 
 
-  const {rolePopupVisible,permissionUnitVisible,rolePopupTitle,permissionUnitTitle,rolePopupData,permissionUnitData} = useCount();
+const { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData } = useCount()
+
 function useCount() {
   const rolePopupVisible = ref(false)
   const permissionUnitVisible = ref(false)
@@ -71,48 +72,26 @@
   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};
+  return { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData }
 }
 
 const dictStore = useDictStore()
 let openType = ''
 
-  //const roleData = roleDataList
-  const roleData = ref<Role.RoleBO[]>([])
-
-  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,
+    total: Number(data.total),
+    pageNum: Number(data.pageNum),
+    pageSize: Number(data.pageSize),
   }
 }
 
@@ -158,45 +137,22 @@
     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)
+  if (params.id) {
-  {
     let deleteData = { id: [params.id] }
-
     deleteRole(deleteData).then(res => {
-    if(res.code === "200")
+      if (res.code === '200') {
-    {
         ElMessage.success(res.message)
-      updataList()
+        proTable.value?.getTableList();
-    }
+      } else
-    else
         ElMessage.error(res.message)
     })
-
   }
 
-    // await useHandleData(deleteRole, { id: [params.id] }, `删除【${params.name}】角色`)
-    // proTable.value?.getTableList()
-    updataList()
 }
 
 // 批量删除角色信息
@@ -236,12 +192,11 @@
 
 // 打开 drawer(新增、查看、编辑)
 const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
-    if(title === "新增角色" || title === '编辑角色' )
+  if (title === '新增角色' || title === '编辑角色') {
-    {
+    if (title === '新增角色')
-      if(title === "新增角色")
+      openType = 'add'
-        openType = "add"
     else if (title === '编辑角色')
-        openType = "edit"
+      openType = 'edit'
 
     rolePopupVisible.value = true
     rolePopupTitle.value = title
@@ -252,12 +207,10 @@
       code: row.code || '',
       type: row.type || 0,
       remark: row.remark || '',
-      };
-
-      rolePopupData.value = safeRow;
     }
-    else if(title === "设置权限")
+
-    {
+    rolePopupData.value = safeRow
+  } else if (title === '设置权限') {
     permissionUnitVisible.value = true
     permissionUnitTitle.value = title
 
@@ -267,9 +220,9 @@
       code: row.code || '',
       type: row.type || 0,
       remark: row.remark || '',
-      };
+    }
 
-      permissionUnitData.value = safeRow;
+    permissionUnitData.value = safeRow
 
     // if (row.permissionList)
     // {