feat: update

zhongnanhuang
2 parents 18b4faea 0f671707
Showing 8 changed files with 1040 additions and 277 deletions
.umirc.ts
src/pages/Client/Components/ClientDrawer.tsx
src/pages/Client/Components/ClientImportModal.tsx
src/pages/Client/Components/CommunicationHistoryModal.tsx
src/pages/Client/index.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/OrderReport/index.tsx
src/services/request.ts
@@ -86,12 +86,13 @@ export default defineConfig({
       icon: 'BookOutlined',
       access: 'canReadAdmin',
     },
-    /*{
+    {
       name: '客户管理',
       path: '/client',
       component: './Client',
       icon: 'BookOutlined',
-    },*/
+      access: 'canReadAdmin',
+    },
     {
       name: '打印',
       path: '/print',
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postAdminClientAddAdminClient,
+  postAdminClientModifyClientInfo,
+  postDistrictSelectByLevel,
+  postDistrictSelectByNameAndLevel,
+  postDistrictSelOrderProvince,
+  postServiceConstClientLevels,
+  postServiceConstTradeStatus,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import {
+  DrawerForm,
+  ProFormDateTimePicker,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { useState } from 'react';
+
+export default ({ optType, record }) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+  //省市区
+  const [province, setProvince] = useState('');
+  const [city, setCity] = useState('');
+  const [setDistrict] = useState('');
+  const optTypeEnum = {
+    add: {
+      text: '新增',
+      button: <Button type="primary">新增</Button>,
+      readonly: false,
+      onFinish: async (values) => {
+        const res = await postAdminClientAddAdminClient({
+          data: values,
+        });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success('新增成功');
+          // 不返回不会关闭弹框
+          return true;
+        }
+      },
+    },
+    edit: {
+      text: '编辑',
+      button: <a type="primary">编辑</a>,
+      readonly: false,
+      onFinish: async (values) => {
+        const res = await postAdminClientModifyClientInfo({
+          data: values,
+        });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success('编辑成功');
+          // 不返回不会关闭弹框
+          return true;
+        }
+      },
+    },
+    detail: {
+      text: '详情',
+      button: <a type="primary">详情</a>,
+      readonly: true,
+    },
+  };
+
+  return (
+    <DrawerForm
+      title={optTypeEnum[optType].text}
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 300,
+      }}
+      initialValues={record}
+      form={form}
+      trigger={optTypeEnum[optType].button}
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      width={500}
+      readonly={optTypeEnum[optType].readonly}
+      onFinish={optTypeEnum[optType].onFinish}
+    >
+      <ProFormText name="id" label="id" hidden={true} />
+
+      <ProFormText
+        name="name"
+        label="客户名称"
+        placeholder="请输入名称"
+        rules={[
+          {
+            required: true,
+            message: '请输入客户名称',
+          },
+        ]}
+      />
+      <ProFormText
+        name="companyName"
+        label="单位名称"
+        placeholder="请输入单位名称"
+        rules={[
+          {
+            required: true,
+            message: '请输入单位名称',
+          },
+        ]}
+      />
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          width: 340,
+        }}
+      >
+        <ProFormSelect
+          name="province"
+          key="province"
+          width={100}
+          label="省"
+          allowClear={false}
+          onChange={(value) => {
+            console.log(value);
+
+            if (value !== undefined || value !== null) {
+              console.log('setProvince');
+
+              setProvince(value);
+            }
+          }}
+          placeholder="请选择"
+          rules={[
+            {
+              required: true,
+              message: '请选择!',
+            },
+          ]}
+          request={async () => {
+            let province = [];
+            let res = await postDistrictSelectByLevel({ data: 1 });
+            if (res) {
+              res.data.forEach((item) => {
+                province.push({ value: item.district, label: item.district });
+              });
+            }
+            return province;
+          }}
+        />
+        <ProFormSelect
+          key={province}
+          name="city"
+          width={100}
+          label="市"
+          allowClear={false}
+          disabled={province === ''}
+          placeholder="请选择"
+          onChange={(value) => {
+            if (value !== undefined || value !== null) {
+              setCity(value);
+            }
+          }}
+          rules={[
+            {
+              required: true,
+              message: '请选择!',
+            },
+          ]}
+          request={async () => {
+            let cityOptions = [];
+            console.log(form.getFieldValue('id'));
+            if (form.getFieldValue('id')) {
+              const resp = await postDistrictSelOrderProvince({
+                data: form.getFieldValue('id'),
+              });
+              if (
+                resp.data.province !== null &&
+                resp.data.province !== undefined
+              ) {
+                console.log('province is ok');
+                let res = await postDistrictSelectByNameAndLevel({
+                  data: { district: resp.data.province, level: 1 },
+                });
+                if (res && res.data) {
+                  cityOptions = res.data.map((item) => ({
+                    value: item.district,
+                    label: item.district,
+                  }));
+                }
+              }
+            }
+            if (province !== '') {
+              console.log(province);
+              console.log('province is okk');
+              let res = await postDistrictSelectByNameAndLevel({
+                data: { district: province, level: 1 },
+              });
+              if (res && res.data) {
+                cityOptions = res.data.map((item) => ({
+                  value: item.district,
+                  label: item.district,
+                }));
+              }
+            }
+            return cityOptions;
+          }}
+        />
+        <ProFormSelect
+          key={city ? city.toString() : 'district'}
+          name="district"
+          width={100}
+          label="区"
+          allowClear={false}
+          onChange={(value) => {
+            if (value !== undefined || value !== null) {
+              setDistrict(value);
+            }
+          }}
+          disabled={city === ''}
+          placeholder="请选择"
+          rules={[
+            {
+              required: true,
+              message: '请选择!',
+            },
+          ]}
+          request={async () => {
+            let districtOptions = [];
+            if (form.getFieldValue('id')) {
+              const resp = await postDistrictSelOrderProvince({
+                data: form.getFieldValue('id'),
+              });
+              if (resp.data.city !== null && resp.data.city !== undefined) {
+                let res = await postDistrictSelectByNameAndLevel({
+                  data: { district: resp.data.city, level: 2 },
+                });
+                if (res && res.data) {
+                  districtOptions = res.data.map((item) => ({
+                    value: item.district,
+                    label: item.district,
+                  }));
+                }
+              }
+            }
+            if (city !== '') {
+              let res = await postDistrictSelectByNameAndLevel({
+                data: { district: city, level: 2 },
+              });
+              if (res && res.data) {
+                districtOptions = res.data.map((item) => ({
+                  value: item.district,
+                  label: item.district,
+                }));
+              }
+            }
+            return districtOptions;
+          }}
+        />
+      </div>
+      <ProFormText
+        name="companyAddress"
+        label="详细地址"
+        placeholder="请输入单位地址"
+        rules={[
+          {
+            required: true,
+            message: '请输入单位地址',
+          },
+        ]}
+      />
+      <ProFormText
+        name="phoneNumber"
+        label="联系电话"
+        placeholder="请输入联系电话"
+        rules={[
+          {
+            required: true,
+            message: '请输入联系电话',
+          },
+        ]}
+      />
+      <ProFormText
+        name="source"
+        label="客户来源"
+        placeholder="请输入客户来源"
+      />
+      <ProFormText
+        name="requirements"
+        label="客户需求"
+        placeholder="请输入客户需求"
+        rules={[
+          {
+            required: true,
+            message: '请输入客户需求',
+          },
+        ]}
+      />
+      <ProFormText name="referrers" label="推荐人" placeholder="请输入推荐人" />
+      <ProFormSelect
+        name="hasScheme"
+        label="是否已报方案"
+        placeholder="请选择是否已报方案"
+        options={[
+          {
+            label: '是',
+            value: true,
+          },
+          {
+            label: '否',
+            value: false,
+          },
+        ]}
+        rules={[
+          {
+            required: true,
+            message: '请选择是否已报方案',
+          },
+        ]}
+      />
+      <ProFormDateTimePicker
+        name="quoteDatetime"
+        label="报价时间"
+        placeholder="请输入报价时间"
+      />
+      <ProFormSelect
+        name="level"
+        label="客户等级"
+        placeholder="请输入客户等级"
+        rules={[
+          {
+            required: true,
+            message: '请输入客户等级',
+          },
+        ]}
+        request={async () => {
+          const res = await postServiceConstClientLevels();
+          return enumToSelect(res.data);
+        }}
+      />
+      <ProFormSelect
+        name="tradeStatus"
+        label="跟进状态"
+        placeholder="请输入跟进状态"
+        rules={[
+          {
+            required: true,
+            message: '请输入跟进状态',
+          },
+        ]}
+        request={async () => {
+          const res = await postServiceConstTradeStatus();
+          return enumToSelect(res.data);
+        }}
+      />
+      <ProFormText name="notes" label="备注" placeholder="请输入备注" />
+    </DrawerForm>
+  );
+};
+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 () => {
+  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);
+                } 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,
+  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 { EllipsisOutlined, PlusOutlined } from '@ant-design/icons';
-import type { ActionType, ProColumns } from '@ant-design/pro-components';
-import { ProTable, TableDropdown } from '@ant-design/pro-components';
-import { request } from '@umijs/max';
-import { Button, Dropdown, Space, Tag } from 'antd';
+import ClientDrawer from '@/pages/Client/Components/ClientDrawer';
+import ClientImportModal from '@/pages/Client/Components/ClientImportModal';
+import CommunicationHistoryModal from '@/pages/Client/Components/CommunicationHistoryModal';
+import {
+  postAdminClientQueryClientPage,
+  postServiceConstClientLevels,
+  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, message } from 'antd';
 import { useRef } from 'react';
