fix: 1

src/pages/Business/Attendance/index.tsx

@@ -1,14 +1,13 @@
 import React, { useState, useEffect } from 'react'
-import AttendanceMenu from '../Attendance/components/AttendanceMenu/attendanceMenu'
+import AttendanceMenu from './components/AttendanceMenu/attendanceMenu'
 import { useRequest } from 'umi'
 import Icon from '@/components/IconPark'
 import ConnectModal from '@/pages/Role/System/components/ConnectModal'
-import { Table,Tag,Popconfirm } from 'antd'
+import { Table,Tag } from 'antd'
 import {
   fetchAttendanceList,
   deleteAttendance
 } from '@/services/user/system'
-import Item from 'antd/lib/list/Item'
 
 const Attendance = () => {
   const [state, setState] = useState({
@@ -23,11 +22,11 @@ const Attendance = () => {
   })
 
   const { run: trydeleteAttendance } = useRequest(
-    (id: string) => {
-      return deleteAttendance({ id })
+    (params: API.DeleteAttendance) => {
+      return deleteAttendance(params)
     },
     {
-      manual: false,
+      manual: true,
       onSuccess: () => {
         tryGetRoleStaffList(state.id)
       }
@@ -43,7 +42,7 @@ const Attendance = () => {
     }
   }, [state.id])
 
-  const columns = [
+  const columns: ColumnsType<API.AttendanceItem> = [
     {
       title: '申请人名称',
       dataIndex: 'applicantStaffName',
@@ -53,20 +52,13 @@ const Attendance = () => {
       title: '申请对象',
       dataIndex: 'staff',
       align: 'left',
-      width: '60%',
+      width: '70%',
       render: (_,record) => (
         <>
-          {record.staff.map((item, index) => (
+          {record.staff.map((item) => (
             // console.log(item.staffName)
-            <span key={index} className="zh-mg-bottom-5 zh-block">
-              <Tag closable={()=>trydeleteAttendance(item.staffId)}>{item.staffName}</Tag>
-              {/* <Popconfirm
-                title="确认删除吗？"
-                okText="确认"
-                cancelText="取消"
-                onConfirm={() => trydeleteAttendance(item.id)}>
-                <Tag closable="trydeleteAttendance">{item.staffName}</Tag>
-              </Popconfirm> */}
+            <span key={item.staffId} className="zh-mg-bottom-5 zh-block">
+              <Tag closable={true} onClose={() => trydeleteAttendance(item.staffId,record.id )}>{item.staffName}</Tag>
             </span>
           ))}
           <span className="hover:text-hex-886ab5 cursor-pointer text-purple-500">
@@ -78,7 +70,7 @@ const Attendance = () => {
     {
       title: '操作',
       dataIndex: 'opreate',
-      width: '20%',
+      width: '10%',
       render: () => (
         <span className="hover:text-hex-e7026e cursor-pointer">
           <Icon type="delete" fill="#fd3995" />

src/services/user/system.ts

@@ -6,17 +6,15 @@ export async function queryRoleStaffList() {
 }
 
 /** 获取加班申请人列表 */
-export async function fetchAttendanceList(params: API.GetStaffListParams) {
-  return request<API.AttendanceItem[]>('/attendance/list', {
-    params
-  })
+export async function fetchAttendanceList() {
+  return request<API.AttendanceItem[]>('/attendance/list')
 }
 
 /** 删除关联加班人 */
-export async function deleteAttendance({ id }: { id: string }) {
+export async function deleteAttendance(params: API.DeleteAttendance) {
   return request('/attendance/unlinkStaff', {
     method: 'POST',
-    data: { id,staffId }
+    data:params
   })
 }
 

src/services/user/typings.d.ts

@@ -185,6 +185,11 @@ declare namespace API {
     id: string
     applicantStaffId: string
     applicantStaffName: string
-    staff: any[]
+    staff: {id:string; staff:string}[]
+  }
+
+  type DeleteAttendance ={
+    id: string
+    staffId:string
   }
 }