lanjianrong 4 سال پیش
والد
کامیت
18012cc02a
2فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 4 4
      src/pages/Business/Attendance/components/ApplicantModal/index.tsx
  2. 5 5
      src/pages/Business/Attendance/index.tsx

+ 4 - 4
src/pages/Business/Attendance/components/ApplicantModal/index.tsx

@@ -6,7 +6,7 @@ import { fetchStaffList } from '@/services/user/api'
 import { linkAttendance, addAttendance } from '@/services/user/system'
 import '@/pages/Role/System/components/ConnectModal/index.less'
 import { LoadingOutlined, MoreOutlined } from '@ant-design/icons'
-import { addType } from '../..'
+import { modalType } from '../..'
 
 interface ConnectModalProps extends PropsWithChildren {
   dataId: string
@@ -71,8 +71,8 @@ const ApplicantModal: React.FC<ConnectModalProps> = ({
     }
   )
 
-  const AddTypeModal = (staffId: string, applicantStaffId: string) => {
-    if (type === addType.addobjectModal) {
+  const connectHandler = (staffId: string, applicantStaffId?: string) => {
+    if (type === modalType.addobjectModal) {
       tryLinkAttendance({ id: dataId, staffId })
     } else {
       tryAddAttendance({ applicantStaffId })
@@ -125,7 +125,7 @@ const ApplicantModal: React.FC<ConnectModalProps> = ({
                 <span className="w-1/5">{item.category}</span>
               </div>
               <div className="w-1/4 flex justify-end">
-                <span className="btn-outline" onClick={() => AddTypeModal(item.id)}>
+                <span className="btn-outline" onClick={() => connectHandler(item.id)}>
                   选择ta
                 </span>
               </div>

+ 5 - 5
src/pages/Business/Attendance/index.tsx

@@ -7,7 +7,7 @@ import Icon from '@/components/IconPark'
 import { Table, Tag, Popconfirm, Popover, Button } from 'antd'
 import { fetchAttendanceList, unlinkAttendance, deleteAttendance } from '@/services/user/system'
 
-export enum addType {
+export enum modalType {
   addobjectModal = 0,
   applicantModal = 1
 }
@@ -16,7 +16,7 @@ const Attendance = () => {
     id: '',
     attendanceList: [],
     visible: false,
-    type: addType.addobjectModal
+    type: modalType.addobjectModal
   })
 
   const { run: tryGetRoleStaffList } = useRequest(fetchAttendanceList, {
@@ -69,7 +69,7 @@ const Attendance = () => {
       dataIndex: 'staff',
       align: 'left',
       width: '70%',
-      render: (_, record) => (
+      render: (_, record: API.AttendanceItem) => (
         <div>
           {record.staff.map(item => (
             // console.log(item.staffName)
@@ -84,7 +84,7 @@ const Attendance = () => {
           <span
             className="hover:text-hex-886ab5 cursor-pointer text-purple-500"
             onClick={() =>
-              setState({ ...state, id: record.id, visible: true, type: addType.addobjectModal })
+              setState({ ...state, id: record.id, visible: true, type: modalType.addobjectModal })
             }>
             <Icon type="plus" />
             添加
@@ -121,7 +121,7 @@ const Attendance = () => {
           <div className="absolute right-7 top-7 z-100">
             <Button
               type="primary"
-              onClick={() => setState({ ...state, visible: true, type: addType.applicantModal })}>
+              onClick={() => setState({ ...state, visible: true, type: modalType.applicantModal })}>
               添加新申请人
             </Button>
             {/* <AddObjectModal title="添加新申请人" type visvi onCan /> */}