Merge branch 'by' into warning

boyang
2 parents 07dd077f a11effeb
Showing 45 changed files with 7922 additions and 687 deletions
.umirc.ts
order-erp.service-1.0-SNAPSHOT.jar
src/pages/Client/Components/ClientDrawer.tsx → src/pages/Client/Client/Components/ClientDrawer.tsx
src/pages/Client/Client/Components/ClientImportModal.tsx
src/pages/Client/Client/Components/ClientInformationModal.tsx
src/pages/Client/Client/Components/ClientModal.tsx
src/pages/Client/Client/Components/CommunicationHistoryModal.tsx
src/pages/Client/Client/Components/InformationHistoryModal.tsx
src/pages/Client/index.tsx → src/pages/Client/Client/index.tsx
src/pages/Client/Components/ClientStatistic.tsx
src/pages/Client/Components/CommunicationHistoryModal.tsx
src/pages/Client/Components/ClientImportModal.tsx → src/pages/Client/FollowRecord/Components/ClientImportModal.tsx
src/pages/Client/FollowRecord/Components/ClientModal.tsx
src/pages/Client/FollowRecord/Components/CommunicationHistoryModal.tsx
src/pages/Client/FollowRecord/index.tsx
src/pages/Order/Order/components/ConfirmReceiptModal.tsx
src/pages/Order/Order/components/DeliverModal.tsx
src/pages/Order/Order/components/FeedbackRegistrationModal.tsx
src/pages/Order/Order/components/FinancialDrawer.tsx
src/pages/Order/Order/components/FinancialEditDrawer.tsx
@@ -141,10 +141,21 @@ export default defineConfig({
     },
     {
       name: '客户管理',
-      path: '/client',
-      component: './Client',
+      path: '/Client',
       icon: 'BookOutlined',
       access: 'canReadAdminAndSales',
+      routes: [
+        {
+          name: '客户列表',
+          path: 'clint',
+          component: './Client/Client',
+        },
+        {
+          name: '跟进记录',
+          path: 'FollowRecord',
+          component: './Client/FollowRecord',
+        },
+      ],
     },
     {
       name: '打印',
@@ -6,23 +6,34 @@ import {
   postDistrictSelectByNameAndLevel,
   postDistrictSelOrderProvince,
   postServiceConstClientLevels,
+  postServiceConstClientSource,
   postServiceConstTradeStatus,
 } from '@/services';
+
 import { enumToSelect } from '@/utils';
 import {
   DrawerForm,
-  ProFormDateTimePicker,
+  ProFormDatePicker,
   ProFormSelect,
   ProFormText,
 } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
+// import { options } from 'node_modules/axios/index.cjs';
 import { useState } from 'react';
 export default ({ optType, record, onFinish }) => {
   const [form] = Form.useForm();
+  const requirementsEnum = {
+    EXPERIMENTAL_EQUIPMENT: '实验设备',
+    EXPERIMENTAL_MATERIALS: '实验材料',
+    OTHER: '其他',
+    PILOT_TEST_VALIDATION_SERVICES: '中式验证服务',
+  };
   //省市区
   const [province, setProvince] = useState('');
   const [city, setCity] = useState('');
+  const [showReferrers, setShowReferrers] = useState(false); // 控制显示的状态，初始为false
+  const [showQuoteDatetime, setShowQuoteDatetime] = useState(false); // 控制显示的状态，初始为false
   const optTypeEnum = {
     add: {
       text: '新增',
@@ -42,7 +53,7 @@ export default ({ optType, record, onFinish }) =&gt; {
     },
     edit: {
       text: '编辑',
-      button: <a type="primary">编辑</a>,
+      button: <a type="link">编辑</a>,
       readonly: false,
       onFinish: async (values) => {
         const res = await postAdminClientModifyClientInfo({
@@ -58,11 +69,43 @@ export default ({ optType, record, onFinish }) =&gt; {
     },
     detail: {
       text: '详情',
-      button: <a type="primary">详情</a>,
+      // button: <a type="primary">详情</a>,
       readonly: true,
     },
   };
+  const handleSourceChange = (value) => {
+    if (value === 'REFERRAL_BY_ACQUAINTANCE') {
+      setShowReferrers(true);
+    } else {
+      setShowReferrers(false);
+    }
+    // 在这里可以添加其他逻辑，比如根据选择更新其他表单项的值
+  };
+  const handleSchemeChange = (value) => {
+    console.log(value);
+    if (value === true) {
+      setShowQuoteDatetime(true);
+    } else {
+      setShowQuoteDatetime(false);
+    }
+    // 在这里可以添加其他逻辑，比如根据选择更新其他表单项的值
+  };
+
+  // MODIFIED: 增加处理非 JSON 格式字符串的逻辑
+  const parsedRecord = record
+    ? {
+        ...record,
+        requirements: (() => {
+          try {
+            return JSON.parse(record.requirements); // 尝试解析 JSON
+          } catch (error) {
+            return record.requirements ? record.requirements.split(',') : []; // 如果不是 JSON，则按逗号分隔字符串
+          }
+        })(),
+      }
+    : {}; // 如果 record 为空，返回一个空对象
+
   return (
     <DrawerForm
       title={optTypeEnum[optType].text}
@@ -73,7 +116,7 @@ export default ({ optType, record, onFinish }) =&gt; {
         maxWidth: window.innerWidth * 0.8,
         minWidth: 300,
       }}
-      initialValues={record}
+      initialValues={parsedRecord}
       form={form}
       trigger={optTypeEnum[optType].button}
       autoFocusFirstInput
@@ -98,7 +141,7 @@ export default ({ optType, record, onFinish }) =&gt; {
           },
         ]}
       />
-      <ProFormText
+      {/* <ProFormText
         name="companyName"
         label="单位名称"
         placeholder="请输入单位名称"
@@ -108,7 +151,7 @@ export default ({ optType, record, onFinish }) =&gt; {
             message: '请输入单位名称',
           },
         ]}
-      />
+      /> */}
       <div
         style={{
           display: 'flex',
@@ -260,7 +303,7 @@ export default ({ optType, record, onFinish }) =&gt; {
         />
       </div>
       <ProFormText
-        name="companyAddress"
+        name="detailAddress"
         label="详细地址"
         placeholder="请输入单位地址"
         rules={[
@@ -271,6 +314,17 @@ export default ({ optType, record, onFinish }) =&gt; {
         ]}
       />
       <ProFormText
+        name="contacts"
+        label="联系人"
+        placeholder="请输入联系人"
+        rules={[
+          {
+            required: true,
+            message: '请输入联系人',
+          },
+        ]}
+      />
+      <ProFormText
         name="phoneNumber"
         label="联系电话"
         placeholder="请输入联系电话"
@@ -281,23 +335,52 @@ export default ({ optType, record, onFinish }) =&gt; {
           },
         ]}
       />
-      <ProFormText
+      <ProFormSelect
         name="source"
         label="客户来源"
-        placeholder="请输入客户来源"
+        placeholder="请选择客户来源"
+        request={async () => {
+          const res = await postServiceConstClientSource();
+          return enumToSelect(res.data);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择客户来源',
+          },
+        ]}
+        fieldProps={{
+          onChange: handleSourceChange, // 添加onChange事件处理函数
+        }}
       />
-      <ProFormText
+      {showReferrers && (
+        <ProFormText
+          name="referrers"
+          label="推荐人"
+          placeholder="请输入推荐人"
+        />
+      )}
+      <ProFormSelect
         name="requirements"
         label="客户需求"
         placeholder="请输入客户需求"
+        valueEnum={requirementsEnum}
+        fieldProps={{
+          mode: 'multiple',
+        }}
         rules={[
           {
             required: true,
             message: '请输入客户需求',
+            type: 'array',
           },
         ]}
+        // request={async () => {
+        //   const res = await postServiceConstClientRequirements();
+        //   console.log(res.data, '5656require');
+        //   return enumToSelect(res.data);
+        // }}
       />
-      <ProFormText name="referrers" label="推荐人" placeholder="请输入推荐人" />
       <ProFormSelect
         name="hasScheme"
         label="是否已报方案"
@@ -318,12 +401,17 @@ export default ({ optType, record, onFinish }) =&gt; {
             message: '请选择是否已报方案',
           },
         ]}
+        fieldProps={{
+          onChange: handleSchemeChange, // 添加onChange事件处理函数
+        }}
       />
-      <ProFormDateTimePicker
-        name="quoteDatetime"
-        label="报价时间"
-        placeholder="请输入报价时间"
-      />
+      {showQuoteDatetime && (
+        <ProFormDatePicker
+          name="quoteDatetime"
+          label="报价时间"
+          placeholder="请输入报价时间"
+        />
+      )}
       <ProFormSelect
         name="level"
         label="客户等级"
@@ -336,7 +424,17 @@ export default ({ optType, record, onFinish }) =&gt; {
         ]}
         request={async () => {
           const res = await postServiceConstClientLevels();
-          return enumToSelect(res.data);
+          function enumToSelectLevel(data: any) {
+            const order = [
+              'PRIMARY_CLIENT',
+              'SECONDARY_CLIENT',
+              'TERTIARY_CLIENT',
+            ];
+            return order.map((key) => {
+              return { label: data[key], value: key };
+            });
+          }
+          return enumToSelectLevel(res.data);
         }}
       />
       <ProFormSelect
+import { RESPONSE_CODE } from '@/constants/enum';
+import { orderExport } from '@/services/order';
+import { blobToJson } from '@/utils';
+import { ModalForm, ProFormUploadDragger } from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { RcFile } from 'antd/es/upload';
+import axios from 'axios';
+
+export default ({ reloadTable }) => {
+  const [form] = Form.useForm();
+  const [messageApi, contextHolder] = message.useMessage();
+  const downloadImportTemplate = () => {
+    messageApi.open({
+      type: 'loading',
+      content: '正在导入...',
+      duration: 0,
+    });
+    orderExport(
+      '/api/admin/client/downloadImportTemplate',
+      '客户导入模板.xlsx',
+      'post',
+      {},
+      () => {
+        messageApi.destroy();
+      },
+    );
+  };
+
+  return (
+    <ModalForm
+      title="导入客户信息"
+      trigger={<Button type="primary">导入客户信息</Button>}
+      form={form}
+      autoFocusFirstInput
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => console.log('run'),
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        const formData = new FormData();
+        values.file.forEach((file) => {
+          formData.append('file', file.originFileObj as RcFile);
+        });
+        axios({
+          url: '/api/admin/client/importClient',
+          method: 'post',
+          responseType: 'blob',
+          headers: {
+            Authorization: localStorage.getItem('token'),
+            'Content-Type':
+              'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+          },
+          data: formData,
+        })
+          .then((response) => {
+            let data = response.data;
+            if (data.type === 'application/json') {
+              blobToJson(data).then((dataJson) => {
+                if (dataJson?.result === RESPONSE_CODE.SUCCESS) {
+                  message.success(dataJson?.message);
+                  reloadTable();
+                } else {
+                  message.error(dataJson?.message);
+                }
+              });
+            } else {
+              message.error('上传失败，已下载错误信息表格');
+              // 创建一个新的 Blob 对象，它包含了服务器响应的数据（即你的 Excel 文件）
+              const blob = new Blob([response.data]); // Excel 的 MIME 类型
+              const downloadUrl = window.URL.createObjectURL(blob);
+              const a = document.createElement('a');
+              a.href = downloadUrl;
+              a.download = '银行流水导入模板.xlsx'; // 你可以为文件命名
+              document.body.appendChild(a);
+              a.click(); // 模拟点击操作来下载文件
+              URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
+              document.body.removeChild(a);
+            }
+          })
+          .catch((error) => {
+            // 处理错误
+            message.error('系统出现异常了，请联系管理员', error);
+          })
+          .finally(() => {});
+        return true;
+      }}
+    >
+      <ProFormUploadDragger max={1} label="上传" name="file" />
+      <Button type="link" onClick={downloadImportTemplate}>
+        下载导入模板
+      </Button>
+      {contextHolder}
+    </ModalForm>
+  );
+};
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postAdminClientAddOrModifyClientComunicationInfo,
+  postAdminClientQueryClientPage,
+  postOrderErpOrderStagesUpload,
+  postServiceConstClientWay,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import {
+  ModalForm,
+  ProFormDateTimePicker,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+  ProFormUploadDragger,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { RcFile } from 'antd/es/upload';
+export default ({ data, type, reloadTable }) => {
+  const [form] = Form.useForm();
+  const onfinish = async (values) => {
+    const resSearchId = await postAdminClientQueryClientPage({
+      data: {
+        groupFilter: 'all',
+      },
+    });
+    const matchingItem = resSearchId.data.data.find(
+      (item) => item.id === values.name,
+    );
+    let matchedId;
+    if (matchingItem) {
+      matchedId = matchingItem.id; // 匹配成功，取出 id
+      values.name = matchingItem.name;
+    } else {
+      matchedId = null; // 如果没有匹配项，可以设置为 null 或其他值
+    }
+    const res = await postAdminClientAddOrModifyClientComunicationInfo({
+      data: {
+        ...values,
+        clientId: matchedId,
+      },
+    });
+    if (res.result === RESPONSE_CODE.SUCCESS) {
+      message.success('新增成功');
+      reloadTable();
+      return true;
+    }
+    // 不返回不会关闭弹框
+  };
+  const editOnfinish = async (values) => {
+    // setEditClientId(data.clientId);
+    values.clientId = data.clientId;
+    console.log(values, '5656editClientId');
+
+    // const resSearchId = await postAdminClientQueryClientPage({
+    //   data: {
+    //     groupFilter: 'all',
+    //   },
+    // });
+    // const matchingItem = resSearchId.data.data.find(
+    //   (item) => item.id === values.name,
+    // );
+
+    const res = await postAdminClientAddOrModifyClientComunicationInfo({
+      data: {
+        ...values,
+      },
+    });
+    if (res.result === RESPONSE_CODE.SUCCESS) {
+      message.success('新增成功');
+      reloadTable();
+      return true;
+    }
+    // 不返回不会关闭弹框
+  };
+  const optType = {
+    add: {
+      readOnly: false,
+      title: '新增跟进记录',
+      button: (
+        <Button size={'middle'} type="primary">
+          新增
+        </Button>
+      ),
+      onFinish: onfinish,
+    },
+    modify: {
+      readOnly: false,
+      title: '修改跟进记录',
+      button: (
+        <Button size={'middle'} type="primary">
+          编辑
+        </Button>
+      ),
+      onFinish: editOnfinish,
+    },
+    detail: {
+      readOnly: true,
+      title: '查看跟进记录',
+      button: (
+        <Button size={'middle'} type="primary" color="red">
+          查看
+        </Button>
+      ),
+      onFinish: () => {},
+    },
+  };
+  return (
+    <ModalForm
+      title={optType[type].title}
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 400,
+      }}
+      form={form}
+      trigger={optType[type].button}
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      onFinish={optType[type].onFinish}
+    >
+      <ProFormSelect
+        name="name"
+        readonly={optType[type].readOnly}
+        fieldProps={{
+          labelInValue: false,
+          disabled: type === 'modify',
+        }}
+        initialValue={data ? data?.clientName + '' : null}
+        label="客户"
+        width="sm"
+        request={async () => {
+          const res = await postAdminClientQueryClientPage({
+            data: {
+              groupFilter: 'all',
+            },
+          });
+          console.log(data, '5656data?.nameedit');
+          // const namesArray = res.data.data.map((item) => item.name);
+          // const formattedObject = res.data.data.reduce((acc, name) => {
+          //   acc[name] = name; // 将名称作为键和值
+          //   return acc;
+          // }, {});
+          // console.log(namesArray, '5656namesArray');
+          // const formattedObject = res.data.data.reduce((acc, item) => {
+          //   acc[item.name] = item.name; // 使用 name 作为键，id 作为值
+          //   return acc;
+          // }, {});
+          // return enumToSelect(formattedObject);
+          const options = res.data.data.reduce((acc, item) => {
+            acc.push({ label: item.name, value: item.id }); // 使用 name 作为 label，id 作为 value
+            return acc;
+          }, []);
+          return options;
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择客户',
+          },
+        ]}
+      ></ProFormSelect>
+      <ProFormDateTimePicker
+        name="datetime"
+        label="日期"
+        initialValue={data ? data?.datetime + '' : null}
+        placeholder="请选择跟进时间"
+        width="sm"
+        rules={[
+          {
+            required: true,
+            message: '请选择日期',
+          },
+        ]}
+      />
+      <ProFormSelect
+        name="way"
+        width="sm"
+        readonly={optType[type].readOnly}
+        fieldProps={{
+          labelInValue: false,
+        }}
+        initialValue={data?.way ? data?.way + '' : null}
+        label="类型"
+        request={async () => {
+          const res = await postServiceConstClientWay();
+          return enumToSelect(res.data);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择跟进类型',
+          },
+        ]}
+      ></ProFormSelect>
+      <ProFormTextArea
+        name="content"
+        label="详情"
+        placeholder="请输入详情"
+        initialValue={data?.content}
+        readonly={optType[type].readOnly}
+        rules={[
+          {
+            required: true,
+            message: '请输入详情',
+          },
+        ]}
+      ></ProFormTextArea>
+      <ProFormUploadDragger
+        label="附件"
+        name="attachment"
+        action="upload.do"
+        hidden={optType[type].readOnly}
+        onChange={(info) => {
+          const uploadFile = async ({ fileList: newFileList }) => {
+            if (newFileList.length > 0) {
+              const formData = new FormData();
+              formData.append('file', newFileList[0].originFileObj as RcFile);
+              const res = await postOrderErpOrderStagesUpload({
+                data: formData,
+                headers: {
+                  'Content-Type':
+                    'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+                },
+              });
+              const url = res.data;
+              console.log('attachments' + JSON.stringify(url));
+              form.setFieldValue('attachments', url);
+            } else {
+              form.setFieldValue('attachments', null);
+            }
+          };
+          uploadFile(info);
+        }}
+        max={1}
+      />
+      <a hidden={!optType[type].readOnly} href={data?.attachments} download>
+        下载附件
+      </a>
+      <ProFormText
+        initialValue={data?.attachments}
+        name="attachments"
+        hidden
+      ></ProFormText>
+      <ProFormText initialValue={data?.id} name="id" hidden></ProFormText>
+    </ModalForm>
+  );
+};
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postAdminClientAddOrModifyClientComunicationInfo,
+  postAdminClientQueryClientPage,
+  postOrderErpOrderStagesUpload,
+  postServiceConstClientWay,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import {
+  ModalForm,
+  ProFormDateTimePicker,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+  ProFormUploadDragger,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { RcFile } from 'antd/es/upload';
+export default ({ data, type, reloadTable }) => {
+  const [form] = Form.useForm();
+  const onfinish = async (values) => {
+    console.log(data, '5656datatest');
+    console.log(values, '5656...values');
+    const res = await postAdminClientAddOrModifyClientComunicationInfo({
+      data: {
+        ...values,
+        id: '',
+        clientId: data.id,
+      },
+    });
+    if (res.result === RESPONSE_CODE.SUCCESS) {
+      message.success('新增成功');
+      reloadTable();
+      return true;
+    }
+    // 不返回不会关闭弹框
+  };
+  const optType = {
+    add: {
+      readOnly: false,
+      title: '新增跟进记录',
+      button: (
+        <Button size={'small'} type="link">
+          新增跟进
+        </Button>
+      ),
+      onFinish: onfinish,
+    },
+    add2: {
+      readOnly: false,
+      title: '新增跟进记录',
+      button: (
+        <Button size={'middle'} type="primary">
+          新增跟进
+        </Button>
+      ),
+      onFinish: onfinish,
+    },
+    modify: {
+      readOnly: false,
+      title: '修改跟进记录',
+      button: (
+        <Button size={'small'} type="link">
+          编辑
+        </Button>
+      ),
+      onFinish: onfinish,
+    },
+    detail: {
+      readOnly: true,
+      title: '查看跟进记录',
+      button: (
+        <Button size={'small'} type="link">
+          查看
+        </Button>
+      ),
+      onFinish: () => {},
+    },
+  };
+  return (
+    <ModalForm
+      title={optType[type].title}
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 400,
+      }}
+      form={form}
+      trigger={optType[type].button}
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      onFinish={optType[type].onFinish}
+    >
+      <ProFormSelect
+        name="sendStoreCode"
+        readonly={optType[type].readOnly}
+        fieldProps={{
+          labelInValue: false,
+        }}
+        initialValue={data ? data?.name + '' : null}
+        label="客户"
+        width="sm"
+        request={async () => {
+          const res = await postAdminClientQueryClientPage({
+            data: {
+              groupFilter: 'all',
+            },
+          });
+          console.log(data?.datetime, '5656data?.datetime');
+          const namesArray = res.data.data.map((item) => item.name);
+          return enumToSelect(namesArray);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择客户',
+          },
+        ]}
+        disabled
+      ></ProFormSelect>
+      <ProFormDateTimePicker
+        name="datetime"
+        label="日期"
+        initialValue={data.datetime ? data?.datetime + '' : null}
+        placeholder="请选择跟进时间"
+        width="sm"
+        rules={[
+          {
+            required: true,
+            message: '请选择日期',
+          },
+        ]}
+      />
+      <ProFormSelect
+        name="way"
+        width="sm"
+        readonly={optType[type].readOnly}
+        fieldProps={{
+          labelInValue: false,
+        }}
+        initialValue={data?.way ? data?.way + '' : null}
+        label="类型"
+        request={async () => {
+          const res = await postServiceConstClientWay();
+          return enumToSelect(res.data);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择跟进类型',
+          },
+        ]}
+      ></ProFormSelect>
+      <ProFormTextArea
+        name="content"
+        label="详情"
+        placeholder="请输入详情"
+        initialValue={data?.content}
+        readonly={optType[type].readOnly}
+        rules={[
+          {
+            required: true,
+            message: '请输入详情',
+          },
+        ]}
+      ></ProFormTextArea>
+      <ProFormUploadDragger
+        label="附件"
+        name="attachment"
+        action="upload.do"
+        hidden={optType[type].readOnly}
+        onChange={(info) => {
+          const uploadFile = async ({ fileList: newFileList }) => {
+            if (newFileList.length > 0) {
+              const formData = new FormData();
+              formData.append('file', newFileList[0].originFileObj as RcFile);
+              const res = await postOrderErpOrderStagesUpload({
+                data: formData,
+                headers: {
+                  'Content-Type':
+                    'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+                },
+              });
+              const url = res.data;
+              console.log('attachments' + JSON.stringify(url));
+              form.setFieldValue('attachments', url);
+            } else {
+              form.setFieldValue('attachments', null);
+            }
+          };
+          uploadFile(info);
+        }}
+        max={1}
+      />
+      <a hidden={!optType[type].readOnly} href={data?.attachments} download>
+        下载附件
+      </a>
+      <ProFormText
+        initialValue={data?.attachments}
+        name="attachments"
+        hidden
+      ></ProFormText>
+      <ProFormText initialValue={data?.id} name="id" hidden></ProFormText>
+    </ModalForm>
+  );
+};
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postAdminClientAddOrModifyClientComunicationInfo,
+  postAdminClientQueryClientComunicationInfo,
+  postAdminClientRemoveClientComunicationInfo,
+  postServiceConstClientWay,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import {
+  ActionType,
+  EditableProTable,
+  ModalForm,
+  ProFormInstance,
+} from '@ant-design/pro-components';
+import { Descriptions, Popconfirm, message } from 'antd';
+import { useEffect, useRef, useState } from 'react';
+import ClientModal from './ClientModal';
+import InformationHistoryModal from './InformationHistoryModal';
+export default ({ record }) => {
+  const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
+  const [dataSource, setDataSource] = useState();
+  const ref = useRef<ProFormInstance>();
+  const actionRef = useRef<ActionType>();
+  const [refreshKey, setRefreshKey] = useState(0); // 用于强制刷新的键
+
+  const reloadInformationHistoryModal = () => {
+    actionRef.current.reload(); // 重新加载数据
+    console.log('5656flush');
+
+    // 更新 refreshKey，强制刷新 CommunicationHistoryModal
+    setRefreshKey((prevKey) => prevKey + 1);
+  };
+  const columns = [
+    {
+      title: '跟进时间',
+      dataIndex: 'datetime',
+      width: 50,
+      valueType: 'dateTime',
+      rules: [{ required: true, message: '请选择时间' }],
+    },
+    {
+      title: '跟进人',
+      width: 50,
+      rules: [{ required: true, message: '请输入跟进人' }],
+      dataIndex: 'updateByName',
+    },
+    {
+      title: '跟进方式',
+      width: 50,
+      dataIndex: 'way',
+      rules: [{ required: true, message: '请选择方式' }],
+      render: (text, record) => record.wayText, // 显示 wayText
+      request: async () => {
+        const res = await postServiceConstClientWay();
+        return enumToSelect(res.data);
+      },
+    },
+    {
+      title: '内容',
+      width: 100,
+      valueType: 'textarea',
+      rules: [{ required: true, message: '请输入内容' }],
+      dataIndex: 'content',
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 50,
+      render: (text, record, _, action) => [
+        // <a
+        //   key="editable"
+        //   onClick={() => {
+        //     action?.startEditable?.(record.tid);
+        //   }}
+        // >
+        //   编辑
+        // </a>,
+        <InformationHistoryModal
+          // key={'communicationHistory'}
+          key={`communicationHistory-${refreshKey}`} // 使用 refreshKey 来强制更新组件
+          data={record}
+          // reloadTable={() => {
+          //   actionRef.current.reload();
+          //   console.log('5656flush');
+          // }}
+          reloadTable={reloadInformationHistoryModal}
+        />,
+        <Popconfirm
+          key={'delete'}
+          title="删除记录"
+          description="确认删除记录?"
+          onConfirm={async () => {
+            setDataSource(dataSource.filter((item) => item.tid !== record.tid));
+            const res = await postAdminClientRemoveClientComunicationInfo({
+              query: {
+                id: record.id,
+              },
+            });
+            if (res.result === RESPONSE_CODE.SUCCESS) {
+              message.success(res.message);
+              action?.reload();
+            } else {
+              message.error('删除失败');
+            }
+          }}
+          okText="是"
+          cancelText="否"
+        >
+          <a type={'danger'}>删除</a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+  const [name, setName] = useState(''); // 客户名称
+  const [contacts, setContacts] = useState(''); // 联系人
+  const [sourceText, setSourceText] = useState(''); // 来源文本
+  const [phoneNumber, setPhoneNumber] = useState(''); // 联系电话
+  const [hasSchemeText, setHasSchemeText] = useState(''); // 报方案状态文本
+  const [quoteDatetime, setQuoteDatetime] = useState(null); // 报价时间
+  const [referrers, setReferrers] = useState(''); // 推荐人
+  const [requirementsText, setRequirementsText] = useState(''); // 需求文本
+  const [tradeStatusText, setTradeStatusText] = useState(''); // 跟进状态文本
+  const [levelText, setLevelText] = useState(''); // 客户等级文本
+  const [createTime, setCreateTime] = useState(null); // 最新沟通时间
+  const [address, setAddress] = useState(''); // 客户地址
+  const [notes, setNotes] = useState(''); // 备注信息
+  const [createByName, setCreateByName] = useState(''); // 创建人
+  const [latestObject, setLatestObject] = useState(); // 最新跟进时间
+  const [recordSave, setRecordSave] = useState(); //新增跟进
+  useEffect(() => {
+    const request = async () => {
+      const resShow = await postAdminClientQueryClientComunicationInfo({
+        data: {
+          clientId: record.id,
+        },
+      });
+      if (resShow?.data?.data !== null) {
+        const data = resShow?.data?.data;
+        // const latest = data.reduce((latest: any, current: any) => {
+        //   return new Date(current.updateTime) > new Date(latest.updateTime) ? current : latest;
+        // });
+        // const data = [];
+        const latestObject2 =
+          data?.length > 0
+            ? data.reduce((latest, current) =>
+                new Date(current.datetime) > new Date(latest.datetime)
+                  ? current
+                  : latest,
+              )
+            : null; // 或返回其他默认值
+        setLatestObject(latestObject2?.datetime);
+      }
+      setRecordSave(record);
+      setName(record.name);
+      setContacts(record.contacts);
+      setSourceText(record.sourceText);
+      setPhoneNumber(record.phoneNumber);
+      setHasSchemeText(record.hasSchemeText);
+      setQuoteDatetime(record.quoteDatetime);
+      setReferrers(record.referrers);
+      setRequirementsText(record.requirementsText);
+      setTradeStatusText(record.tradeStatusText);
+      setLevelText(record.levelText);
+      setCreateTime(record.createTime);
+      setAddress(record.address);
+      setNotes(record.notes);
+      setCreateByName(record.createByName);
+    };
+    request();
+  }, []);
+  const items = [
+    {
+      key: '1',
+      label: '客户名称',
+      children: name, // 客户名称
+    },
+    {
+      key: '2',
+      label: '联系人',
+      children: contacts, // 联系人
+    },
+    {
+      key: '3',
+      label: '来源',
+      children: sourceText, // 来源文本
+    },
+    {
+      key: '4',
+      label: '联系电话',
+      children: phoneNumber, // 联系电话
+    },
+    {
+      key: '5',
+      label: '是否已报方案',
+      children: hasSchemeText, // 报方案状态文本
+    },
+    {
+      key: '6',
+      label: '报价时间',
+      children: quoteDatetime, // 报价时间
+    },
+    {
+      key: '7',
+      label: '推荐人',
+      children: referrers, // 推荐人
+    },
+    {
+      key: '8',
+      label: '需求',
+      children: requirementsText, // 需求文本
+    },
+    {
+      key: '9',
+      label: '跟进状态',
+      children: tradeStatusText, // 跟进状态文本
+    },
+    {
+      key: '10',
+      label: '客户等级',
+      children: levelText, // 客户等级文本
+    },
+    {
+      key: '11',
+      label: '创建时间',
+      children: createTime, // 最新沟通时间
+    },
+    {
+      key: '12',
+      label: '客户地址',
+      children: address, // 客户地址
+    },
+    {
+      key: '13',
+      label: '备注',
+      children: notes, // 备注信息
+    },
+    {
+      key: '14',
+      label: '创建人',
+      children: createByName, // 创建人
+    },
+    {
+      key: '15',
+      label: '最新跟进时间',
+      children: latestObject, // 最新跟进时间
+    },
+  ];
+  return (
+    <ModalForm
+      title="客户详情"
+      trigger={<a type="primary">查看</a>}
+      modalProps={{
+        destroyOnClose: true,
+      }}
+      onFinish={async () => {
+        return true;
+      }}
+    >
+      <Descriptions items={items} column={2} />
+      <ClientModal
+        key={'add'}
+        data={recordSave}
+        reloadTable={() => {
+          actionRef.current?.reload();
+        }}
+        type={'add2'}
+      />
+      ,
+      <EditableProTable
+        rowKey="tid"
+        formRef={ref}
+        actionRef={actionRef}
+        recordCreatorProps={false}
+        // recordCreatorProps={{
+        //   record: () => ({ tid: (Math.random() * 1000000).toFixed(0) }),
+        // }}
+        loading={false}
+        columns={columns}
+        request={async () => {
+          const res = await postAdminClientQueryClientComunicationInfo({
+            data: {
+              clientId: record.id,
+            },
+          });
+          if (res.result === RESPONSE_CODE.SUCCESS) {
+            console.log(JSON.stringify(res.data));
+            return {
+              ...res.data,
+              data: res.data.data.map((item) => {
+                return {
+                  ...item,
+                  tid: (Math.random() * 1000000).toFixed(0),
+                };
+              }),
+            };
+          } else {
+            message.error('获取失败');
+          }
+        }}
+        value={dataSource}
+        onChange={setDataSource}
+        editable={{
+          type: 'multiple',
+          editableKeys,
+          onSave: async (rowKey, data, row) => {
+            console.log(rowKey, data, row);
+            if (data?.way === '拜访') {
+              data.way = 'VISIT';
+            } else if (data?.way === '电话') {
+              data.way = 'PHONE';
+            } else if (data?.way === '微信') {
+              data.way = 'WECHAT';
+            } else if (data?.way === '邮件') {
+              data.way = 'EMAIL';
+            } else if (data?.way === '其他') {
+              data.way = 'OTHER';
+            }
+            const res = await postAdminClientAddOrModifyClientComunicationInfo({
+              data: {
+                ...data,
+                clientId: record.id,
+              },
+            });
+            if (res.result === RESPONSE_CODE.SUCCESS) {
+              message.success(res.message);
+            } else {
+              message.error('修改失败');
+            }
+            actionRef.current?.reload();
+          },
+          onChange: setEditableRowKeys,
+        }}
+      />
+      {/* <Descriptions title="User Info" items={items} column={2} /> */}
+      {/*<ProCard title="表格数据" headerBordered collapsible defaultCollapsed>
+                <ProFormField
+                    ignoreFormItem
+                    fieldProps={{
+                        style: {
+                            width: '100%',
+                        },
+                    }}
+                    mode="read"
+                    valueType="jsonCode"
+                    text={JSON.stringify(dataSource)}
+                />
+            </ProCard>*/}
+    </ModalForm>
+  );
+};
+// import ClientModal from '@/pages/Client/FollowRecord/Components/ClientModal';
+import ClientInformationModal from '@/pages/Client/Client/Components/ClientInformationModal';
+
+import {
+  postAdminClientQueryClientComunicationInfo,
+  postAdminClientRemoveClientComunicationInfo,
+} from '@/services/request';
+import { ModalForm } from '@ant-design/pro-components';
+import { Button, Descriptions, Space } from 'antd';
+import { useEffect, useRef, useState } from 'react';
+
+export default ({ data, reloadTable }) => {
+  console.log(data, '5656datafirstshowclient');
+
+  // const [isModalVisible, setIsModalVisible] = useState(false); // 控制 ClientModal 的显示
+  const actionRef = useRef(); // 引用 actionRef，方便调用 reload 方法
+
+  const [datetime, setDatetime] = useState(); // 跟进日期
+  const [createByName, setCreateByName] = useState(''); // 跟进人员
+  const [clientName, setClientName] = useState(''); // 客户名称
+  // const [clientAddress, setClientAddress] = useState(''); // 客户地址
+  const [way, setWay] = useState(); // 类型
+  // const [clientNameLike, setClientNameLike] = useState(''); // 客户名称模糊查询
+  // const [clientAddressLike, setClientAddressLike] = useState(''); // 客户地址模糊查询
+  // const [tradeStatus, setTradeStatus] = useState(''); // 客户状态
+  // const [tradeStatusLike, setTradeStatusLike] = useState(''); // 客户状态模糊查询
+  const [content, setContent] = useState(''); // 跟进详情
+  const [createTime, setCreateTime] = useState(null); // 创建时间
+  const [attachments, setAttachments] = useState(); //附件
+  const [attachmentsName, setAttachmentsName] = useState(''); // 附件名称
+
+  useEffect(() => {
+    const request = async () => {
+      console.log(data, '5656datasearch');
+      const res = await postAdminClientQueryClientComunicationInfo({
+        data: {
+          id: data.id,
+        },
+      });
+      console.log(res, '5656res');
+      const dataSearch = res.data.data[0];
+      if (dataSearch) {
+        if (dataSearch.attachments) {
+          const url = dataSearch.attachments;
+          const match = url.match(/aliyuncs\.com\/(.*?)\?/);
+          let decodedStr = '';
+
+          if (match) {
+            // 获取匹配的字符串并进行解码
+            const encodedStr = match[1];
+            decodedStr = decodeURIComponent(encodedStr);
+            setAttachmentsName(decodedStr); // 设置跟进日期
+          }
+        }
+        setDatetime(dataSearch.datetime); // 设置跟进日期
+        // setDateRange(data.dateRange || []); // 设置跟进时间范围
+        setCreateByName(dataSearch.createByName); // 设置跟进人员
+        setClientName(dataSearch.clientName); // 设置客户名称
+        // setClientAddress(data.clientAddress || ''); // 设置客户地址
+        // setClientNameLike(data.clientNameLike || ''); // 设置客户名称模糊查询
+        // setClientAddressLike(data.clientAddressLike || ''); // 设置客户地址模糊查询
+        // setTradeStatus(data.tradeStatus || ''); // 设置客户状态
+        // setTradeStatusLike(data.tradeStatusLike || ''); // 设置客户状态模糊查询
+        setContent(dataSearch.content); // 设置跟进详情
+        setCreateTime(dataSearch.createTime); // 设置创建时间
+        setWay(dataSearch.wayText);
+        setAttachments(dataSearch.attachments);
+      }
+      console.log(attachments, '5656attachments');
+    };
+    request();
+  }, []);
+  const items = [
+    {
+      key: '1',
+      label: '跟进日期',
+      children: datetime, // 跟进日期
+    },
+    {
+      key: '2',
+      label: '跟进人员',
+      children: createByName, // 跟进人员
+    },
+    {
+      key: '3',
+      label: '客户名称',
+      children: clientName, // 客户名称
+    },
+    {
+      key: '4',
+      label: '跟进详情',
+      children: content, // 跟进详情
+    },
+    {
+      key: '5',
+      label: '创建时间',
+      children: createTime, // 创建时间
+    },
+    {
+      key: '6',
+      label: '跟进类型',
+      children: way, // 跟进类型
+    },
+  ];
+  const handleDelete = async () => {
+    console.log(JSON.stringify(data), '5656record');
+    // 调用删除接口
+    const success = await postAdminClientRemoveClientComunicationInfo({
+      query: {
+        id: data.id,
+      },
+    });
+    // setIsModalVisible(false);
+    if (success) {
+      actionRef?.current?.reload(); // 重新加载表格数据
+    }
+  };
+  return (
+    <Space>
+      <ModalForm
+        title="跟进记录"
+        trigger={<Button type="link">查看</Button>}
+        submitter={{
+          resetButtonProps: {
+            style: {
+              display: 'none',
+            },
+          },
+          submitButtonProps: {
+            style: {
+              display: 'none',
+            },
+          },
+          render: (props, defaultDoms) => {
+            return [
+              ...defaultDoms,
+              <>
+                <ClientInformationModal
+                  key={'modify'}
+                  data={data} // 将表单数据传递给 ClientModal
+                  reloadTable={() => {
+                    actionRef?.current?.reload(); // 重新加载表格数据
+                    props.submit();
+                    reloadTable();
+                    console.log('5656close');
+                  }}
+                  type={'modify'}
+                  onFinish={() => {
+                    // setIsModalVisible(false);
+                  }} // 关闭 Modal
+                  style={{ marginRight: '10px' }}
+                />
+                <Button
+                  key={'delete'}
+                  onClick={() => {
+                    handleDelete();
+                    props.submit();
+                    reloadTable();
+                  }}
+                  type="primary"
+                  size="middle"
+                  danger // 使用 danger 属性来将按钮颜色设置为红色
+                  style={{ marginLeft: '10px' }}
+                  onFinish={() => {
+                    actionRef.current.reload();
+                  }}
+                >
+                  删除
+                </Button>
+              </>,
+            ];
+          },
+        }}
+        onFinish={async () => {
+          // 提交成功后，显示 ClientDrawer
+          // setIsModalVisible(true);
+          return true;
+        }}
+      >
+        <Descriptions items={items} column={1} />
+        {attachmentsName && (
+          <a href={attachments} download>
+            附件：{attachmentsName}
+          </a>
+        )}
+      </ModalForm>
+    </Space>
+  );
+};
-import ClientDrawer from '@/pages/Client/Components/ClientDrawer';
-import ClientImportModal from '@/pages/Client/Components/ClientImportModal';
-import ClientStatistic from '@/pages/Client/Components/ClientStatistic';
-import CommunicationHistoryModal from '@/pages/Client/Components/CommunicationHistoryModal';
+import ButtonConfirm from '@/components/ButtomConfirm';
+import ClientDrawer from '@/pages/Client/Client/Components/ClientDrawer';
+import ClientImportModal from '@/pages/Client/Client/Components/ClientImportModal';
+import ClientModal from '@/pages/Client/Client/Components/ClientModal';
+import CommunicationHistoryModal from '@/pages/Client/Client/Components/CommunicationHistoryModal';
 import {
+  postAdminClientDeleteAdminClient,
+  postAdminClientGetStatisticalData,
   postAdminClientQueryClientPage,
-  postServiceConstClientGroupFilters,
   postServiceConstClientLevels,
+  postServiceConstClientRequirements,
+  postServiceConstClientSource,
   postServiceConstTradeStatus,
 } from '@/services';
 import { orderExport } from '@/services/order';
 import { enumToSelect } from '@/utils';
 import type { ActionType } from '@ant-design/pro-components';
 import { ProTable } from '@ant-design/pro-components';
-import { Button, Radio, Space, message } from 'antd';
+import { Badge, Button, Radio, Space, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 const columns = [
@@ -25,23 +29,30 @@ const columns = [
   {
     title: '客户名称',
     dataIndex: 'name',
-    width: 100,
+    width: 150,
     ellipsis: true,
     hideInSearch: true,
   },
+  // {
+  //   title: '单位名称',
+  //   width: 150,
+  //   ellipsis: true,
+  //   dataIndex: 'companyName',
+  //   hideInSearch: true,
+  // },
   {
-    title: '单位名称',
-    width: 150,
+    title: '客户地址',
+    width: 250,
     ellipsis: true,
-    dataIndex: 'companyName',
-    hideInSearch: true,
+    dataIndex: 'address',
+    hideInSearch: false,
   },
   {
-    title: '单位地址',
-    width: 250,
+    title: '联系人',
+    width: 150,
     ellipsis: true,
-    dataIndex: 'companyAddressText',
-    hideInSearch: true,
+    dataIndex: 'contacts',
+    hideInSearch: false,
   },
   {
     title: '联系电话',
@@ -54,10 +65,20 @@ const columns = [
     title: '客户来源',
     width: 150,
     ellipsis: true,
-    dataIndex: 'source',
+    dataIndex: 'sourceText',
     hideInSearch: true,
   },
   {
+    title: '客户来源',
+    valueType: 'select',
+    hideInTable: true,
+    dataIndex: 'source',
+    request: async () => {
+      const res = await postServiceConstClientSource();
+      return enumToSelect(res.data);
+    },
+  },
+  {
     title: '推荐人',
     dataIndex: 'referrers',
     width: 150,
@@ -66,12 +87,28 @@ const columns = [
   },
   {
     title: '客户需求',
-    dataIndex: 'requirements',
-    width: 150,
+    width: 240,
     ellipsis: true,
+    dataIndex: 'requirementsText',
     hideInSearch: true,
   },
   {
+    title: '客户需求',
+    dataIndex: 'requirements',
+    valueType: 'select',
+    hideInTable: true,
+    request: async () => {
+      const res = await postServiceConstClientRequirements();
+      // function enumToSelect(data: any) {
+      //   const keys = Object.keys(data);
+      //   return keys.map((value) => {
+      //     return { label: data[value], value: value };
+      //   });
+      // }
+      return enumToSelect(res.data);
+    },
+  },
+  {
     title: '是否已报方案',
     width: 150,
     ellipsis: true,
@@ -84,7 +121,7 @@ const columns = [
     width: 150,
     ellipsis: true,
     dataIndex: 'quoteDatetime',
-    valueType: 'dateTime',
+    valueType: 'date',
     hideInSearch: true,
   },
   {
@@ -111,26 +148,35 @@ const columns = [
     hideInSearch: true,
   },
   {
-    title: '最新跟进时间',
+    title: '最新更进时间',
     key: 'since',
     width: 150,
     ellipsis: true,
-    dataIndex: 'latestCommunicationTime',
+    dataIndex: 'updateTime',
     valueType: 'dateTime',
     hideInSearch: true,
   },
+  // {
+  //   title: '最新跟进时间',
+  //   key: 'since',
+  //   width: 150,
+  //   ellipsis: true,
+  //   dataIndex: 'latestCommunicationTime',
+  //   valueType: 'dateTime',
+  //   hideInSearch: true,
+  // },
   {
     title: '客户名称',
     dataIndex: 'nameLike',
     valueType: 'Text',
     hideInTable: true,
   },
-  {
-    title: '单位名称',
-    dataIndex: 'companyNameLike',
-    valueType: 'Text',
-    hideInTable: true,
-  },
+  // {
+  //   title: '单位名称',
+  //   dataIndex: 'companyNameLike',
+  //   valueType: 'Text',
+  //   hideInTable: true,
+  // },
   {
     title: '联系电话',
     dataIndex: 'phoneNumberLike',
@@ -141,6 +187,7 @@ const columns = [
     title: '是否已报方案',
     dataIndex: 'hasScheme',
     valueType: 'select',
+    width: 1550,
     valueEnum: {
       true: {
         text: '是',
@@ -160,7 +207,14 @@ const columns = [
     hideInTable: true,
     request: async () => {
       const res = await postServiceConstClientLevels();
-      return enumToSelect(res.data);
+      // 明确指定所需的顺序（后端返回顺序正确，直接修改enumToSelect没作用）
+      function enumToSelectLevel(data: any) {
+        const order = ['PRIMARY_CLIENT', 'SECONDARY_CLIENT', 'TERTIARY_CLIENT'];
+        return order.map((key) => {
+          return { label: data[key], value: key };
+        });
+      }
+      return enumToSelectLevel(res.data);
     },
   },
   {
@@ -192,13 +246,25 @@ const columns = [
     title: '操作',
     valueType: 'option',
     key: 'option',
-    width: 150,
+    width: 200,
     render: (text, record, index, action) => {
-      console.log(JSON.stringify(record));
+      const handleDelete = async () => {
+        console.log(JSON.stringify(record), '5656record1');
+        // 调用删除接口
+        const success = await postAdminClientDeleteAdminClient({
+          query: {
+            id: record.id,
+          },
+        });
+        if (success) {
+          action.reload(); // 刷新表格
+        }
+      };
+      console.log(JSON.stringify(record), '5656record2');
       return [
         <CommunicationHistoryModal
           key={'communicationHistory'}
-          clientId={record.id}
+          record={record}
         />,
         <ClientDrawer
           key={'detail'}
@@ -208,6 +274,14 @@ const columns = [
             action.reload();
           }}
         ></ClientDrawer>,
+        <ClientModal
+          key={'add'}
+          data={record}
+          reloadTable={() => {
+            action?.reload();
+          }}
+          type={'add'}
+        />,
         <ClientDrawer
           key={'edit'}
           record={record}
@@ -216,6 +290,18 @@ const columns = [
             action.reload();
           }}
         ></ClientDrawer>,
+        // <a key={'delete'} onClick={handleDelete}>
+        //   删除
+        // </a>,
+        <ButtonConfirm
+          key="delete"
+          className="p-0"
+          title={'删除该客户，客户下的跟进记录会一并删除'}
+          text="删除"
+          onConfirm={async () => {
+            handleDelete();
+          }}
+        />,
       ];
     },
   },
@@ -224,23 +310,74 @@ const columns = [
 export default () => {
   const [messageApi, contextHolder] = message.useMessage();
   const [groupFilter, setGroupFilter] = useState('All');
-  const [groupFilterOptions, setGroupFilterDataOptions] = useState([]);
+  // const [groupFilterOptions, setGroupFilterDataOptions] = useState([]);
   const actionRef = useRef<ActionType>();
+  //获得预警/全部数量
+  const [clientStatistic, setClientStatistic] = useState([]);
+  // const [allClientStatistic, setAllClientStatistic] = useState([]);
+  const [warningClientStatistic, setWarningClientStatistic] = useState([]);
+  // const reloadTable = () => {
+  //   actionRef.current?.reload();
+  // };
   useEffect(() => {
-    const pullGroupFilterDataOptions = async () => {
-      const res = await postServiceConstClientGroupFilters();
-      console.log('setGroupFilterDataOptions' + JSON.stringify(res.data));
-      setGroupFilterDataOptions(enumToSelect(res.data));
+    const pullStatistic = async () => {
+      let statisticalData = await postAdminClientGetStatisticalData();
+      console.log('stati' + JSON.stringify(statisticalData.data));
+      setClientStatistic(statisticalData.data);
+      setWarningClientStatistic(statisticalData.data[1].value);
+      // setAllClientStatistic(statisticalData.data[0].value);
+      setTimeout(() => {
+        console.log(clientStatistic, '5656groupFilterOptions1');
+        // groupFilterOptions[0].label = groupFilterOptions[0].label + '(' + clientStatistic + ')';
+      }, 100);
+      actionRef.current?.reload(); // 可能需要在这里刷新
     };
-    pullGroupFilterDataOptions();
+    pullStatistic();
   }, []);
+  const groupFilterOptions = [
+    {
+      value: 'All',
+      label: <span>全部</span>,
+    },
+    {
+      value: 'WARNING_CLIENT',
+      label: (
+        <span>
+          预警客户
+          <Badge count={warningClientStatistic} style={{ marginLeft: 8 }} />
+        </span>
+      ),
+    },
+  ];
+  // useEffect(() => {
+  //   const pullGroupFilterDataOptions = async () => {
+  //     const res = await postServiceConstClientGroupFilters();
+  //     // console.log('setGroupFilterDataOptions' + JSON.stringify(res.data));
+  //     const select = enumToSelect(res.data);
+  //     console.log(select, '5656selet');
+  //     setGroupFilterDataOptions(select);
+  //   };
+  //   pullGroupFilterDataOptions();
+  // }, []);
   useEffect(() => {
+    // console.log(groupFilterOptions, '5656groupFilterOptions2');
+    console.log(clientStatistic, '5656clientStatistic');
+    console.log(warningClientStatistic, '5656warningClientStatistic');
     actionRef.current?.reload();
   }, [groupFilter]);
   return (
     <>
       <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
-        <ClientStatistic></ClientStatistic>
+        <div key={'groupFilter'}>
+          <Radio.Group
+            options={groupFilterOptions}
+            onChange={(e) => {
+              setGroupFilter(e.target.value);
+            }}
+            value={groupFilter}
+            optionType="button"
+          />
+        </div>
         <ProTable
           columns={columns}
           actionRef={actionRef}
@@ -256,6 +393,7 @@ export default () =&gt; {
             return data;
           }}
           search={{
+            labelWidth: 'auto',
             optionRender: (searchConfig, formProps, dom) => [
               ...dom.reverse(),
               <Button
@@ -273,6 +411,7 @@ export default () =&gt; {
                     'POST',
                     values,
                     () => {
+                      console.log(searchConfig, '5656searchConfig');
                       messageApi.destroy();
                     },
                   );
@@ -323,16 +462,6 @@ export default () =&gt; {
           dateFormatter="string"
           headerTitle="高级表格"
           toolBarRender={() => [
-            <div key={'groupFilter'}>
-              <Radio.Group
-                options={groupFilterOptions}
-                onChange={(e) => {
-                  setGroupFilter(e.target.value);
-                }}
-                value={groupFilter}
-                optionType="button"
-              />
-            </div>,
             <ClientDrawer
               optType={'add'}
               key="button"
@@ -340,7 +469,12 @@ export default () =&gt; {
                 actionRef.current.reload();
               }}
             ></ClientDrawer>,
-            <ClientImportModal key="import" />,
+            <ClientImportModal
+              key="import"
+              reloadTable={() => {
+                actionRef.current.reload();
+              }}
+            />,
           ]}
         />
       </Space>
-import { postAdminClientGetStatisticalData } from '@/services';
-import { StatisticCard } from '@ant-design/pro-components';
-import { useEffect, useState } from 'react';
-
-export default () => {
-  const [clientStatistic, setClientStatistic] = useState([]);
-  useEffect(() => {
-    const pullStatistic = async () => {
-      let statisticalData = await postAdminClientGetStatisticalData();
-      console.log('stati' + JSON.stringify(statisticalData.data));
-      setClientStatistic(statisticalData.data);
-    };
-    pullStatistic();
-  }, []);
-  return (
-    <StatisticCard.Group>
-      {clientStatistic.map((stat, index) => (
-        <StatisticCard
-          key={index}
-          statistic={{
-            title: stat.title,
-            tip: stat.tip || '', // 如果tip不存在，则使用空字符串
-            value: stat.value,
-            status: stat.status || 'default', // 如果status不存在，则使用'default'
-          }}
-        />
-      ))}
-    </StatisticCard.Group>
-  );
-};
-import { RESPONSE_CODE } from '@/constants/enum';
-import {
-  postAdminClientAddOrModifyClientComunicationInfo,
-  postAdminClientQueryClientComunicationInfo,
-  postAdminClientRemoveClientComunicationInfo,
-} from '@/services';
-import {
-  ActionType,
-  EditableProTable,
-  ModalForm,
-  ProFormInstance,
-} from '@ant-design/pro-components';
-import { Popconfirm, message } from 'antd';
-import { useEffect, useRef, useState } from 'react';
-export default ({ clientId }) => {
-  const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
-  const [dataSource, setDataSource] = useState();
-  const ref = useRef<ProFormInstance>();
-  const actionRef = useRef<ActionType>();
-  const columns = [
-    {
-      title: '跟进时间',
-      dataIndex: 'datetime',
-      width: 50,
-      valueType: 'dateTime',
-      rules: [{ required: true, message: '请选择时间' }],
-    },
-    {
-      title: '方式',
-      width: 50,
-      dataIndex: 'way',
-      rules: [{ required: true, message: '请选择方式' }],
-    },
-    {
-      title: '内容',
-      width: 100,
-      valueType: 'textarea',
-      rules: [{ required: true, message: '请输入内容' }],
-      dataIndex: 'content',
-    },
-    {
-      title: '操作',
-      valueType: 'option',
-      width: 50,
-      render: (text, record, _, action) => [
-        <a
-          key="editable"
-          onClick={() => {
-            action?.startEditable?.(record.tid);
-          }}
-        >
-          编辑
-        </a>,
-        <Popconfirm
-          key={'delete'}
-          title="删除记录"
-          description="确认删除记录?"
-          onConfirm={async () => {
-            setDataSource(dataSource.filter((item) => item.tid !== record.tid));
-            const res = await postAdminClientRemoveClientComunicationInfo({
-              query: {
-                id: record.id,
-              },
-            });
-            if (res.result === RESPONSE_CODE.SUCCESS) {
-              message.success(res.message);
-              action?.reload();
-            } else {
-              message.error('删除失败');
-            }
-          }}
-          okText="是"
-          cancelText="否"
-        >
-          <a type={'danger'}>删除</a>
-        </Popconfirm>,
-      ],
-    },
-  ];
-
-  useEffect(() => {
-    console.log('clientId', clientId);
-  }, []);
-  return (
-    <ModalForm
-      title="跟进记录"
-      trigger={<a type="primary">跟进记录</a>}
-      modalProps={{
-        destroyOnClose: true,
-      }}
-    >
-      <EditableProTable
-        rowKey="tid"
-        formRef={ref}
-        actionRef={actionRef}
-        recordCreatorProps={{
-          record: () => ({ tid: (Math.random() * 1000000).toFixed(0) }),
-        }}
-        loading={false}
-        columns={columns}
-        request={async () => {
-          const res = await postAdminClientQueryClientComunicationInfo({
-            data: {
-              clientId: clientId,
-            },
-          });
-          if (res.result === RESPONSE_CODE.SUCCESS) {
-            console.log(JSON.stringify(res.data));
-            return {
-              ...res.data,
-              data: res.data.data.map((item) => {
-                return {
-                  ...item,
-                  tid: (Math.random() * 1000000).toFixed(0),
-                };
-              }),
-            };
-          } else {
-            message.error('获取失败');
-          }
-        }}
-        value={dataSource}
-        onChange={setDataSource}
-        editable={{
-          type: 'multiple',
-          editableKeys,
-          onSave: async (rowKey, data, row) => {
-            console.log(rowKey, data, row);
-            const res = await postAdminClientAddOrModifyClientComunicationInfo({
-              data: {
-                ...data,
-                clientId: clientId,
-              },
-            });
-            if (res.result === RESPONSE_CODE.SUCCESS) {
-              message.success(res.message);
-            } else {
-              message.error('修改失败');
-            }
-            actionRef.current?.reload();
-          },
-          onChange: setEditableRowKeys,
-        }}
-      />
-      {/*<ProCard title="表格数据" headerBordered collapsible defaultCollapsed>
-                <ProFormField
-                    ignoreFormItem
-                    fieldProps={{
-                        style: {
-                            width: '100%',
-                        },
-                    }}
-                    mode="read"
-                    valueType="jsonCode"
-                    text={JSON.stringify(dataSource)}
-                />
-            </ProCard>*/}
-    </ModalForm>
-  );
-};
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postAdminClientAddOrModifyClientComunicationInfo,
+  postAdminClientQueryClientPage,
+  postOrderErpOrderStagesUpload,
+  postServiceConstClientWay,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import {
+  ModalForm,
+  ProFormDateTimePicker,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+  ProFormUploadDragger,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { RcFile } from 'antd/es/upload';
+export default ({ data, type, reloadTable }) => {
+  const [form] = Form.useForm();
+  const onfinish = async (values) => {
+    const resSearchId = await postAdminClientQueryClientPage({
+      data: {
+        groupFilter: 'all',
+      },
+    });
+    const matchingItem = resSearchId.data.data.find(
+      (item) => item.id === values.name,
+    );
+    let matchedId;
+    if (matchingItem) {
+      matchedId = matchingItem.id; // 匹配成功，取出 id
+      values.name = matchingItem.name;
+    } else {
+      matchedId = null; // 如果没有匹配项，可以设置为 null 或其他值
+    }
+    const res = await postAdminClientAddOrModifyClientComunicationInfo({
+      data: {
+        ...values,
+        clientId: matchedId,
+      },
+    });
+    if (res.result === RESPONSE_CODE.SUCCESS) {
+      message.success('新增成功');
+      reloadTable();
+      return true;
+    }
+    // 不返回不会关闭弹框
+  };
+  const editOnfinish = async (values) => {
+    // setEditClientId(data.clientId);
+    values.clientId = data.clientId;
+    console.log(values, '5656editClientId');
+
+    // const resSearchId = await postAdminClientQueryClientPage({
+    //   data: {
+    //     groupFilter: 'all',
+    //   },
+    // });
+    // const matchingItem = resSearchId.data.data.find(
+    //   (item) => item.id === values.name,
+    // );
+
+    const res = await postAdminClientAddOrModifyClientComunicationInfo({
+      data: {
+        ...values,
+      },
+    });
+    if (res.result === RESPONSE_CODE.SUCCESS) {
+      message.success('新增成功');
+      reloadTable();
+      return true;
+    }
+    // 不返回不会关闭弹框
+  };
+  const optType = {
+    add: {
+      readOnly: false,
+      title: '新增跟进记录',
+      button: (
+        <Button size={'middle'} type="primary">
+          新增
+        </Button>
+      ),
+      onFinish: onfinish,
+    },
+    modify: {
+      readOnly: false,
+      title: '修改跟进记录',
+      button: (
+        <Button size={'middle'} type="primary">
+          编辑
+        </Button>
+      ),
+      onFinish: editOnfinish,
+    },
+    detail: {
+      readOnly: true,
+      title: '查看跟进记录',
+      button: (
+        <Button size={'middle'} type="primary" color="red">
+          查看
+        </Button>
+      ),
+      onFinish: () => {},
+    },
+  };
+  return (
+    <ModalForm
+      title={optType[type].title}
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 400,
+      }}
+      form={form}
+      trigger={optType[type].button}
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      onFinish={optType[type].onFinish}
+    >
+      <ProFormSelect
+        name="name"
+        readonly={optType[type].readOnly}
+        fieldProps={{
+          labelInValue: false,
+          disabled: type === 'modify',
+        }}
+        initialValue={data ? data?.clientName + '' : null}
+        label="客户"
+        width="sm"
+        request={async () => {
+          const res = await postAdminClientQueryClientPage({
+            data: {
+              groupFilter: 'all',
+            },
+          });
+          console.log(data, '5656data?.nameedit');
+          // const namesArray = res.data.data.map((item) => item.name);
+          // const formattedObject = res.data.data.reduce((acc, name) => {
+          //   acc[name] = name; // 将名称作为键和值
+          //   return acc;
+          // }, {});
+          // console.log(namesArray, '5656namesArray');
+          // const formattedObject = res.data.data.reduce((acc, item) => {
+          //   acc[item.name] = item.name; // 使用 name 作为键，id 作为值
+          //   return acc;
+          // }, {});
+          // return enumToSelect(formattedObject);
+          const options = res.data.data.reduce((acc, item) => {
+            acc.push({ label: item.name, value: item.id }); // 使用 name 作为 label，id 作为 value
+            return acc;
+          }, []);
+          return options;
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择客户',
+          },
+        ]}
+      ></ProFormSelect>
+      <ProFormDateTimePicker
+        name="datetime"
+        label="日期"
+        initialValue={data ? data?.datetime + '' : null}
+        placeholder="请选择跟进时间"
+        width="sm"
+        rules={[
+          {
+            required: true,
+            message: '请选择日期',
+          },
+        ]}
+      />
+      <ProFormSelect
+        name="way"
+        width="sm"
+        readonly={optType[type].readOnly}
+        fieldProps={{
+          labelInValue: false,
+        }}
+        initialValue={data?.way ? data?.way + '' : null}
+        label="类型"
+        request={async () => {
+          const res = await postServiceConstClientWay();
+          return enumToSelect(res.data);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择跟进类型',
+          },
+        ]}
+      ></ProFormSelect>
+      <ProFormTextArea
+        name="content"
+        label="详情"
+        placeholder="请输入详情"
+        initialValue={data?.content}
+        readonly={optType[type].readOnly}
+        rules={[
+          {
+            required: true,
+            message: '请输入详情',
+          },
+        ]}
+      ></ProFormTextArea>
+      <ProFormUploadDragger
+        label="附件"
+        name="attachment"
+        action="upload.do"
+        hidden={optType[type].readOnly}
+        onChange={(info) => {
+          const uploadFile = async ({ fileList: newFileList }) => {
+            if (newFileList.length > 0) {
+              const formData = new FormData();
+              formData.append('file', newFileList[0].originFileObj as RcFile);
+              const res = await postOrderErpOrderStagesUpload({
+                data: formData,
+                headers: {
+                  'Content-Type':
+                    'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+                },
+              });
+              const url = res.data;
+              console.log('attachments' + JSON.stringify(url));
+              form.setFieldValue('attachments', url);
+            } else {
+              form.setFieldValue('attachments', null);
+            }
+          };
+          uploadFile(info);
+        }}
+        max={1}
+      />
+      <a hidden={!optType[type].readOnly} href={data?.attachments} download>
+        下载附件
+      </a>
+      <ProFormText
+        initialValue={data?.attachments}
+        name="attachments"
+        hidden
+      ></ProFormText>
+      <ProFormText initialValue={data?.id} name="id" hidden></ProFormText>
+    </ModalForm>
+  );
+};
+import ClientModal from '@/pages/Client/FollowRecord/Components/ClientModal';
+import {
+  postAdminClientQueryClientComunicationInfo,
+  postAdminClientRemoveClientComunicationInfo,
+} from '@/services/request';
+import { ModalForm } from '@ant-design/pro-components';
+import { Button, Descriptions, Space } from 'antd';
+import { useEffect, useRef, useState } from 'react';
+
+export default ({ data, reloadTable }) => {
+  console.log(data, '5656datafirstshowgenjin');
+
+  // const [isModalVisible, setIsModalVisible] = useState(false); // 控制 ClientModal 的显示
+  const actionRef = useRef(); // 引用 actionRef，方便调用 reload 方法
+
+  const [datetime, setDatetime] = useState(); // 跟进日期
+  const [createByName, setCreateByName] = useState(''); // 跟进人员
+  const [clientName, setClientName] = useState(''); // 客户名称
+  // const [clientAddress, setClientAddress] = useState(''); // 客户地址
+  const [way, setWay] = useState(); // 类型
+  // const [clientNameLike, setClientNameLike] = useState(''); // 客户名称模糊查询
+  // const [clientAddressLike, setClientAddressLike] = useState(''); // 客户地址模糊查询
+  // const [tradeStatus, setTradeStatus] = useState(''); // 客户状态
+  // const [tradeStatusLike, setTradeStatusLike] = useState(''); // 客户状态模糊查询
+  const [content, setContent] = useState(''); // 跟进详情
+  const [createTime, setCreateTime] = useState(null); // 创建时间
+  const [attachments, setAttachments] = useState(); //附件
+  const [attachmentsName, setAttachmentsName] = useState(''); // 附件名称
+
+  useEffect(() => {
+    const request = async () => {
+      console.log(data, '5656datasearch');
+      const res = await postAdminClientQueryClientComunicationInfo({
+        data: {
+          id: data.id,
+        },
+      });
+      console.log(res, '5656res');
+      const dataSearch = res.data.data[0];
+      if (dataSearch) {
+        if (dataSearch.attachments) {
+          const url = dataSearch.attachments;
+          const match = url.match(/aliyuncs\.com\/(.*?)\?/);
+          let decodedStr = '';
+
+          if (match) {
+            // 获取匹配的字符串并进行解码
+            const encodedStr = match[1];
+            decodedStr = decodeURIComponent(encodedStr);
+            setAttachmentsName(decodedStr); // 设置跟进日期
+          }
+        }
+        setDatetime(dataSearch.datetime); // 设置跟进日期
+        // setDateRange(data.dateRange || []); // 设置跟进时间范围
+        setCreateByName(dataSearch.createByName); // 设置跟进人员
+        setClientName(dataSearch.clientName); // 设置客户名称
+        // setClientAddress(data.clientAddress || ''); // 设置客户地址
+        // setClientNameLike(data.clientNameLike || ''); // 设置客户名称模糊查询
+        // setClientAddressLike(data.clientAddressLike || ''); // 设置客户地址模糊查询
+        // setTradeStatus(data.tradeStatus || ''); // 设置客户状态
+        // setTradeStatusLike(data.tradeStatusLike || ''); // 设置客户状态模糊查询
+        setContent(dataSearch.content); // 设置跟进详情
+        setCreateTime(dataSearch.createTime); // 设置创建时间
+        setWay(dataSearch.wayText);
+        setAttachments(dataSearch.attachments);
+      }
+      console.log(attachments, '5656attachments');
+    };
+    request();
+  }, []);
+  const items = [
+    {
+      key: '1',
+      label: '跟进日期',
+      children: datetime, // 跟进日期
+    },
+    {
+      key: '2',
+      label: '跟进人员',
+      children: createByName, // 跟进人员
+    },
+    {
+      key: '3',
+      label: '客户名称',
+      children: clientName, // 客户名称
+    },
+    {
+      key: '4',
+      label: '跟进详情',
+      children: content, // 跟进详情
+    },
+    {
+      key: '5',
+      label: '创建时间',
+      children: createTime, // 创建时间
+    },
+    {
+      key: '6',
+      label: '跟进类型',
+      children: way, // 跟进类型
+    },
+  ];
+  const handleDelete = async () => {
+    console.log(JSON.stringify(data), '5656record');
+    // 调用删除接口
+    const success = await postAdminClientRemoveClientComunicationInfo({
+      query: {
+        id: data.id,
+      },
+    });
+    // setIsModalVisible(false);
+    if (success) {
+      actionRef?.current?.reload(); // 重新加载表格数据
+    }
+  };
+  return (
+    <Space>
+      <ModalForm
+        title="跟进记录"
+        trigger={<Button type="link">查看</Button>}
+        submitter={{
+          resetButtonProps: {
+            style: {
+              display: 'none',
+            },
+          },
+          submitButtonProps: {
+            style: {
+              display: 'none',
+            },
+          },
+          render: (props, defaultDoms) => {
+            return [
+              ...defaultDoms,
+              <>
+                <ClientModal
+                  key={'modify'}
+                  data={data} // 将表单数据传递给 ClientModal
+                  reloadTable={() => {
+                    actionRef?.current?.reload(); // 重新加载表格数据
+                    props.submit();
+                    reloadTable();
+                    console.log('5656close');
+                  }}
+                  type={'modify'}
+                  onFinish={() => {
+                    // setIsModalVisible(false);
+                  }} // 关闭 Modal
+                  style={{ marginRight: '10px' }}
+                />
+                <Button
+                  key={'delete'}
+                  onClick={() => {
+                    handleDelete();
+                    props.submit();
+                    reloadTable();
+                  }}
+                  type="primary"
+                  size="middle"
+                  danger // 使用 danger 属性来将按钮颜色设置为红色
+                  style={{ marginLeft: '10px' }}
+                  onFinish={() => {
+                    actionRef.current.reload();
+                  }}
+                >
+                  删除
+                </Button>
+              </>,
+            ];
+          },
+        }}
+        onFinish={async () => {
+          // 提交成功后，显示 ClientDrawer
+          // setIsModalVisible(true);
+          return true;
+        }}
+      >
+        <Descriptions items={items} column={1} />
+        {attachmentsName && (
+          <a href={attachments} download>
+            附件：{attachmentsName}
+          </a>
+        )}
+      </ModalForm>
+    </Space>
+  );
+};
+import { RESPONSE_CODE } from '@/constants/enum';
+import ClientModal from '@/pages/Client/FollowRecord/Components/ClientModal';
+import CommunicationHistoryModal from '@/pages/Client/FollowRecord/Components/CommunicationHistoryModal';
+import {
+  postAdminClientQueryClientComunicationInfo,
+  postAdminClientRemoveClientComunicationInfo,
+  postServiceConstClientWay,
+  postServiceConstTradeStatus,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import type { ActionType } from '@ant-design/pro-components';
+import { ProTable } from '@ant-design/pro-components';
+import { Button, Space, message } from 'antd';
+import { useRef, useState } from 'react';
+
+export default () => {
+  const actionRef = useRef<ActionType>();
+  const [refreshKey, setRefreshKey] = useState(0); // 用于强制刷新的键
+
+  const reload = () => {
+    actionRef.current.reload(); // 重新加载数据
+    console.log('5656flush');
+
+    // 更新 refreshKey，强制刷新 CommunicationHistoryModal
+    setRefreshKey((prevKey) => prevKey + 1);
+  };
+  //biaoji
+  const columns = [
+    {
+      title: '跟进日期',
+      key: 'datetime',
+      width: 150,
+      ellipsis: true,
+      dataIndex: 'datetime',
+      valueType: 'dateTime',
+      hideInSearch: true,
+      // search: {
+      //   transform: (value) => {
+      //     if (value) {
+      //       return {
+      //         createTimeGe: value[0],
+      //         createTimeLe: value[1],
+      //       };
+      //     }
+      //   },
+      // },
+    },
+    {
+      title: '跟进时间',
+      dataIndex: 'dateRange',
+      valueType: 'dateRange',
+      hideInTable: true,
+      search: {
+        transform: (value) => {
+          if (value) {
+            return {
+              dateTimeGe: value[0],
+              dateTimeLe: value[1],
+            };
+          }
+        },
+      },
+    },
+    {
+      title: '跟进人员',
+      dataIndex: 'updateByName',
+      width: 100,
+      ellipsis: true,
+      hideInSearch: false,
+    },
+    {
+      title: '客户名称',
+      dataIndex: 'clientName',
+      width: 150,
+      ellipsis: true,
+      hideInSearch: true,
+    },
+    {
+      title: '客户地址',
+      dataIndex: 'clientAddress',
+      width: 250,
+      ellipsis: true,
+      hideInSearch: true,
+    },
+    {
+      title: '跟进类型',
+      dataIndex: 'wayText',
+      width: 100,
+      ellipsis: true,
+      hideInSearch: true,
+    },
+    {
+      title: '跟进类型',
+      dataIndex: 'way',
+      width: 100,
+      ellipsis: true,
+      hideInSearch: false,
+      hideInTable: true,
+      request: async () => {
+        const res = await postServiceConstClientWay();
+        return enumToSelect(res.data);
+      },
+    },
+    {
+      title: '客户名称',
+      dataIndex: 'clientNameLike',
+      width: 150,
+      ellipsis: true,
+      hideInSearch: false,
+      hideInTable: true,
+    },
+    {
+      title: '客户地址',
+      dataIndex: 'clientAddressLike',
+      width: 250,
+      ellipsis: true,
+      hideInSearch: false,
+      hideInTable: true,
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'tradeStatus',
+      width: 100,
+      ellipsis: true,
+      hideInSearch: true,
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'tradeStatusLike',
+      width: 100,
+      ellipsis: true,
+      hideInSearch: false,
+      hideInTable: true,
+      request: async () => {
+        const res = await postServiceConstTradeStatus();
+        return enumToSelect(res.data);
+      },
+    },
+    {
+      title: '跟进详情',
+      dataIndex: 'content',
+      width: 250,
+      ellipsis: true,
+      hideInSearch: false,
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      width: 150,
+      ellipsis: true,
+      hideInSearch: true,
+    },
+    {
+      title: '附件',
+      dataIndex: 'attachments',
+      width: 150,
+      ellipsis: true,
+      hideInSearch: true,
+      hideInTable: true,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      width: 150,
+      render: (text, record, index, action) => {
+        const handleDelete = async () => {
+          // console.log(JSON.stringify(record), '5656record');
+          // 调用删除接口
+          const success = await postAdminClientRemoveClientComunicationInfo({
+            query: {
+              id: record.id,
+            },
+          });
+          if (success) {
+            action.reload(); // 刷新表格
+          }
+        };
+        return [
+          <CommunicationHistoryModal
+            // key={'communicationHistory'}
+            key={`communicationHistory-${refreshKey}`} // 使用 refreshKey 来强制更新组件
+            data={record}
+            // reloadTable={() => {
+            //   actionRef.current.reload();
+            //   console.log('5656flush');
+            // }}
+            reloadTable={reload}
+          />,
+          <>
+            <Button
+              key={'delete'}
+              onClick={() => {
+                handleDelete();
+                actionRef.current.reload();
+              }}
+              // reloadTable={() => {
+              //   actionRef.current.reload();
+              // }}
+              type="link"
+              size="middle"
+              // 使用 danger 属性来将按钮颜色设置为红色
+              // onFinish={() => {
+              //   actionRef.current.reload();
+              // }}
+            >
+              删除
+            </Button>
+          </>,
+        ];
+      },
+    },
+  ];
+
+  // useEffect(() => {
+  //   const pullGroupFilterDataOptions = async () => {
+  //     const res = await postServiceConstClientGroupFilters();
+  //     console.log('setGroupFilterDataOptions' + JSON.stringify(res.data));
+  //     setGroupFilterDataOptions(enumToSelect(res.data));
+  //   };
+  //   pullGroupFilterDataOptions();
+  // }, []);
+  // useEffect(() => {
+  //   actionRef.current?.reload();
+  // }, [groupFilter]);
+  return (
+    <>
+      <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
+        <ProTable
+          columns={columns}
+          actionRef={actionRef}
+          cardBordered
+          request={async (params) => {
+            const res = await postAdminClientQueryClientComunicationInfo({
+              data: {
+                ...params,
+              },
+            });
+            console.log(params, '5656566params');
+            if (res.result === RESPONSE_CODE.SUCCESS) {
+              console.log(JSON.stringify(res.data));
+              return {
+                ...res.data,
+                data: res.data.data.map((item) => {
+                  return {
+                    ...item,
+                    tid: (Math.random() * 1000000).toFixed(0),
+                  };
+                }),
+              };
+            } else {
+              message.error('获取失败');
+            }
+          }}
+          search={{
+            optionRender: (searchConfig, formProps, dom) => [...dom.reverse()],
+          }}
+          scroll={{
+            x: 1400,
+          }}
+          editable={{
+            type: 'multiple',
+          }}
+          columnsState={{
+            persistenceKey: 'pro-table-singe-demos',
+            persistenceType: 'localStorage',
+            defaultValue: {
+              option: { fixed: 'right', disable: true },
+            },
+            onChange(value) {
+              console.log('value: ', value);
+            },
+          }}
+          rowKey="id"
+          options={{
+            setting: {
+              listsHeight: 400,
+            },
+          }}
+          form={{
+            // 由于配置了 transform，提交的参与与定义的不同这里需要转化一下
+            syncToUrl: (values, type) => {
+              if (type === 'get') {
+                return {
+                  ...values,
+                  created_at: [values.startTime, values.endTime],
+                };
+              }
+              return values;
+            },
+          }}
+          pagination={{
+            pageSize: 5,
+            onChange: (page) => console.log(page),
+          }}
+          dateFormatter="string"
+          headerTitle="高级表格"
+          toolBarRender={() => [
+            <ClientModal
+              key={'add'}
+              reloadTable={() => {
+                actionRef.current.reload();
+              }}
+              type={'add'}
+            />,
+          ]}
+        />
+      </Space>
+      {/* {contextHolder} */}
+    </>
+  );
+};
@@ -107,8 +107,8 @@ export default ({ data, onClose }) =&gt; {
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
@@ -260,7 +260,7 @@ const DeliverModal = ({
                 serialNumber: item.serialNumber,
                 packageNumber:
                   item.packageNumber === null ||
-                    item.packageNumber === undefined
+                  item.packageNumber === undefined
                     ? 1
                     : item.packageNumber,
                 logisticsNotes: item.logisticsNotes,
+import { postServiceOrderFeedbackRegistration } from '@/services/request';
+import { Input, Modal } from 'antd';
+import { useState } from 'react';
+
+// import { cloneDeep } from 'lodash';
+export default ({ subOrders, onClose }) => {
+  const [isModalOpen] = useState(true);
+  const { TextArea } = Input;
+  const [textValue, setTextValue] = useState('');
+
+  const handleOk = async () => {
+    console.log(textValue); // 处理输入的文本
+    console.log(subOrders, '5656subOrders');
+    let res = await postServiceOrderFeedbackRegistration({
+      data: {
+        id: subOrders[0].id,
+        feedbackRegistrationContent: textValue,
+      },
+    });
+    console.log(res, '5656res');
+    onClose();
+    // setIsModalOpen(false);
+    // onClose();
+  };
+  const handleCancel = () => {
+    onClose();
+    // setIsModalOpen(false);
+    // onClose();
+  };
+  const handleChange = (e) => {
+    setTextValue(e.target.value);
+  };
+  return (
+    <>
+      {/* <ModalForm<{
+        filePaths: any;
+      }>
+        width={500}
+        open
+        title="回访登记"
+        form={form}
+        autoFocusFirstInput
+        modalProps={{
+          okText: '提交',
+          cancelText: '取消',
+          destroyOnClose: true,
+          onCancel: () => {
+            setVisible(false);
+          },
+        }}
+        onFinish={async () => {
+          onClose();
+        }}
+        onOpenChange={setVisible}
+      >
+        <TextArea rows={6} placeholder="请输入" />
+      </ModalForm> */}
+      <Modal
+        title="回访登记"
+        open={isModalOpen}
+        onOk={handleOk}
+        onCancel={handleCancel}
+      >
+        <TextArea
+          rows={6}
+          placeholder="请输入"
+          onChange={handleChange}
+          value={textValue}
+        />
+      </Modal>
+    </>
+  );
+};
@@ -144,107 +144,107 @@ export default ({
       {invoicingStatus !== 'UN_INVOICE'
         ? [
-          <ProFormDatePicker
-            key="invoicingTime"
-            width="lg"
-            name="invoicingTime"
-            label="开票时间"
-            disabled={isEdit}
-            rules={[
-              { required: !isEdit ? true : false, message: '这是必填项' },
-            ]}
-            initialValue={subOrders[0]?.invoicingTime}
-          />,
-          <ProFormText
-            key="purchaser"
-            width="lg"
-            name="purchaser"
-            label="抬头名称"
-            disabled={isEdit}
-            rules={[
-              { required: !isEdit ? true : false, message: '这是必填项' },
-            ]}
-            initialValue={subOrders[0]?.purchaser}
-          />,
-          <ProFormDatePicker
-            key="financialReceiptIssuanceTime"
-            width="lg"
-            name="financialReceiptIssuanceTime"
-            label="开收据时间"
-            initialValue={subOrders[0]?.financialReceiptIssuanceTime}
-          />,
-          <ProFormDatePicker
-            key="collectMoneyTime"
-            width="lg"
-            name="collectMoneyTime"
-            label="收款时间"
-            initialValue={subOrders[0]?.collectMoneyTime}
-          />,
-          <ProFormText
-            width="lg"
-            key="invoiceNumber"
-            name="invoiceNumber"
-            label="发票号码"
-            initialValue={subOrders[0]?.invoiceNumber}
-            rules={[{ required: true, message: '发票号码必填' }]}
-          />,
-          <div
-            key="salesChooseReceivingCompany"
-            hidden={subOrders[0].receivingCompany === null}
-          >
-            <span className={'pl-2 text-xs text-gray-400'}>
-              销售申请开票时选择了：
-              {enumValueToLabel(
-                subOrders[0].receivingCompany,
-                getReceivingCompanyOptions(PAYEE_OPTIONS),
-              )}
-            </span>
-            <span
-              hidden={subOrders[0].receivingCompany === 'ANY'}
-              className={
-                'pl-2 text-xs text-[#1677ff] cursor-pointer hover:text-[#64abf7]'
-              }
-              onClick={() => {
-                chooseReceivingCompany(subOrders[0].receivingCompany);
-              }}
+            <ProFormDatePicker
+              key="invoicingTime"
+              width="lg"
+              name="invoicingTime"
+              label="开票时间"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0]?.invoicingTime}
+            />,
+            <ProFormText
+              key="purchaser"
+              width="lg"
+              name="purchaser"
+              label="抬头名称"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0]?.purchaser}
+            />,
+            <ProFormDatePicker
+              key="financialReceiptIssuanceTime"
+              width="lg"
+              name="financialReceiptIssuanceTime"
+              label="开收据时间"
+              initialValue={subOrders[0]?.financialReceiptIssuanceTime}
+            />,
+            <ProFormDatePicker
+              key="collectMoneyTime"
+              width="lg"
+              name="collectMoneyTime"
+              label="收款时间"
+              initialValue={subOrders[0]?.collectMoneyTime}
+            />,
+            <ProFormText
+              width="lg"
+              key="invoiceNumber"
+              name="invoiceNumber"
+              label="发票号码"
+              initialValue={subOrders[0]?.invoiceNumber}
+              rules={[{ required: true, message: '发票号码必填' }]}
+            />,
+            <div
+              key="salesChooseReceivingCompany"
+              hidden={subOrders[0].receivingCompany === null}
             >
-              选择
-            </span>
-          </div>,
-          <ProFormSelect
-            key="payee"
-            placeholder="选择收款单位"
-            name="payee"
-            width="lg"
-            showSearch
-            label="收款单位"
-            options={enumToSelect(PAYEE_OPTIONS)}
-            initialValue={subOrders[0]?.payee}
-            rules={[{ required: true, message: '收款单位必填' }]}
-          />,
-
-          <div id="total-payment" key="money">
-            <ProFormDigit
-              key="money"
-              name="money"
+              <span className={'pl-2 text-xs text-gray-400'}>
+                销售申请开票时选择了：
+                {enumValueToLabel(
+                  subOrders[0].receivingCompany,
+                  getReceivingCompanyOptions(PAYEE_OPTIONS),
+                )}
+              </span>
+              <span
+                hidden={subOrders[0].receivingCompany === 'ANY'}
+                className={
+                  'pl-2 text-xs text-[#1677ff] cursor-pointer hover:text-[#64abf7]'
+                }
+                onClick={() => {
+                  chooseReceivingCompany(subOrders[0].receivingCompany);
+                }}
+              >
+                选择
+              </span>
+            </div>,
+            <ProFormSelect
+              key="payee"
+              placeholder="选择收款单位"
+              name="payee"
               width="lg"
-              label="金额"
-              rules={[{ required: true, message: '金额必填' }]}
-              tooltip="点击计算，合计所有子订单对应主订单总额"
-              fieldProps={{
-                addonAfter: (
-                  <Button
-                    className="rounded-l-none"
-                    type="primary"
-                    onClick={computeTotalPayment}
-                  >
-                    计算
-                  </Button>
-                ),
-              }}
-            />
-          </div>,
-        ]
+              showSearch
+              label="收款单位"
+              options={enumToSelect(PAYEE_OPTIONS)}
+              initialValue={subOrders[0]?.payee}
+              rules={[{ required: true, message: '收款单位必填' }]}
+            />,
+
+            <div id="total-payment" key="money">
+              <ProFormDigit
+                key="money"
+                name="money"
+                width="lg"
+                label="金额"
+                rules={[{ required: true, message: '金额必填' }]}
+                tooltip="点击计算，合计所有子订单对应主订单总额"
+                fieldProps={{
+                  addonAfter: (
+                    <Button
+                      className="rounded-l-none"
+                      type="primary"
+                      onClick={computeTotalPayment}
+                    >
+                      计算
+                    </Button>
+                  ),
+                }}
+              />
+            </div>,
+          ]
         : ''}
       <ProFormSelect
@@ -130,24 +130,24 @@ export default ({ mainOrder, subOrders, setVisible, isMainOrder, onClose }) =&gt; {
         width="lg"
         name="financialReceiptIssuanceTime"
         label="开收据时间"
-      // rules={[
-      //   {
-      //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
-      //     message: '开收据时间必填',
-      //   },
-      // ]}
+        // rules={[
+        //   {
+        //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
+        //     message: '开收据时间必填',
+        //   },
+        // ]}
       />
       <ProFormDatePicker
         key="collectMoneyTime"
         width="lg"
         name="collectMoneyTime"
         label="收款时间"
-      // rules={[
-      //   {
-      //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
-      //     message: '收款时间必填',
-      //   },
-      // ]}
+        // rules={[
+        //   {
+        //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
+        //     message: '收款时间必填',
+        //   },
+        // ]}
       />
     </DrawerForm>
   );
@@ -3,7 +3,7 @@ import { Button, Divider, Image, Modal } from &#39;antd&#39;;
 import { useEffect, useState } from 'react';
 export default ({ setVisible, optType, onClose, orderRow }) => {
   const [images, setImages] = useState<any[]>([]);
-  const [title, setTitle] = useState("收货凭证");
+  const [title, setTitle] = useState('收货凭证');
   const handleOk = () => {
     onClose();
     setVisible(false);
@@ -23,7 +23,7 @@ export default ({ setVisible, optType, onClose, orderRow }) =&gt; {
   }
   useEffect(() => {
     if (optType === 'shippingReceipt') {
-      setTitle("收货凭证");
+      setTitle('收货凭证');
       getImages();
     } else if (optType === 'paymentReceipt') {
       let paymentReceiptsImagesList: any[] = [];
@@ -34,7 +34,6 @@ export default ({ setVisible, optType, onClose, orderRow }) =&gt; {
       paymentReceiptsImagesList = [...new Set(paymentReceiptsImagesList)];
       setImages(paymentReceiptsImagesList);
     }
-
   }, []);
   return (
@@ -106,7 +106,7 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
                 onClick={() => {
                   window.open(
                     '/previewApi/onlinePreview?url=' +
-                    encodeURIComponent(Base64.encode(item)),
+                      encodeURIComponent(Base64.encode(item)),
                   );
                 }}
               >
@@ -554,7 +554,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(_, option) => {
             autoFillSalesInfo(option);
           }}
-        // disabled={mainInfoDisbled}
+          // disabled={mainInfoDisbled}
         />
         <ProFormText
@@ -642,7 +642,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
           }}
           debounceTime={1000}
-          request={async (value, { }) => {
+          request={async (value, {}) => {
             const keywords = value.keyWords;
             const res = await postKingdeeRepCustomer({
               data: { search: keywords },
@@ -740,7 +740,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 </Button>
               ),
             }}
-          // disabled={mainInfoDisbled}
+            // disabled={mainInfoDisbled}
           />
         </div>
@@ -752,7 +752,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           label="支付渠道"
           options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
           rules={[{ required: true, message: '支付渠道必填' }]}
-        // disabled={mainInfoDisbled}
+          // disabled={mainInfoDisbled}
         />
         <ProFormSelect
           placeholder="请输入支付方式"
@@ -762,7 +762,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           label="支付方式"
           options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
           rules={[{ required: true, message: '支付方式必填' }]}
-        // disabled={mainInfoDisbled}
+          // disabled={mainInfoDisbled}
         />
         <ProFormSelect
           placeholder="选择是否需要开票"
@@ -1094,7 +1094,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
                     initialValue={'EXPERIMENTAL_CONSUMABLES'}
                     rules={[{ required: true, message: '所属事业部必填' }]}
-                  // disabled={mainInfoDisbled}
+                    // disabled={mainInfoDisbled}
                   />,
                   <ProFormTextArea
                     key={'notes' + listMeta.index}
@@ -557,9 +557,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       form.setFieldValue(
         'customerShippingAddress',
         getDefaultString(option.province) +
-        getDefaultString(option.city) +
-        getDefaultString(option.district) +
-        getDefaultString(option.detail),
+          getDefaultString(option.city) +
+          getDefaultString(option.district) +
+          getDefaultString(option.detail),
       );
       form.setFieldValue('customerNameString', option.realName);
@@ -642,11 +642,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       message.error(
         '用户余额不足，当前预减的金额为：' +
-        data.subPrice +
-        '，当前账号余额为：' +
-        data.nowMoney +
-        '，当前账号可赊账额度为：' +
-        data.creditLimit,
+          data.subPrice +
+          '，当前账号余额为：' +
+          data.nowMoney +
+          '，当前账号可赊账额度为：' +
+          data.creditLimit,
       );
       return false;
     }
@@ -1111,7 +1111,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
           }}
           debounceTime={1000}
-          request={async (value, { }) => {
+          request={async (value, {}) => {
             const keywords = value.keyWords;
             if (keywords === '') {
               return [];
@@ -1867,7 +1867,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品参数"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                   />,
                   <ProFormDigit
@@ -1920,7 +1920,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品单位"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                     rules={[{ required: true, message: '商品单位必填' }]}
                   />,
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postServiceOrderFileProcess,
+  postServiceOrderUploadPaymentReceipt,
+} from '@/services';
+import { transImageFile } from '@/utils';
+import { PlusOutlined } from '@ant-design/icons';
 import { ModalForm } from '@ant-design/pro-components';
 import { Form, Modal, Upload, UploadFile, UploadProps, message } from 'antd';
 import { RcFile } from 'antd/lib/upload';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 import { COMFIR_RECEIPT_IMAGES_NUMBER } from '../../constant';
-import { PlusOutlined } from '@ant-design/icons';
-import { transImageFile } from '@/utils';
-import { postServiceOrderFileProcess, postServiceOrderUploadPaymentReceipt } from '@/services';
-import { RESPONSE_CODE } from '@/constants/enum';
 // import { cloneDeep } from 'lodash';
 export default ({ setVisible, subOrders, mainOrder, onClose }) => {
@@ -25,7 +28,9 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
       reader.onerror = (error) => reject(error);
     });
-  const subOrderIds = subOrders?.map((item: any) => { return item.id });
+  const subOrderIds = subOrders?.map((item: any) => {
+    return item.id;
+  });
   const fileListObj = useRef<UploadFile[]>([]); //使用引用类型，使得在useEffect里面设置监听事件后，不用更新监听事件也能保持obj与外界一致
   const handleBeforeUpload = (file: any) => {
     setFileList([...fileList, file]);
@@ -80,6 +85,7 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
         if (filteredArray.length >= COMFIR_RECEIPT_IMAGES_NUMBER) {
           message.info('发货照片数量不能超过3');
+          console.log(mainOrder);
           return;
         }
         fileListObj.current = filteredArray;
@@ -105,8 +111,8 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
   const props: UploadProps = {
@@ -128,7 +134,6 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
   };
   useEffect(() => {
-
     document.addEventListener('paste', onPaste);
     return () => {
       document.removeEventListener('paste', onPaste);
@@ -211,14 +216,9 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
         }}
         onOpenChange={setVisible}
       >
-
-        <div className="pb-4 text-xs decoration-gray-50">
-          可复制照片粘贴
-        </div>
+        <div className="pb-4 text-xs decoration-gray-50">可复制照片粘贴</div>
         <Upload {...props}>
-          {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER
-            ? uploadButton
-            : ''}
+          {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER ? uploadButton : ''}
         </Upload>
       </ModalForm>
 .order-page-container .ant-table .ant-table-middle {
   margin-inline: 0 !important;
 }
+
 .order-page-container td {
-  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC', 'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
   font-size: 13px;
 }
+
 #total-payment .ant-input-number-group-addon {
   padding: 0 !important;
 }
+
 .order-page-container table:hover,
 .order-page-container tr:hover,
 .order-page-container thead:hover {
   background: none !important;
 }
+
 #main-table .ant-table-tbody > tr.ant-table-row:hover > td {
   background: none !important;
 }
+
 .order-page-container .ant-pro-card {
   background-color: transparent;
 }
+
 #main-table .ant-table-tbody .ant-table-cell {
   padding: 10px 0 0;
 }
+
 .order-page-container .ant-pagination {
   background-color: #fff !important;
   padding: 10px;
   border-radius: 8px;
 }
+
 .order-page-container .ant-pro-table .ant-form {
   background-color: #fff;
   border-radius: 8px;
 }
+
 #main-table .ant-table-tbody {
   background-color: #f5f5f5;
 }
+
 .order-page-container .ant-pro-card-body {
   padding: 0 !important;
 }
+
 .order-page-container .ant-table-thead .ant-table-cell {
   background-color: #fff !important;
   border-radius: 8px !important;
 }
+
 #sub-table tbody td {
   padding: 10px 0 !important;
 }
+
 #sub-table tbody tr:first-child td:first-child {
   border-top-left-radius: 8px;
 }
+
 #sub-table tbody tr:first-child td:nth-child(2) {
   border-top-right-radius: 8px;
 }
+
 #sub-table tbody tr:last-child td:first-child {
   border-bottom-left-radius: 8px;
 }
+
 #sub-table tbody tr:last-child td:nth-child(2) {
   border-bottom-right-radius: 8px;
 }
+
 #sub-table tbody tr td:first-child {
   border-top: 1px solid #d7d6d6;
+
   /* 设置行与行之间分割线的颜色 */
   border-bottom: 1px solid #d7d6d6;
+
   /* 设置行与行之间分割线的颜色 */
   border-left: 1px solid #d7d6d6;
+
   /* 设置行与行之间分割线的颜色 */
 }
+
 #sub-table tbody tr td:nth-child(2) {
   border-top: 1px solid #d7d6d6;
+
   /* 设置行与行之间分割线的颜色 */
   border-bottom: 1px solid #d7d6d6;
+
   /* 设置行与行之间分割线的颜色 */
   border-right: 1px solid #d7d6d6;
+
   /* 设置行与行之间分割线的颜色 */
 }
@@ -111,6 +111,7 @@ import CheckModal from &#39;./components/CheckModal&#39;;
 import ConfirmReceiptModal from './components/ConfirmReceiptModal';
 import DeliverInfoDrawer from './components/DeliverInfoDrawer';
 import DeliverModal from './components/DeliverModal';
+import FeedbackRegistrationModal from './components/FeedbackRegistrationModal';
 import FinancialDrawer from './components/FinancialDrawer';
 import FinancialEditDrawer from './components/FinancialEditDrawer';
 import FinancialMergeDrawer from './components/FinancialMergeDrawer';
@@ -146,6 +147,10 @@ const OrderPage = () =&gt; {
     useState<boolean>(false);
   const [uploadPayBillModalVisible, setUploadPayBillModalVisible] =
     useState<boolean>(false);
+  const [
+    feedbackRegistrationModalVisible,
+    setFeedbackRegistrationModalVisible,
+  ] = useState<boolean>(false);
   const [modifiedDiffModalVisible, setModifiedDiffModalVisible] =
     useState<boolean>(false);
   const [financialReceiptsModalVisible, setFinancialReceiptsModalVisible] =
@@ -690,7 +695,7 @@ const OrderPage = () =&gt; {
      * @param optRecord
      */
     function getOrderStatusTag(optRecord: any): import('react').ReactNode {
-      console.log(optRecord);
+      console.log(optRecord, '5656optRecord');
       const orderStatus = optRecord.orderStatus;
       const paymentMethod = optRecord.paymentMethod;
@@ -2095,6 +2100,20 @@ const OrderPage = () =&gt; {
             ) : (
               ''
             )}
+            {optRecord.paths?.includes('feedbackRegistration') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  createOptObject(optRecord.id, record.id);
+                  setFeedbackRegistrationModalVisible(true);
+                }}
+              >
+                回访登记
+              </Button>
+            ) : (
+              ''
+            )}
             {optRecord.paths?.includes('confirmInvoice') ? (
               <ButtonConfirm
@@ -2316,6 +2335,31 @@ const OrderPage = () =&gt; {
         ) : (
           ''
         )}
+
+        {isAdmin() || isSales() ? (
+          <Flex title={optRecord.notes} className="pt-2">
+            <div className="flex items-center">
+              <div className="flex items-center max-w-[500px]">
+                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <Tooltip
+                    title={optRecord.feedbackRegistrationContent}
+                    placement="topLeft"
+                  >
+                    <span className="text-[#8C8C8C] mr-3">
+                      产品回访登记：
+                      {optRecord.feedbackRegistrationContent === undefined ||
+                      optRecord.feedbackRegistrationContent === null
+                        ? '暂无'
+                        : optRecord.feedbackRegistrationContent}
+                    </span>
+                  </Tooltip>
+                </div>
+              </div>
+            </div>
+          </Flex>
+        ) : (
+          ''
+        )}
       </>
     );
   };
@@ -5285,6 +5329,24 @@ const OrderPage = () =&gt; {
           }}
         />
       )}
+      {feedbackRegistrationModalVisible && (
+        <FeedbackRegistrationModal
+          setVisible={(val: boolean) => {
+            setFeedbackRegistrationModalVisible(val);
+            if (!val) {
+              clearOptObject();
+            }
+          }}
+          subOrders={buildSubOrders()}
+          mainOrder={buildMainOrder()}
+          onClose={() => {
+            setFeedbackRegistrationModalVisible(false);
+            clearOptObject();
+            refreshTable();
+          }}
+        />
+      )}
+
       {invoicingDrawerFormVisible && (
         <InvoicingDrawerForm
           dataList={
@@ -235,8 +235,8 @@ export default ({
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
@@ -107,8 +107,8 @@ export default ({ data, onClose }) =&gt; {
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
@@ -260,7 +260,7 @@ const DeliverModal = ({
                 serialNumber: item.serialNumber,
                 packageNumber:
                   item.packageNumber === null ||
-                    item.packageNumber === undefined
+                  item.packageNumber === undefined
                     ? 1
                     : item.packageNumber,
                 logisticsNotes: item.logisticsNotes,
+import { postServiceOrderFeedbackRegistration } from '@/services/request';
+import { Input, Modal } from 'antd';
+import { useState } from 'react';
+
+// import { cloneDeep } from 'lodash';
+export default ({ subOrders, onClose }) => {
+  const [isModalOpen] = useState(true);
+  const { TextArea } = Input;
+  const [textValue, setTextValue] = useState('');
+
+  const handleOk = async () => {
+    console.log(textValue); // 处理输入的文本
+    console.log(subOrders, '5656subOrders');
+    let res = await postServiceOrderFeedbackRegistration({
+      data: {
+        id: subOrders[0].id,
+        feedbackRegistrationContent: textValue,
+      },
+    });
+    console.log(res, '5656res');
+    onClose();
+    // setIsModalOpen(false);
+    // onClose();
+  };
+  const handleCancel = () => {
+    onClose();
+    // setIsModalOpen(false);
+    // onClose();
+  };
+  const handleChange = (e) => {
+    setTextValue(e.target.value);
+  };
+  return (
+    <>
+      {/* <ModalForm<{
+        filePaths: any;
+      }>
+        width={500}
+        open
+        title="回访登记"
+        form={form}
+        autoFocusFirstInput
+        modalProps={{
+          okText: '提交',
+          cancelText: '取消',
+          destroyOnClose: true,
+          onCancel: () => {
+            setVisible(false);
+          },
+        }}
+        onFinish={async () => {
+          onClose();
+        }}
+        onOpenChange={setVisible}
+      >
+        <TextArea rows={6} placeholder="请输入" />
+      </ModalForm> */}
+      <Modal
+        title="回访登记"
+        open={isModalOpen}
+        onOk={handleOk}
+        onCancel={handleCancel}
+      >
+        <TextArea
+          rows={6}
+          placeholder="请输入"
+          onChange={handleChange}
+          value={textValue}
+        />
+      </Modal>
+    </>
+  );
+};
@@ -144,107 +144,107 @@ export default ({
       {invoicingStatus !== 'UN_INVOICE'
         ? [
-          <ProFormDatePicker
-            key="invoicingTime"
-            width="lg"
-            name="invoicingTime"
-            label="开票时间"
-            disabled={isEdit}
-            rules={[
-              { required: !isEdit ? true : false, message: '这是必填项' },
-            ]}
-            initialValue={subOrders[0]?.invoicingTime}
-          />,
-          <ProFormText
-            key="purchaser"
-            width="lg"
-            name="purchaser"
-            label="抬头名称"
-            disabled={isEdit}
-            rules={[
-              { required: !isEdit ? true : false, message: '这是必填项' },
-            ]}
-            initialValue={subOrders[0]?.purchaser}
-          />,
-          <ProFormDatePicker
-            key="financialReceiptIssuanceTime"
-            width="lg"
-            name="financialReceiptIssuanceTime"
-            label="开收据时间"
-            initialValue={subOrders[0]?.financialReceiptIssuanceTime}
-          />,
-          <ProFormDatePicker
-            key="collectMoneyTime"
-            width="lg"
-            name="collectMoneyTime"
-            label="收款时间"
-            initialValue={subOrders[0]?.collectMoneyTime}
-          />,
-          <ProFormText
-            width="lg"
-            key="invoiceNumber"
-            name="invoiceNumber"
-            label="发票号码"
-            initialValue={subOrders[0]?.invoiceNumber}
-            rules={[{ required: true, message: '发票号码必填' }]}
-          />,
-          <div
-            key="salesChooseReceivingCompany"
-            hidden={subOrders[0].receivingCompany === null}
-          >
-            <span className={'pl-2 text-xs text-gray-400'}>
-              销售申请开票时选择了：
-              {enumValueToLabel(
-                subOrders[0].receivingCompany,
-                getReceivingCompanyOptions(PAYEE_OPTIONS),
-              )}
-            </span>
-            <span
-              hidden={subOrders[0].receivingCompany === 'ANY'}
-              className={
-                'pl-2 text-xs text-[#1677ff] cursor-pointer hover:text-[#64abf7]'
-              }
-              onClick={() => {
-                chooseReceivingCompany(subOrders[0].receivingCompany);
-              }}
+            <ProFormDatePicker
+              key="invoicingTime"
+              width="lg"
+              name="invoicingTime"
+              label="开票时间"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0]?.invoicingTime}
+            />,
+            <ProFormText
+              key="purchaser"
+              width="lg"
+              name="purchaser"
+              label="抬头名称"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0]?.purchaser}
+            />,
+            <ProFormDatePicker
+              key="financialReceiptIssuanceTime"
+              width="lg"
+              name="financialReceiptIssuanceTime"
+              label="开收据时间"
+              initialValue={subOrders[0]?.financialReceiptIssuanceTime}
+            />,
+            <ProFormDatePicker
+              key="collectMoneyTime"
+              width="lg"
+              name="collectMoneyTime"
+              label="收款时间"
+              initialValue={subOrders[0]?.collectMoneyTime}
+            />,
+            <ProFormText
+              width="lg"
+              key="invoiceNumber"
+              name="invoiceNumber"
+              label="发票号码"
+              initialValue={subOrders[0]?.invoiceNumber}
+              rules={[{ required: true, message: '发票号码必填' }]}
+            />,
+            <div
+              key="salesChooseReceivingCompany"
+              hidden={subOrders[0].receivingCompany === null}
             >
-              选择
-            </span>
-          </div>,
-          <ProFormSelect
-            key="payee"
-            placeholder="选择收款单位"
-            name="payee"
-            width="lg"
-            showSearch
-            label="收款单位"
-            options={enumToSelect(PAYEE_OPTIONS)}
-            initialValue={subOrders[0]?.payee}
-            rules={[{ required: true, message: '收款单位必填' }]}
-          />,
-
-          <div id="total-payment" key="money">
-            <ProFormDigit
-              key="money"
-              name="money"
+              <span className={'pl-2 text-xs text-gray-400'}>
+                销售申请开票时选择了：
+                {enumValueToLabel(
+                  subOrders[0].receivingCompany,
+                  getReceivingCompanyOptions(PAYEE_OPTIONS),
+                )}
+              </span>
+              <span
+                hidden={subOrders[0].receivingCompany === 'ANY'}
+                className={
+                  'pl-2 text-xs text-[#1677ff] cursor-pointer hover:text-[#64abf7]'
+                }
+                onClick={() => {
+                  chooseReceivingCompany(subOrders[0].receivingCompany);
+                }}
+              >
+                选择
+              </span>
+            </div>,
+            <ProFormSelect
+              key="payee"
+              placeholder="选择收款单位"
+              name="payee"
               width="lg"
-              label="金额"
-              rules={[{ required: true, message: '金额必填' }]}
-              tooltip="点击计算，合计所有子订单对应主订单总额"
-              fieldProps={{
-                addonAfter: (
-                  <Button
-                    className="rounded-l-none"
-                    type="primary"
-                    onClick={computeTotalPayment}
-                  >
-                    计算
-                  </Button>
-                ),
-              }}
-            />
-          </div>,
-        ]
+              showSearch
+              label="收款单位"
+              options={enumToSelect(PAYEE_OPTIONS)}
+              initialValue={subOrders[0]?.payee}
+              rules={[{ required: true, message: '收款单位必填' }]}
+            />,
+
+            <div id="total-payment" key="money">
+              <ProFormDigit
+                key="money"
+                name="money"
+                width="lg"
+                label="金额"
+                rules={[{ required: true, message: '金额必填' }]}
+                tooltip="点击计算，合计所有子订单对应主订单总额"
+                fieldProps={{
+                  addonAfter: (
+                    <Button
+                      className="rounded-l-none"
+                      type="primary"
+                      onClick={computeTotalPayment}
+                    >
+                      计算
+                    </Button>
+                  ),
+                }}
+              />
+            </div>,
+          ]
         : ''}
       <ProFormSelect
@@ -130,24 +130,24 @@ export default ({ mainOrder, subOrders, setVisible, isMainOrder, onClose }) =&gt; {
         width="lg"
         name="financialReceiptIssuanceTime"
         label="开收据时间"
-      // rules={[
-      //   {
-      //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
-      //     message: '开收据时间必填',
-      //   },
-      // ]}
+        // rules={[
+        //   {
+        //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
+        //     message: '开收据时间必填',
+        //   },
+        // ]}
       />
       <ProFormDatePicker
         key="collectMoneyTime"
         width="lg"
         name="collectMoneyTime"
         label="收款时间"
-      // rules={[
-      //   {
-      //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
-      //     message: '收款时间必填',
-      //   },
-      // ]}
+        // rules={[
+        //   {
+        //     required: !isMainOrder && invoicingStatus === 'UN_INVOICE',
+        //     message: '收款时间必填',
+        //   },
+        // ]}
       />
     </DrawerForm>
   );
@@ -3,7 +3,7 @@ import { Button, Divider, Image, Modal } from &#39;antd&#39;;
 import { useEffect, useState } from 'react';
 export default ({ setVisible, optType, onClose, orderRow }) => {
   const [images, setImages] = useState<any[]>([]);
-  const [title, setTitle] = useState("收货凭证");
+  const [title, setTitle] = useState('收货凭证');
   const handleOk = () => {
     onClose();
     setVisible(false);
@@ -23,7 +23,7 @@ export default ({ setVisible, optType, onClose, orderRow }) =&gt; {
   }
   useEffect(() => {
     if (optType === 'shippingReceipt') {
-      setTitle("收货凭证");
+      setTitle('收货凭证');
       getImages();
     } else if (optType === 'paymentReceipt') {
       let paymentReceiptsImagesList: any[] = [];
@@ -34,7 +34,6 @@ export default ({ setVisible, optType, onClose, orderRow }) =&gt; {
       paymentReceiptsImagesList = [...new Set(paymentReceiptsImagesList)];
       setImages(paymentReceiptsImagesList);
     }
-
   }, []);
   return (
@@ -106,7 +106,7 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
                 onClick={() => {
                   window.open(
                     '/previewApi/onlinePreview?url=' +
-                    encodeURIComponent(Base64.encode(item)),
+                      encodeURIComponent(Base64.encode(item)),
                   );
                 }}
               >
@@ -556,9 +556,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       form.setFieldValue(
         'customerShippingAddress',
         getDefaultString(option.province) +
-        getDefaultString(option.city) +
-        getDefaultString(option.district) +
-        getDefaultString(option.detail),
+          getDefaultString(option.city) +
+          getDefaultString(option.district) +
+          getDefaultString(option.detail),
       );
       form.setFieldValue('customerNameString', option.realName);
@@ -641,11 +641,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       message.error(
         '用户余额不足，当前预减的金额为：' +
-        data.subPrice +
-        '，当前账号余额为：' +
-        data.nowMoney +
-        '，当前账号可赊账额度为：' +
-        data.creditLimit,
+          data.subPrice +
+          '，当前账号余额为：' +
+          data.nowMoney +
+          '，当前账号可赊账额度为：' +
+          data.creditLimit,
       );
       return false;
     }
@@ -1110,7 +1110,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
           }}
           debounceTime={1000}
-          request={async (value, { }) => {
+          request={async (value, {}) => {
             const keywords = value.keyWords;
             if (keywords === '') {
               return [];
@@ -1865,7 +1865,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品参数"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                   />,
                   <ProFormDigit
@@ -1918,7 +1918,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     placeholder="请输入商品单位"
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false || optType('after-sales-check')
+                        false || optType('after-sales-check')
                     }
                     rules={[{ required: true, message: '商品单位必填' }]}
                   />,
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postServiceOrderFileProcess,
+  postServiceOrderUploadPaymentReceipt,
+} from '@/services';
+import { transImageFile } from '@/utils';
+import { PlusOutlined } from '@ant-design/icons';
 import { ModalForm } from '@ant-design/pro-components';
 import { Form, Modal, Upload, UploadFile, UploadProps, message } from 'antd';
 import { RcFile } from 'antd/lib/upload';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 import { COMFIR_RECEIPT_IMAGES_NUMBER } from '../../constant';
-import { PlusOutlined } from '@ant-design/icons';
-import { transImageFile } from '@/utils';
-import { postServiceOrderFileProcess, postServiceOrderUploadPaymentReceipt } from '@/services';
-import { RESPONSE_CODE } from '@/constants/enum';
 // import { cloneDeep } from 'lodash';
 export default ({ setVisible, subOrders, mainOrder, onClose }) => {
@@ -25,7 +28,9 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
       reader.onerror = (error) => reject(error);
     });
-  const subOrderIds = subOrders?.map((item: any) => { return item.id });
+  const subOrderIds = subOrders?.map((item: any) => {
+    return item.id;
+  });
   const fileListObj = useRef<UploadFile[]>([]); //使用引用类型，使得在useEffect里面设置监听事件后，不用更新监听事件也能保持obj与外界一致
   const handleBeforeUpload = (file: any) => {
     setFileList([...fileList, file]);
@@ -105,8 +110,8 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
   const props: UploadProps = {
@@ -128,7 +133,6 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
   };
   useEffect(() => {
-
     document.addEventListener('paste', onPaste);
     return () => {
       document.removeEventListener('paste', onPaste);
@@ -206,19 +210,15 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
             }
           } else {
             message.success('上传失败');
+            console.log(mainOrder);
           }
           onClose();
         }}
         onOpenChange={setVisible}
       >
-
-        <div className="pb-4 text-xs decoration-gray-50">
-          可复制照片粘贴
-        </div>
+        <div className="pb-4 text-xs decoration-gray-50">可复制照片粘贴</div>
         <Upload {...props}>
-          {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER
-            ? uploadButton
-            : ''}
+          {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER ? uploadButton : ''}
         </Upload>
       </ModalForm>
@@ -103,6 +103,7 @@ import CheckModal from &#39;./components/CheckModal&#39;;
 import ConfirmReceiptModal from './components/ConfirmReceiptModal';
 import DeliverInfoDrawer from './components/DeliverInfoDrawer';
 import DeliverModal from './components/DeliverModal';
+import FeedbackRegistrationModal from './components/FeedbackRegistrationModal';
 import FinancialDrawer from './components/FinancialDrawer';
 import FinancialEditDrawer from './components/FinancialEditDrawer';
 import FinancialMergeDrawer from './components/FinancialMergeDrawer';
@@ -136,6 +137,10 @@ const OrderPage = () =&gt; {
     useState<boolean>(false);
   const [uploadPayBillModalVisible, setUploadPayBillModalVisible] =
     useState<boolean>(false);
+  const [
+    feedbackRegistrationModalVisible,
+    setFeedbackRegistrationModalVisible,
+  ] = useState<boolean>(false);
   const [modifiedDiffModalVisible, setModifiedDiffModalVisible] =
     useState<boolean>(false);
   const [financialReceiptsModalVisible, setFinancialReceiptsModalVisible] =
@@ -2255,6 +2260,30 @@ const OrderPage = () =&gt; {
         ) : (
           ''
         )}
+        {isAdmin() || isSales() ? (
+          <Flex title={optRecord.notes} className="pt-2">
+            <div className="flex items-center">
+              <div className="flex items-center max-w-[500px]">
+                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <Tooltip
+                    title={optRecord.feedbackRegistrationContent}
+                    placement="topLeft"
+                  >
+                    <span className="text-[#8C8C8C] mr-3">
+                      产品回访登记：
+                      {optRecord.feedbackRegistrationContent === undefined ||
+                      optRecord.feedbackRegistrationContent === null
+                        ? '暂无'
+                        : optRecord.feedbackRegistrationContent}
+                    </span>
+                  </Tooltip>
+                </div>
+              </div>
+            </div>
+          </Flex>
+        ) : (
+          ''
+        )}
       </>
     );
   };
@@ -4980,6 +5009,23 @@ const OrderPage = () =&gt; {
               }}
             />
           )}
+          {feedbackRegistrationModalVisible && (
+            <FeedbackRegistrationModal
+              setVisible={(val: boolean) => {
+                setFeedbackRegistrationModalVisible(val);
+                if (!val) {
+                  clearOptObject();
+                }
+              }}
+              subOrders={buildSubOrders()}
+              mainOrder={buildMainOrder()}
+              onClose={() => {
+                setFeedbackRegistrationModalVisible(false);
+                clearOptObject();
+                refreshTable();
+              }}
+            />
+          )}
           {invoicingDrawerFormVisible && (
             <InvoicingDrawerForm
               dataList={
@@ -5552,6 +5598,23 @@ const OrderPage = () =&gt; {
               }}
             />
           )}
+          {feedbackRegistrationModalVisible && (
+            <FeedbackRegistrationModal
+              setVisible={(val: boolean) => {
+                setFeedbackRegistrationModalVisible(val);
+                if (!val) {
+                  clearOptObject();
+                }
+              }}
+              subOrders={buildSubOrders()}
+              mainOrder={buildMainOrder()}
+              onClose={() => {
+                setFeedbackRegistrationModalVisible(false);
+                clearOptObject();
+                refreshTable2();
+              }}
+            />
+          )}
           {invoicingDrawerFormVisible && (
             <InvoicingDrawerForm
               dataList={
-import {
-  ActionType,
-  ModalForm,
-  ProColumns,
-  ProFormText,
-  ProTable,
-} from '@ant-design/pro-components';
-import {
-  Button,
-  Checkbox,
-  Divider,
-  Dropdown,
-  Flex,
-  FloatButton,
-  Image,
-  MenuProps,
-  Modal,
-  Popconfirm,
-  Radio,
-  Space,
-  Spin,
-  Tag,
-  Tooltip,
-  message,
-  Tabs,
-} from 'antd';
 import ButtonConfirm from '@/components/ButtomConfirm';
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
-  postOldInvoicingWhiteListBatchAdd,
-  postOldInvoicingWhiteListPage,
-  postOldInvoicingWhiteListRemove,
-  postServiceOrderWarningUserWhiteLists,
+  postServiceOrderAddWarningOrderWhiteList,
   postServiceOrderAddWarningUserWhiteList,
+  postServiceOrderDeleteWarningOrderWhiteList,
   postServiceOrderDeleteWarningUserWhiteList,
   postServiceOrderWarningOrderWhiteLists,
-  postServiceOrderAddWarningOrderWhiteList,
-  postServiceOrderDeleteWarningOrderWhiteList,
+  postServiceOrderWarningUserWhiteLists,
 } from '@/services';
 import { PlusOutlined } from '@ant-design/icons';
+import {
+  ActionType,
+  ModalForm,
+  ProColumns,
+  ProFormText,
+  ProTable,
+} from '@ant-design/pro-components';
+import { Button, Tabs, message } from 'antd';
 import { useRef } from 'react';
 export const waitTimePromise = async (time: number = 100) => {
   return new Promise((resolve) => {
@@ -134,9 +113,9 @@ const WarningWhitelist = () =&gt; {
       search: {
         transform: (value) => {
           if (value) {
-            console.log(value, '5656valueid')
+            console.log(value, '5656valueid');
             return {
-              orderId: Number(value)
+              orderId: Number(value),
             };
           }
         },
@@ -186,7 +165,7 @@ const WarningWhitelist = () =&gt; {
           title={'确认删除此项吗？'}
           text="删除"
           onConfirm={async () => {
-            console.log(record.orderId, '5656idoreder')
+            console.log(record.orderId, '5656idoreder');
             await postServiceOrderDeleteWarningOrderWhiteList({
               query: {
                 orderId: record.orderId,
@@ -213,7 +192,7 @@ const WarningWhitelist = () =&gt; {
               const res = await postServiceOrderWarningUserWhiteLists({
                 data: { ...params },
               });
-              console.log(res.data, '5656res.data')
+              console.log(res.data, '5656res.data');
               return res.data;
             }}
             rowKey="id"
@@ -281,7 +260,7 @@ const WarningWhitelist = () =&gt; {
             ]}
           />
         </div>
-      )
+      ),
     },
     {
       key: 2,
@@ -334,7 +313,7 @@ const WarningWhitelist = () =&gt; {
                   console.log(values, '5656values');
                   const res = await postServiceOrderAddWarningOrderWhiteList({
                     data: {
-                      orderId: values.orderIdsText
+                      orderId: values.orderIdsText,
                     },
                   });
                   if (res.result === RESPONSE_CODE.SUCCESS) {
@@ -361,9 +340,9 @@ const WarningWhitelist = () =&gt; {
             ]}
           />
         </div>
-      )
-    }
-  ]
+      ),
+    },
+  ];
   return (
     <div>
       <Tabs
@@ -374,6 +353,6 @@ const WarningWhitelist = () =&gt; {
         }}
       />
     </div>
-  )
-}
-export default WarningWhitelist
+  );
+};
+export default WarningWhitelist;
@@ -310,59 +310,44 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title='待开票订单' />}
+          title={<CardTitle title="待开票订单" />}
         >
-          <CardContent
-            content={data?.waitInvoicingCount}
-          />
+          <CardContent content={data?.waitInvoicingCount} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title='待开票订单总金额' />}
+          title={<CardTitle title="待开票订单总金额" />}
         >
-          <CardContent
-            unit="￥"
-            content={data?.waitInvoicingPriceSum}
-          />
+          <CardContent unit="￥" content={data?.waitInvoicingPriceSum} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title='已开票未回款订单' />}
+          title={<CardTitle title="已开票未回款订单" />}
         >
-          <CardContent
-            content={data?.invoicedNotReiceptCount}
-          />
+          <CardContent content={data?.invoicedNotReiceptCount} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title='已开票未回款订单总金额' />}
+          title={<CardTitle title="已开票未回款订单总金额" />}
         >
-          <CardContent
-            unit="￥"
-            content={data?.invoicedNotReiceptPriceSum}
-          />
+          <CardContent unit="￥" content={data?.invoicedNotReiceptPriceSum} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title='已开票已回款订单' />}
+          title={<CardTitle title="已开票已回款订单" />}
         >
-          <CardContent
-            content={data?.invoicedAndReiceptedCount}
-          />
+          <CardContent content={data?.invoicedAndReiceptedCount} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title='已开票已回款订单总金额' />}
+          title={<CardTitle title="已开票已回款订单总金额" />}
         >
-          <CardContent
-            unit="￥"
-            content={data?.invoicedAndReiceptedPriceSum}
-          />
+          <CardContent unit="￥" content={data?.invoicedAndReiceptedPriceSum} />
         </ProCard>
       </ProCard>
 import ButtonConfirm from '@/components/ButtomConfirm';
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
 import { RESPONSE_CODE } from '@/constants/enum';
-import { } from '@/pages/Invoice/constant';
+import {} from '@/pages/Invoice/constant';
 import {
   postCanrdApiUserList,
   postPrepaidDelete,
@@ -94,36 +94,33 @@ export interface AdminAuthUserVO {
 export interface AdminClientDto {
   /**
    * @description
-   *   市
-   */
-  city?: string;
-  /**
-   * @description
-   *   单位地址
+   *   客户地址
    */
-  companyAddress?: string;
+  address?: string;
   /**
    * @description
-   *   单位地址
+   *   市
    */
-  companyAddressText?: string;
+  city?: string;
   companyId?: string;
   /**
    * @description
-   *   单位名称
+   *   联系人
    */
-  companyName?: string;
   contacts?: string;
-  createBy?: string;
+  createByName?: string;
   /** @format date-time */
   createTime?: string;
   /**
    * @description
+   *   详细地址
+   */
+  detailAddress?: string;
+  /**
+   * @description
    *   区
    */
   district?: string;
-  /** @format int32 */
-  enableFlag?: number;
   /**
    * @description
    *   是否已报方案
@@ -144,9 +141,7 @@ export interface AdminClientDto {
    *   客户等级
    */
   levelText?: string;
-  modifyBy?: string;
-  /** @format date-time */
-  modifyTime?: string;
+  logicDelete?: boolean;
   /**
    * @description
    *   名称
@@ -157,6 +152,7 @@ export interface AdminClientDto {
    *   备注
    */
   notes?: string;
+  paths?: Array<string>;
   /**
    * @description
    *   电话号码
@@ -180,16 +176,26 @@ export interface AdminClientDto {
   referrers?: string;
   /**
    * @description
-   *   需求
+   *   客户需求
    */
   requirements?: string;
   /**
    * @description
+   *   客户需求
+   */
+  requirementsText?: string;
+  /**
+   * @description
    *   来源
    */
   source?: string;
   /**
    * @description
+   *   来源
+   */
+  sourceText?: string;
+  /**
+   * @description
    *   跟进状态
    */
   tradeStatus?: string;
@@ -198,8 +204,9 @@ export interface AdminClientDto {
    *   跟进状态
    */
   tradeStatusText?: string;
-  /** @format int32 */
-  version?: number;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
 }
 export interface AdminDeptQueryVO {
@@ -2818,6 +2825,7 @@ export interface QueryBankStatementDto {
 }
 export interface QueryClientDto {
+  address?: string;
   companyAddressLike?: string;
   companyIds?: Array<number>;
   companyNameLike?: string;
@@ -2829,6 +2837,7 @@ export interface QueryClientDto {
   createTimeLe?: string;
   /** @format int32 */
   current?: number;
+  detailAddress?: string;
   /** @format int32 */
   end?: number;
   groupFilter?: string;
@@ -2838,6 +2847,8 @@ export interface QueryClientDto {
   /** @format int32 */
   pageSize?: number;
   phoneNumber?: string;
+  requirements?: string;
+  source?: string;
   /** @format int32 */
   start?: number;
   /** @format int32 */
@@ -2846,10 +2857,18 @@ export interface QueryClientDto {
 }
 export interface QueryCommunicationInfoDto {
+  clientAddressLike?: string;
   /** @format int64 */
   clientId?: number;
+  clientIdIn?: Array<number>;
+  clientNameLike?: string;
   content?: string;
   createByName?: string;
+  createByNameIn?: Array<string>;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format date-time */
@@ -2864,6 +2883,7 @@ export interface QueryCommunicationInfoDto {
   start?: number;
   /** @format int32 */
   total?: number;
+  tradeStatusLike?: string;
   way?: string;
 }
@@ -3201,10 +3221,16 @@ export interface QueryUseOldInvoicingDto {
 export interface QueryWarningOrderWhiteListDto {
   createByName?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
   end?: number;
+  /** @format int64 */
+  orderId?: number;
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
@@ -3683,6 +3709,7 @@ export interface SubOrder {
   deadline?: string;
   ext?: string;
   extendField?: string;
+  feedbackRegistrationContent?: string;
   /** @format date-time */
   financialReceiptIssuanceTime?: string;
   fullPaymentStatus?: string;
@@ -4103,14 +4130,30 @@ export interface View {
 }
 export interface WarningOrderWhiteListDto {
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  logicDelete?: boolean;
   /** @format int64 */
   orderId?: number;
+  paths?: Array<string>;
   salesCode?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
 }
 export interface WarningUserWhiteListDto {
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
   /** @format int64 */
   id?: number;
+  logicDelete?: boolean;
+  paths?: Array<string>;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
   userName?: string;
 }
@@ -4133,16 +4176,29 @@ export interface ApiOrderConfirmReceiveRequest {
 }
 export interface ClientCommunicationInfo {
+  attachments?: string;
+  /**
+   * @description
+   *   客户地址
+   */
+  clientAddress?: string;
   /** @format int64 */
   clientId?: number;
   /**
    * @description
+   *   客户名称
+   */
+  clientName?: string;
+  /**
+   * @description
    *   内容
    */
   content?: string;
   createByName?: string;
   /** @format date-time */
   createTime?: string;
+  /** @format int64 */
+  dateRange?: number;
   /**
    * @description
    *   跟进时间
@@ -4152,6 +4208,11 @@ export interface ClientCommunicationInfo {
   /** @format int64 */
   id?: number;
   logicDelete?: boolean;
+  /**
+   * @description
+   *   客户状态
+   */
+  tradeStatus?: string;
   updateByName?: string;
   /** @format date-time */
   updateTime?: string;
@@ -4160,6 +4221,11 @@ export interface ClientCommunicationInfo {
    *   方式
    */
   way?: string;
+  /**
+   * @description
+   *   方式
+   */
+  wayText?: string;
 }
 export interface CompanyInfo {
@@ -4718,6 +4784,20 @@ export interface UserAddressSaveRequest {
   institutionContactName?: string;
 }
+export interface FeedbackRegistrationDTO {
+  /**
+   * @description
+   *   回访登记内容
+   */
+  feedbackRegistrationContent?: string;
+  /**
+   * @description
+   *   子订单id
+   * @format int64
+   */
+  id?: number;
+}
+
 export interface UploadPaymentReceiptDTO {
   /**
    * @description
@@ -53,6 +53,7 @@ import type {
   DistrictDo,
   DistrictSearchDo,
   Dto,
+  FeedbackRegistrationDTO,
   InventoryMaterialStockReq,
   InvoiceDto,
   InvoiceRecordDTO,
@@ -64,6 +65,7 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -360,6 +362,79 @@ export const postAdminClientAddOrModifyClientComunicationInfo =
     return request;
   })();
+/** @description request parameter type for postAdminClientDeleteAdminClient */
+export interface PostAdminClientDeleteAdminClientOption {
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  query?: {
+    /**
+        @description
+          id
+        @format int64 */
+    id?: number;
+  };
+}
+
+/** @description response type for postAdminClientDeleteAdminClient */
+export interface PostAdminClientDeleteAdminClientResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientDeleteAdminClientResponseSuccess =
+  PostAdminClientDeleteAdminClientResponse[200];
+/**
+ * @description
+ *   删除客户
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientDeleteAdminClient = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/deleteAdminClient';
+  function request(
+    option?: PostAdminClientDeleteAdminClientOption,
+  ): Promise<PostAdminClientDeleteAdminClientResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientDeleteAdminClientResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postAdminClientDownloadImportTemplate */
 export interface PostAdminClientDownloadImportTemplateResponse {
   /**
@@ -518,7 +593,7 @@ export type PostAdminClientGetStatisticalDataResponseSuccess =
   PostAdminClientGetStatisticalDataResponse[200];
 /**
  * @description
- *   修改跟进信息
+ *   全部与预警客户个数
  * @tags 客户管理
  * @produces *
  * @consumes application/json
@@ -3237,9 +3312,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -3260,9 +3333,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -3286,9 +3359,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3314,9 +3385,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -3341,9 +3412,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3369,9 +3438,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -3396,9 +3465,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3419,9 +3486,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -3445,9 +3512,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3468,9 +3533,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -3495,9 +3560,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3518,9 +3581,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -3545,9 +3608,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3568,9 +3629,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -13049,6 +13110,168 @@ export const postServiceConstClientLevels = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description response type for postServiceConstClientRequirements */
+export interface PostServiceConstClientRequirementsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstClientRequirementsResponseSuccess =
+  PostServiceConstClientRequirementsResponse[200];
+/**
+ * @description
+ *   客户需求
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstClientRequirements = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/clientRequirements';
+  function request(): Promise<PostServiceConstClientRequirementsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstClientRequirementsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for postServiceConstClientSource */
+export interface PostServiceConstClientSourceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstClientSourceResponseSuccess =
+  PostServiceConstClientSourceResponse[200];
+/**
+ * @description
+ *   客户来源
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstClientSource = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/clientSource';
+  function request(): Promise<PostServiceConstClientSourceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstClientSourceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for postServiceConstClientWay */
+export interface PostServiceConstClientWayResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstClientWayResponseSuccess =
+  PostServiceConstClientWayResponse[200];
+/**
+ * @description
+ *   类型
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstClientWay = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/clientWay';
+  function request(): Promise<PostServiceConstClientWayResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstClientWayResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstGetPayeeEnum */
 export interface PostServiceConstGetPayeeEnumResponse {
   /**
@@ -17062,13 +17285,13 @@ export const postServiceOrderConfirmReceipt = /* #__PURE__ */ (() =&gt; {
 export interface PostServiceOrderDeleteWarningOrderWhiteListOption {
   /**
    * @description
-   *   id
+   *   orderId
    */
   body?: {
     /**
         @description
-          id */
-    id?: number;
+          orderId */
+    orderId?: number;
   };
 }
@@ -17540,6 +17763,77 @@ export const postServiceOrderExportTemplate = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderFeedbackRegistration */
+export interface PostServiceOrderFeedbackRegistrationOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: FeedbackRegistrationDTO;
+  };
+}
+
+/** @description response type for postServiceOrderFeedbackRegistration */
+export interface PostServiceOrderFeedbackRegistrationResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderFeedbackRegistrationResponseSuccess =
+  PostServiceOrderFeedbackRegistrationResponse[200];
+/**
+ * @description
+ *   回访登记
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderFeedbackRegistration = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/feedbackRegistration';
+  function request(
+    option: PostServiceOrderFeedbackRegistrationOption,
+  ): Promise<PostServiceOrderFeedbackRegistrationResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderFeedbackRegistrationResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderFileProcess */
 export interface PostServiceOrderFileProcessOption {
   /**