-export const waitTimePromise = async (time: number = 100) => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(true);
-    }, time);
-  });
-};
-
-export const waitTime = async (time: number = 100) => {
-  await waitTimePromise(time);
-};
-
-type GithubIssueItem = {
-  url: string;
-  id: number;
-  number: number;
-  title: string;
-  labels: {
-    name: string;
-    color: string;
-  }[];
-  state: string;
-  comments: number;
-  created_at: string;
-  updated_at: string;
-  closed_at?: string;
-};
-
-const columns: ProColumns<GithubIssueItem>[] = [
+const columns = [
   {
     dataIndex: 'index',
     valueType: 'indexBorder',
     width: 48,
   },
   {
-    title: '标题',
-    dataIndex: 'title',
-    copyable: true,
-    ellipsis: true,
-    tooltip: '标题过长会自动收缩',
-    formItemProps: {
-      rules: [
-        {
-          required: true,
-          message: '此项为必填项',
-        },
-      ],
-    },
+    title: '客户名称',
+    dataIndex: 'name',
+    width: 100,
+    hideInSearch: true,
+  },
+  {
+    title: '单位名称',
+    width: 150,
+    dataIndex: 'companyName',
+    hideInSearch: true,
+  },
+  {
+    title: '单位地址',
+    width: 250,
+    dataIndex: 'companyName',
+    hideInSearch: true,
+  },
+  {
+    title: '联系电话',
+    width: 150,
+    dataIndex: 'phoneNumber',
+    hideInSearch: true,
+  },
+  {
+    title: '客户来源',
+    width: 150,
+    dataIndex: 'source',
+    hideInSearch: true,
+  },
+  {
+    title: '推荐人',
+    dataIndex: 'referrers',
+    width: 150,
+    hideInSearch: true,
+  },
+  {
+    title: '客户需求',
+    dataIndex: 'requirements',
+    width: 150,
+    hideInSearch: true,
+  },
+  {
+    title: '是否已报方案',
+    width: 150,
+    dataIndex: 'hasSchemeText',
+    hideInSearch: true,
+  },
+  {
+    title: '报价时间',
+    key: 'since',
+    width: 150,
+    dataIndex: 'quoteDatetime',
+    valueType: 'dateTime',
+    hideInSearch: true,
+  },
+  {
+    title: '跟进状态',
+    width: 150,
+    dataIndex: 'tradeStatusText',
+    hideInSearch: true,
+  },
+  {
+    title: '客户等级',
+    width: 150,
+    dataIndex: 'levelText',
+    hideInSearch: true,
   },
   {
-    disable: true,
-    title: '状态',
-    dataIndex: 'state',
-    filters: true,
-    onFilter: true,
-    ellipsis: true,
+    title: '创建时间',
+    key: 'since',
+    width: 150,
+    dataIndex: 'createTime',
+    valueType: 'dateTime',
+    hideInSearch: true,
+  },
+  {
+    title: '最新跟进时间',
+    key: 'since',
+    width: 150,
+    dataIndex: 'latestCommunicationTime',
+    valueType: 'dateTime',
+    hideInSearch: true,
+  },
+  {
+    title: '客户名称',
+    dataIndex: 'nameLike',
+    valueType: 'Text',
+    hideInTable: true,
+  },
+  {
+    title: '单位名称',
+    dataIndex: 'companyNameLike',
+    valueType: 'Text',
+    hideInTable: true,
+  },
+  {
+    title: '联系电话',
+    dataIndex: 'phoneNumberLike',
+    valueType: 'Text',
+    hideInTable: true,
+  },
+  {
+    title: '是否已报方案',
+    dataIndex: 'hasScheme',
     valueType: 'select',
     valueEnum: {
-      all: { text: '超长'.repeat(50) },
-      open: {
-        text: '未解决',
-        status: 'Error',
-      },
-      closed: {
-        text: '已解决',
-        status: 'Success',
-        disabled: true,
+      true: {
+        text: '是',
+        value: true,
       },
-      processing: {
-        text: '解决中',
-        status: 'Processing',
+      false: {
+        text: '否',
+        value: false,
       },
     },
+    hideInTable: true,
   },
   {
-    disable: true,
-    title: '标签',
-    dataIndex: 'labels',
-    search: false,
-    renderFormItem: (_, { defaultRender }) => {
-      return defaultRender(_);
+    title: '客户等级',
+    dataIndex: 'level',
+    valueType: 'select',
+    hideInTable: true,
+    request: async () => {
+      const res = await postServiceConstClientLevels();
+      return enumToSelect(res.data);
     },
-    render: (_, record) => (
-      <Space>
-        {record.labels.map(({ name, color }) => (
-          <Tag color={color} key={name}>
-            {name}
-          </Tag>
-        ))}
-      </Space>
-    ),
   },
   {
-    title: '创建时间',
-    key: 'showTime',
-    dataIndex: 'created_at',
-    valueType: 'date',
-    sorter: true,
-    hideInSearch: true,
+    title: '跟进状态',
+    dataIndex: 'tradeStatus',
+    valueType: 'select',
+    hideInTable: true,
+    request: async () => {
+      const res = await postServiceConstTradeStatus();
+      return enumToSelect(res.data);
+    },
   },
   {
     title: '创建时间',
-    dataIndex: 'created_at',
     valueType: 'dateRange',
     hideInTable: true,
     search: {
       transform: (value) => {
-        return {
-          startTime: value[0],
-          endTime: value[1],
-        };
+        if (value) {
+          return {
+            createTimeGe: value[0],
+            createTimeLe: value[1],
+          };
+        }
       },
     },
   },
@@ -123,121 +176,121 @@ const columns: ProColumns&lt;GithubIssueItem&gt;[] = [
     title: '操作',
     valueType: 'option',
     key: 'option',
-    render: (text, record, _, action) => [
-      <a
-        key="editable"
-        onClick={() => {
-          action?.startEditable?.(record.id);
-        }}
-      >
-        编辑
-      </a>,
-      <a href={record.url} target="_blank" rel="noopener noreferrer" key="view">
-        查看
-      </a>,
-      <TableDropdown
-        key="actionGroup"
-        onSelect={() => action?.reload()}
-        menus={[
-          { key: 'copy', name: '复制' },
-          { key: 'delete', name: '删除' },
-        ]}
-      />,
-    ],
+    width: 150,
+    render: (text, record) => {
+      console.log(JSON.stringify(record));
+      return [
+        <CommunicationHistoryModal
+          key={'communicationHistory'}
+          clientId={record.id}
+        />,
+        <ClientDrawer
+          key={'detail'}
+          record={record}
+          optType={'detail'}
+        ></ClientDrawer>,
+        <ClientDrawer
+          key={'edit'}
+          record={record}
+          optType={'edit'}
+        ></ClientDrawer>,
+      ];
+    },
   },
 ];
 export default () => {
+  const [messageApi, contextHolder] = message.useMessage();
   const actionRef = useRef<ActionType>();
   return (
-    <ProTable<GithubIssueItem>
-      columns={columns}
-      actionRef={actionRef}
-      cardBordered
-      request={async (params, sort, filter) => {
-        console.log(sort, filter);
-        await waitTime(2000);
-        return request<{
-          data: GithubIssueItem[];
-        }>('https://proapi.azurewebsites.net/github/issues', {
-          params,
-        });
-      }}
-      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"
-      search={{
-        labelWidth: 'auto',
-      }}
-      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={() => [
-        <Button
-          key="button"
-          icon={<PlusOutlined />}
-          onClick={() => {
-            actionRef.current?.reload();
-          }}
-          type="primary"
-        >
-          新建
-        </Button>,
-        <Dropdown
-          key="menu"
-          menu={{
-            items: [
-              {
-                label: '1st item',
-                key: '1',
-              },
-              {
-                label: '2nd item',
-                key: '1',
-              },
-              {
-                label: '3rd item',
-                key: '1',
-              },
-            ],
-          }}
-        >
-          <Button>
-            <EllipsisOutlined />
-          </Button>
-        </Dropdown>,
-      ]}
-    />
+    <>
+      <ProTable
+        columns={columns}
+        actionRef={actionRef}
+        cardBordered
+        request={async (params) => {
+          const res = await postAdminClientQueryClientPage({
+            data: {
+              ...params,
+            },
+          });
+          const data = res.data;
+          return data;
+        }}
+        search={{
+          defaultCollapsed: false,
+          optionRender: (searchConfig, formProps, dom) => [
+            ...dom.reverse(),
+            <Button
+              key="out"
+              onClick={() => {
+                const values = searchConfig?.form?.getFieldsValue();
+                messageApi.open({
+                  type: 'loading',
+                  content: '导出中...',
+                  duration: 0,
+                });
+                orderExport(
+                  '/api/admin/client/exportClients',
+                  '客户信息.xlsx',
+                  'POST',
+                  values,
+                  () => {
+                    messageApi.destroy();
+                  },
+                );
+              }}
+            >
+              导出
+            </Button>,
+          ],
+        }}
+        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={() => [
+          <ClientDrawer optType={'add'} key="button"></ClientDrawer>,
+          <ClientImportModal key="import" />,
+        ]}
+      />
+      {contextHolder}
+    </>
   );
 };
@@ -3,7 +3,6 @@ import {
   postCanrdApiUserAddressList,
   postCanrdApiUserDetail,
   postCanrdApiUserNowMoneyCheck,
-  postDistrictAddOrderAndProvince,
   postDistrictSelectByLevel,
   postDistrictSelectByNameAndLevel,
   postDistrictSelOrderProvince,
@@ -877,21 +876,12 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           if (typeof values.erpCustomerId !== 'string') {
             values.erpCustomerId = values.erpCustomerId?.id;
           }
-
+          values.province = province;
+          values.city = city;
+          values.district = district;
           //新增
           if (optType('add') || optType('copy')) {
             res = await postServiceOrderAddOrder({ data: values });
-            if (res && res.data.length === 2) {
-              const orderMainProDo = {
-                oId: res.data[0],
-                province: province,
-                city: city,
-                district: district,
-              };
-              await postDistrictAddOrderAndProvince({
-                data: orderMainProDo,
-              });
-            }
           }
           //修改或者申请售后或者申请修改
           if (
@@ -915,6 +905,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             values.deleteSubOrderLists = diff;
             if (optType('edit')) {
+              values.province = province;
+              values.city = city;
+              values.district = district;
               res = await postServiceOrderUpdateOrder({ data: values });
             }
@@ -1134,14 +1127,20 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               const resp = await postDistrictSelOrderProvince({
                 data: form.getFieldValue('id'),
               });
-              console.log();
-
-              setProvince(resp.data.province);
-              form.setFieldValue('province', resp.data.province);
-              setCity(resp.data.city);
-              form.setFieldValue('city', resp.data.city);
-              setDistrict(resp.data.district);
-              form.setFieldValue('district', resp.data.district);
+              if (resp && resp.data) {
+                if (resp.data.province) {
+                  setProvince(resp.data.province);
+                  form.setFieldValue('province', resp.data.province);
+                }
+                if (resp.data.city) {
+                  setCity(resp.data.city);
+                  form.setFieldValue('city', resp.data.city);
+                }
+                if (resp.data.district) {
+                  setDistrict(resp.data.district);
+                  form.setFieldValue('district', resp.data.district);
+                }
+              }
               console.log(form.getFieldsValue());
             }
             //判断如果是在修改或者复制，那么第一次请求的时候，默认生成当前收货人信息的option
@@ -1228,7 +1227,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               labelInValue: true,
             }}
             onChange={(value) => {
+              console.log(value);
+
               if (value !== undefined || value !== null) {
+                console.log('setProvince');
+
                 setProvince(value?.value);
               }
             }}
@@ -1273,8 +1276,31 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               },
             ]}
             request={async () => {
+              let cityOptions = [];
+              console.log(form.getFieldValue('id'));
+              if (form.getFieldValue('id')) {
+                const resp = await postDistrictSelOrderProvince({
+                  data: form.getFieldValue('id'),
+                });
+                if (
+                  resp.data.province !== null &&
+                  resp.data.province !== undefined
+                ) {
+                  console.log('province is ok');
+                  let res = await postDistrictSelectByNameAndLevel({
+                    data: { district: resp.data.province, level: 1 },
+                  });
+                  if (res && res.data) {
+                    cityOptions = res.data.map((item) => ({
+                      value: item.district,
+                      label: item.district,
+                    }));
+                  }
+                }
+              }
               if (province !== '') {
-                let cityOptions = [];
+                console.log(province);
+                console.log('province is okk');
                 let res = await postDistrictSelectByNameAndLevel({
                   data: { district: province, level: 1 },
                 });
@@ -1284,9 +1310,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     label: item.district,
                   }));
                 }
