fix

src/pages/guarantee/list/index.jsx

@@ -78,6 +78,16 @@ const GuaranteeList = (props) => {
             删除
           </Button>
         </Popconfirm>,
+         <Button
+         key={4}
+         style={{ padding: 0 }}
+         type="link"
+         onClick={() => {
+           navigate(`/task/guarantee/personnel/list?id=${record.id}`);
+         }}
+       >
+         人员
+       </Button>,
       ],
     },
   ];

src/pages/guarantee/personnel/edit/index.jsx

@@ -10,48 +10,46 @@ import {
 import { useNavigate, useSearchParams } from "react-router-dom";
 import { Card, Col, Row, Space } from "antd";
 import { useEffect, useRef } from "react";
+import {
+  savetCooperationPerson,
+  gettCooperationPersonDetail,
+  updatetCooperationPerson,
+} from "@/services/cooperationUnits";
 
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get("id");
+  const orgId = searchParams.get("orgId");
   const navigate = useNavigate();
 
   const formRef = useRef();
-  // useEffect(() => {
-  //   if (id) {
-  //     getPostsDetail(id).then((res) => {
-  //       formRef.current.setFieldsValue({
-  //         ...res,
-  //         filesList: res.filesList?.map((x) => x.fileAddr)[0] || null,
-  //       });
-  //     });
-  //   }
-  // }, [id]);
-
-  // const onFinish = async (values) => {
-  //   console.log(values);
+  useEffect(() => {
+    if (id) {
+      gettCooperationPersonDetail(id).then((res) => {
+        formRef.current.setFieldsValue({
+          ...res,
+        });
+      });
+    }
+  }, [id]);
 
-  //   savePosts({
-  //     ...values,
-  //     type: 'regulation',
-  //     filesList: values.filesList
-  //       ? [
-  //         {
-  //           fileAddr: values.filesList,
-  //           fileName: values.filesList?.substring(
-  //             values.filesList?.lastIndexOf("/") + 1
-  //           ),
-  //         },
-  //       ]
-  //       : null,
-  //     status: Number(values.status),
-  //     ...(id ? { id } : {}),
-  //   }).then((res) => {
-  //     navigate(-1);
-  //   });
-
-  //   return false;
-  // };
+  const onFinish = async (values) => {
+    console.log(values);
+    if (id) {
+      updatetCooperationPerson(id, {
+        ...values,
+      }).then((res) => {
+        navigate(-1);
+      });
+    } else {
+      savetCooperationPerson({
+        ...values,
+        orgId,
+      }).then((res) => {
+        navigate(-1);
+      });
+    }
+  };
 
   return (
     <PageContainer>
@@ -61,7 +59,7 @@ export default (props) => {
           layout={"horizontal"}
           labelCol={{ span: 8 }}
           wrapperCol={{ span: 12 }}
-          // onFinish={onFinish}
+          onFinish={onFinish}
           initialValues={{ status: 0 }}
           submitter={{
             searchConfig: {
@@ -80,32 +78,37 @@ export default (props) => {
           }}
         >
           <ProFormText
-            name="createPerson"
+            name="name"
             label="姓名"
             width={460}
+            rules={[{ required: true, message: "请输入姓名" }]}
           />
-          <ProFormText
-            name="createPerson"
-            label="身份证号"
-            width={460}
-          />
-          <ProFormText
-            name="createPerson"
-            label="名族"
-            width={460}
-          />
-          <ProFormText
-            name="createPerson"
-            label="政治面貌"
-            width={460}
-          />
-          <ProFormText
-            name="createPerson"
-            label="联系电话"
+          <ProFormText name="idNo" label="身份证号" width={460} />
+          <ProFormSelect
+            name="sex"
+            label="性别"
             width={460}
+            options={[
+              {
+                value: 1,
+                label: "男",
+              },
+              {
+                value: 2,
+                label: "女",
+              },
+              {
+                value: 9,
+                label: "未知",
+              },
+            ]}
           />
+
+          <ProFormText name="ethnic" label="名族" width={460} />
+          <ProFormText name="politicalStatus" label="政治面貌" width={460} />
+          <ProFormText name="phone" label="联系电话" width={460} />
           <ProFormSelect
-            name="status"
+            name="isHealthCertificate"
             label="是否有健康证"
             width={460}
             options={[
@@ -123,11 +126,7 @@ export default (props) => {
               },
             ]}
           />
-          <ProFormText
-            name="createPerson"
-            label="家庭住址"
-            width={460}
-          />
+          <ProFormText name="homeAddr" label="家庭住址" width={460} />
         </ProForm>
       </Card>
     </PageContainer>

src/pages/guarantee/personnel/list/index.jsx

@@ -1,24 +1,29 @@
 import { queryTable } from "@/utils/request";
 import { PageContainer, ProTable } from "@ant-design/pro-components";
-import { Link, useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import {
+  getCooperationPersonList,
+  deletetCooperationPerson,
+} from "@/services/cooperationUnits";
 
 import { Button, message, Popconfirm } from "antd";
 import { useRef, useState } from "react";
 
 const GuaranteePersonnelList = (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
   const navigate = useNavigate();
-  const [isOpen, setIsOpen] = useState(false);
-  const [modalData, setModalData] = useState({});
+
   const actionRef = useRef();
   const formRef = useRef();
 
-  // const handleDelete = (id) => {
-  //   if (id) {
-  //     deleteGuaranteeTask(id).then((res) => {
-  //       actionRef.current.reload();
-  //     });
-  //   }
-  // };
+  const handleDelete = (id) => {
+    if (id) {
+      deletetCooperationPerson(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
 
   const onCancel = () => {
     setIsOpen(false);
@@ -28,32 +33,46 @@ const GuaranteePersonnelList = (props) => {
   const columns = [
     {
       title: "机构名称",
-      dataIndex: "guaranteeN",
+      dataIndex: "orgIdName",
       search: false,
     },
     {
       title: "姓名",
-      dataIndex: "receive",
+      dataIndex: "name",
       search: true,
     },
     {
       title: "性别",
-      dataIndex: "dateRang",
+      dataIndex: "sex",
       search: false,
+      valueEnum: {
+        1: "男",
+        2: "女",
+        9: "未知",
+      },
     },
     {
       title: "名族",
-      dataIndex: "addres",
+      dataIndex: "ethnic",
+      search: false,
+    },
+    {
+      title: "联系电话",
+      dataIndex: "phone",
       search: false,
     },
     {
-      title: "联系人",
-      dataIndex: "aa",
+      title: "是否健康证",
+      dataIndex: "isHealthCertificate",
       search: false,
+      valueEnum: {
+        1: "是",
+        2: "否",
+      },
     },
     {
       title: "身份证号",
-      dataIndex: "standar",
+      dataIndex: "homeAddr",
       search: false,
     },
     {
@@ -66,10 +85,22 @@ const GuaranteePersonnelList = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            // navigate(`/task/evaluate/list?id=${record.id}`);
+            navigate(`/task/guarantee/personnel/edit?id=${record.id}`);
           }}
         >
+          修改
         </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
       ],
     },
   ];
@@ -79,29 +110,26 @@ const GuaranteePersonnelList = (props) => {
       <ProTable
         actionRef={actionRef}
         formRef={formRef}
-        postData={(data) => {
-          return data.map((x) => ({
-            dateRange: [x.startDate, x.endDate],
-            ...x,
-          }));
-        }}
+        params={{ orgId: id }}
         rowKey="id"
         toolBarRender={() => [
-          <Button
-            key="2"
-            type="primary"
-            onClick={() => {
-              navigate('/task/guarantee/personnel/edit');
-            }}
-          >
-            新增
-          </Button>,
+          id ? (
+            <Button
+              key="2"
+              type="primary"
+              onClick={() => {
+                navigate(`/task/guarantee/personnel/edit?orgId=${id}`);
+              }}
+            >
+              新增
+            </Button>
+          ) : null,
         ]}
-        // request={queryTable(getGuaranteeTaskList)}
+        request={queryTable(getCooperationPersonList)}
         columns={columns}
       />
     </PageContainer>
   );
 };
 
-export default GuaranteePersonnelList;
+export default GuaranteePersonnelList;

src/services/cooperationUnits.js

@@ -12,10 +12,24 @@ const [
   deletetCooperationUnits,
 ] = restful("/cooperationUnits");
 
+const [
+  getCooperationPersonList,
+  gettCooperationPersonDetail,
+  savetCooperationPerson,
+  updatetCooperationPerson,
+  deletetCooperationPerson,
+] = restful("/cooperationPerson");
+
 export {
   getCooperationUnitsList,
   gettCooperationUnitsDetail,
   savetCooperationUnits,
   updatetCooperationUnits,
   deletetCooperationUnits,
+  
+  getCooperationPersonList,
+  gettCooperationPersonDetail,
+  savetCooperationPerson,
+  updatetCooperationPerson,
+  deletetCooperationPerson,
 };