fix

src/pages/guarantee/edit/index.jsx

@@ -3,13 +3,16 @@ import {
   ProForm,
   ProFormSelect,
   ProFormText,
-  ProFormFieldSet,
   ProFormDateRangePicker,
-  ProFormUploadButton,
 } from "@ant-design/pro-components";
 import { useNavigate, useSearchParams } from "react-router-dom";
 import { Card, Col, Row, Space } from "antd";
 import { useEffect, useRef } from "react";
+import {
+  gettCooperationUnitsDetail,
+  savetCooperationUnits,
+  updatetCooperationUnits,
+} from "@/services/cooperationUnits";
 
 export default (props) => {
   const [searchParams] = useSearchParams();
@@ -17,41 +20,43 @@ export default (props) => {
   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]);
+  useEffect(() => {
+    if (id) {
+      gettCooperationUnitsDetail(id).then((res) => {
+        formRef.current.setFieldsValue({
+          ...res,
+          timeRange: [res.startDate, res.endDate],
+          orgType: res?.orgType?.split(","),
+        });
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    console.log(values);
 
-  // const onFinish = async (values) => {
-  //   console.log(values);
+    if (id) {
+      updatetCooperationUnits(id, {
+        ...values,
 
-  //   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);
-  //   });
+        orgType: values.orgType ? values.orgType?.join(",") : null,
+        startDate: values.timeRange ? values.timeRange[0] : null,
+        endDate: values.timeRange ? values.timeRange[1] : null,
+      }).then((res) => {
+        navigate(-1);
+      });
+    } else {
+      savetCooperationUnits({
+        ...values,
 
-  //   return false;
-  // };
+        orgType: values.orgType ? values.orgType?.join(",") : null,
+        startDate: values.timeRange ? values.timeRange[0] : null,
+        endDate: values.timeRange ? values.timeRange[1] : null,
+      }).then((res) => {
+        navigate(-1);
+      });
+    }
+  };
 
   return (
     <PageContainer>
@@ -61,7 +66,7 @@ export default (props) => {
           layout={"horizontal"}
           labelCol={{ span: 8 }}
           wrapperCol={{ span: 12 }}
-          // onFinish={onFinish}
+          onFinish={onFinish}
           initialValues={{ status: 0 }}
           submitter={{
             searchConfig: {
@@ -79,50 +84,17 @@ export default (props) => {
             },
           }}
         >
-          <ProFormFieldSet
-            name="addr"
-            label="登记年份"
-          >
-            <ProFormSelect
-              width={460}
-              valueEnum={{
-                taiyuan: '2019',
-                hangzho: '2020',
-                hangzh: '2021',
-                hangz: '2022',
-              }}
-            />
-          </ProFormFieldSet>
-          <ProFormText
-            name="createPerson"
-            label="机构名称"
-            width={460}
-          />
+          <ProFormText name="name" label="机构名称" width={460} />
           <ProFormText
-            name="createPerson"
+            name="businessLicense"
             label="工商注册证号"
             width={460}
           />
-          <ProFormText
-            name="createPerson"
-            label="卫生许可证号"
-            width={460}
-          />
-          <ProFormText
-            name="createPerson"
-            label="机构名称"
-            width={460}
-          />
-          <ProFormText
-            name="createPerson"
-            label="供应商联系人"
-            width={460}
-          />
-          <ProFormText
-            name="createPerson"
-            label="联系电话"
-            width={460}
-          />
+          <ProFormText name="hygieneLicense" label="卫生许可证号" width={460} />
+
+          <ProFormText name="contacts" label="联系人" width={460} />
+          <ProFormText name="phone" label="联系电话" width={460} />
+
           <ProFormDateRangePicker
             name="timeRange"
             label="签约时间"
@@ -130,54 +102,48 @@ export default (props) => {
           />
           <ProFormSelect
             width={460}
-            name="select-multiple"
+            name="orgType"
             label="机构类别"
-            valueEnum={{
-              red: '生鲜蔬菜类',
-              green: '米面粮油类',
-              blue: '饮食类',
-              reds: '饮水类',
-              greens: '住宿类',
-              blues: '物资代储类',
-              redss: '医疗救助类',
-              greenss: '油料类',
-              bluess: '道路施救类',
-              bluesss: '其他',
-            }}
             fieldProps={{
-              mode: 'multiple',
+              mode: "tags",
+              options: [
+                "生鲜蔬菜类",
+                "米面粮油类",
+                "饮食类",
+                "饮水类",
+                "住宿类",
+                "物资代储类",
+                "医疗救助类",
+                "油料类",
+                "道路施救类",
+              ],
             }}
-            rules={[
-              { type: 'array' },
-            ]}
           />
-
           <ProFormText
-            name="createPerson"
-            label="单日机构内膳食供应能力(人次)："
+            name="dietDaily"
+            label="单日机构内膳食供应能力(人次)"
             width={460}
           />
           <ProFormText
-            name="createPerson"
-            label="单次机构内膳食供应能力(人)："
+            name="dietSingle"
+            label="单次机构内膳食供应能力(人)"
             width={460}
           />
           <ProFormText
-            name="createPerson"
-            label="单日远程膳食供应能力(人次)："
+            name="dietRemoteDaily"
+            label="单日远程膳食供应能力(人次)"
             width={460}
           />
           <ProFormText
-            name="createPerson"
-            label="单次远程膳食供应能力(人)："
+            name="dietRemoteSingle"
+            label="单次远程膳食供应能力(人)"
             width={460}
           />
           <ProFormText
-            name="timeRange"
-            label="机构内住宿供应能力(人)："
+            name="stayCapability"
+            label="机构内住宿供应能力(人)"
             width={460}
           />
-          <ProFormUploadButton label="机构图片" name="upload" action="upload.do" />
         </ProForm>
       </Card>
     </PageContainer>

src/pages/guarantee/list/index.jsx

@@ -1,59 +1,55 @@
 import { queryTable } from "@/utils/request";
 import { PageContainer, ProTable } from "@ant-design/pro-components";
 import { Link, useNavigate } from "react-router-dom";
-
+import {
+  getCooperationUnitsList,
+  deletetCooperationUnits,
+} from "@/services/cooperationUnits";
 import { Button, message, Popconfirm } from "antd";
 import { useRef, useState } from "react";
 
 const GuaranteeTaskGuarantee = (props) => {
   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 onCancel = () => {
-    setIsOpen(false);
-    setModalData({});
+  const handleDelete = (id) => {
+    if (id) {
+      deletetCooperationUnits(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
   };
 
   const columns = [
     {
       title: "机构名称",
-      dataIndex: "guaranteeNo",
+      dataIndex: "name",
       search: true,
     },
     {
       title: "机构类别",
-      dataIndex: "receiver",
+      dataIndex: "orgType",
       search: true,
     },
     {
       title: "工商注册证号",
-      dataIndex: "dateRange",
+      dataIndex: "businessLicense",
       search: false,
     },
     {
       title: "卫生许可证号",
-      dataIndex: "address",
+      dataIndex: "hygieneLicense",
       search: false,
     },
     {
       title: "联系人",
-      dataIndex: "totalPersonNum",
+      dataIndex: "contacts",
       search: false,
     },
     {
       title: "联系电话",
-      dataIndex: "standard",
+      dataIndex: "phone",
       search: false,
     },
     {
@@ -66,11 +62,22 @@ const GuaranteeTaskGuarantee = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            // navigate(`/task/evaluate/list?id=${record.id}`);
+            navigate(`/task/guarantee/edit?id=${record.id}`);
           }}
         >
-          评价
+          修改
         </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
       ],
     },
   ];
@@ -80,25 +87,19 @@ const GuaranteeTaskGuarantee = (props) => {
       <ProTable
         actionRef={actionRef}
         formRef={formRef}
-        postData={(data) => {
-          return data.map((x) => ({
-            dateRange: [x.startDate, x.endDate],
-            ...x,
-          }));
-        }}
         rowKey="id"
         toolBarRender={() => [
           <Button
             key="2"
             type="primary"
             onClick={() => {
-              navigate('/task/guarantee/edit');
+              navigate("/task/guarantee/edit");
             }}
           >
             新增
           </Button>,
         ]}
-        // request={queryTable(getGuaranteeTaskList)}
+        request={queryTable(getCooperationUnitsList)}
         columns={columns}
       />
     </PageContainer>

src/pages/guaranteeTask/Edit/BasicForm.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { Button, Row, Col, Form, Input, InputNumber, DatePicker, notification } from 'antd';
 import { addGuaranteeTask, updateGuaranteeTask } from '@/services/guaranteeTask';
-
+import moment from 'moment';
 const { TextArea } = Input;
 const { RangePicker } = DatePicker;
 

src/routes/routes.jsx

@@ -137,7 +137,7 @@ export const authRoutes = [
         path: "guarantee/list",
         element: <GuaranteeList />,
         meta: {
-          title: "社会保障机构",
+          title: "保障机构",
           // permission: 'guaranteeTask.guarantee',
         },
       },

src/services/cooperationUnits.js

@@ -0,0 +1,21 @@
+import { restful } from "@/utils/request";
+
+/**
+ * 构造 Service
+ * @returns
+ */
+const [
+  getCooperationUnitsList,
+  gettCooperationUnitsDetail,
+  savetCooperationUnits,
+  updatetCooperationUnits,
+  deletetCooperationUnits,
+] = restful("/cooperationUnits");
+
+export {
+  getCooperationUnitsList,
+  gettCooperationUnitsDetail,
+  savetCooperationUnits,
+  updatetCooperationUnits,
+  deletetCooperationUnits,
+};