-                return cityOptions;
               }
-              return [];
+              return cityOptions;
             }}
           />
           <ProFormSelect
@@ -1312,10 +1337,24 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               },
             ]}
             request={async () => {
-              console.log(form.getFieldsValue());
-
+              let districtOptions = [];
+              if (form.getFieldValue('id')) {
+                const resp = await postDistrictSelOrderProvince({
+                  data: form.getFieldValue('id'),
+                });
+                if (resp.data.city !== null && resp.data.city !== undefined) {
+                  let res = await postDistrictSelectByNameAndLevel({
+                    data: { district: resp.data.city, level: 2 },
+                  });
+                  if (res && res.data) {
+                    districtOptions = res.data.map((item) => ({
+                      value: item.district,
+                      label: item.district,
+                    }));
+                  }
+                }
+              }
               if (city !== '') {
-                let districtOptions = [];
                 let res = await postDistrictSelectByNameAndLevel({
                   data: { district: city, level: 2 },
                 });
@@ -1325,9 +1364,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     label: item.district,
                   }));
                 }
-                return districtOptions;
               }
-              return [];
+              return districtOptions;
             }}
           />
         </div>
 import {
   getOrderErpOrderZoNingSelectAll,
-  getOrderErpOrderZoNingSelectUserAll,
   postOrderErpOrderZoNingSelectSaleUserByProvince,
   postServiceOrderQueryReportFormsInformation,
   postServiceOrderQuerySalesCode,
@@ -66,7 +65,7 @@ const OrderReportPage = () =&gt; {
     setLoading(true);
     let body = {
       statisticsMethod: '',
-      salesCode: [null],
+      // salesCode: [null],
       productBelongBusiness: form.getFieldValue('productBelongBusiness'),
       maxAccount: form.getFieldValue('maxAccount'),
       includeExperimentalEquipment: form.getFieldValue(
@@ -77,14 +76,14 @@ const OrderReportPage = () =&gt; {
     };
     // console.log(form.getFieldValue('zoning').value);
-    let res = await getOrderErpOrderZoNingSelectUserAll();
-    if (res && res.data) {
-      let safeUserList = [];
-      res.data.forEach((element) => {
-        safeUserList.push(element.userName);
-      });
-      body = { ...body, salesCode: safeUserList };
-    }
+    // let res = await getOrderErpOrderZoNingSelectUserAll();
+    // if (res && res.data) {
+    //   let safeUserList = [];
+    //   res.data.forEach((element) => {
+    //     safeUserList.push(element.userName);
+    //   });
+    //   body = { ...body, salesCode: safeUserList };
+    // }
     if (form.getFieldValue('salesCode')) {
       body = { ...body, salesCode: [form.getFieldValue('salesCode')] };
     }
@@ -58,6 +58,7 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -609,6 +610,77 @@ export const postAdminClientModifyClientComunicationInfo =
     return request;
   })();
+/** @description request parameter type for postAdminClientModifyClientInfo */
+export interface PostAdminClientModifyClientInfoOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: AdminClientDto;
+  };
+}
+
+/** @description response type for postAdminClientModifyClientInfo */
+export interface PostAdminClientModifyClientInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientModifyClientInfoResponseSuccess =
+  PostAdminClientModifyClientInfoResponse[200];
+/**
+ * @description
+ *   修改跟进信息
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientModifyClientInfo = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/modifyClientInfo';
+  function request(
+    option: PostAdminClientModifyClientInfoOption,
+  ): Promise<PostAdminClientModifyClientInfoResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientModifyClientInfoResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postAdminClientQueryClientComunicationInfo */
 export interface PostAdminClientQueryClientComunicationInfoOption {
   /**
@@ -3093,9 +3165,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -3116,9 +3186,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';
@@ -3142,9 +3212,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3170,9 +3238,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__ */ (() => {
@@ -3197,9 +3265,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3225,9 +3291,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__ */ (() => {
@@ -3252,9 +3318,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3275,9 +3339,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';
@@ -3301,9 +3365,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3324,9 +3386,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__ */ (() => {
@@ -3351,9 +3413,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3374,9 +3434,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__ */ (() => {
@@ -3401,9 +3461,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -3424,9 +3482,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__ */ (() => {