feat(user-management): add user management routes and components

- Introduce new routes for user management including authority and role management. - Add corresponding component views for user management features. - Refactor definition.ts to include new types and interfaces for client and company info. - Update OrderPrint and ZoNing components with new functionalities. - Modify table.tsx and modal.tsx in ZoNing components to support user and province selection.

feat(user-management): add user management routes and components
- Introduce new routes for user management including authority and role management. - Add corresponding component views for user management features. - Refactor definition.ts to include new types and interfaces for client and company info. - Update OrderPrint and ZoNing components with new functionalities. - Modify table.tsx and modal.tsx in ZoNing components to support user and province selection.
曾国涛
1 parent b4ce1862
Showing 11 changed files with 1688 additions and 132 deletions
.umirc.ts
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/index.tsx
src/pages/User/ZoNing/components/constant.tsx
src/pages/User/ZoNing/components/modal.tsx
src/pages/User/ZoNing/components/table.tsx
src/pages/User/ZoNing/index.css
src/pages/User/ZoNing/index.less
src/pages/User/ZoNing/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -99,6 +99,22 @@ export default defineConfig({
       component: './OrderPrint',
       layout: false,
     },
+    /*{
+      name: '用户管理',
+      path: '/user',
+      routes:[
+        {
+          name: '权限管理',
+          path: 'authrity',
+          icon: 'BookOutlined',
+          component: './Instalment' },
+        {
+          name: '角色管理',
+          path: 'role',
+          icon: 'BookOutlined',
+          component: './User/ZoNing' },
+      ]
+    },*/
   ],
   npmClient: 'pnpm',
@@ -20,10 +20,10 @@ import {
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
-import { Button, Divider, Form, Tag } from 'antd';
+import { Button, Divider, Form } from 'antd';
 import { useEffect } from 'react';
-export default ({ dataList, mainOrder, setVisible, onClose }) => {
+export default ({ dataList, setVisible, onClose }) => {
   // let subOrderIds = dataList?.map((item) => {
   //   return item.id;
   // });
@@ -38,7 +38,7 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
           console.log('resize!');
         },
         maxWidth: window.innerWidth * 0.8,
-        minWidth: 400,
+        minWidth: 500,
       }}
       form={form}
       autoFocusFirstInput
@@ -88,18 +88,6 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
           <ProFormText readonly={true} name="value" label="" />
         </ProFormGroup>
       </ProFormList>
-      <ProFormText
-        rules={[
-          {
-            required: true,
-          },
-        ]}
-        width="md"
-        name="partyAName"
-        label="购方名称"
-        initialValue={mainOrder.institution}
-        placeholder="请输入名称"
-      />
       <ProFormSelect
         key="key"
         label="购方名称"
@@ -114,19 +102,13 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
         fieldProps={{
           optionItemRender(item) {
             if (item.type === 'add') {
-              return (
-                <>
-                  <Tag key={item.name}>{item.name}</Tag>
-                  <Divider type="vertical" />
-                  <Tag key={item.id}>新增</Tag>
-                </>
-              );
+              return <>{item.name}</>;
             }
             return (
               <>
-                <Tag key={item.name}>{item.name}</Tag>
+                {item.name}
                 <Divider type="vertical" />
-                <Tag key={item.taxId}>{item.taxId}</Tag>
+                {item.taxId}
               </>
             );
           },
@@ -135,7 +117,10 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
         request={async (value) => {
           const keywords = value.keyWords;
           const res = await postServiceInvoiceQueryCompanyInfo({
-            data: { nameLike: keywords },
+            data: {
+              nameLike: keywords,
+              taxIdIsNotNull: true,
+            },
           });
           let options = res?.data?.map((company) => {
             return {
@@ -159,7 +144,6 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
           return options;
         }}
       />
-      ,
       <ProFormText
         width="md"
         name="partyATaxid"
@@ -1311,12 +1311,12 @@ const OrderPage = () =&gt; {
                   setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
                 }}
               >
-                加急审核
+                加急审核（新）
               </Button>
             ) : (
               ''
             )}
-            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
+            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING_old') ? (
               <Button
                 className="p-0"
                 type="link"
@@ -1394,13 +1394,13 @@ const OrderPage = () =&gt; {
                   setReissueVisible(true);
                 }}
               >
-                重新开票
+                重新开票（新）
               </Button>
             ) : (
               ''
             )}
-            {optRecord.subPath?.includes('confirmReissue') ? (
+            {optRecord.subPath?.includes('confirmReissue_old') ? (
               <Button
                 className="p-0"
                 type="link"
@@ -1427,7 +1427,7 @@ const OrderPage = () =&gt; {
                   setOrderCheckType(CHECK_TYPE.CONFIRM_REISSUE);
                 }}
               >
-                重新开票审核
+                重新开票审核（新）
               </Button>
             ) : (
               ''
@@ -1547,7 +1547,7 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {optRecord.subPath?.includes('saleCancelInvoicing') ? (
+            {optRecord.subPath?.includes('saleCancelInvoicing_old') ? (
               <ButtonConfirm
                 className="p-0"
                 title="确认取消申请开票？"
@@ -1572,7 +1572,7 @@ const OrderPage = () =&gt; {
               <ButtonConfirm
                 className="p-0"
                 title="确认取消申请开票？"
-                text="取消申请"
+                text="取消申请（新）"
                 onConfirm={async () => {
                   let res = await postServiceInvoiceCancelApply({
                     data: {
@@ -1803,23 +1803,6 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {/*{optRecord.subPath?.includes('applyInvoicing') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  setApplyForInvoicingVisible(true);
-                  createOptObject(optRecord.id, record.id);
-                  setIsEdit(false);
-                  setIsMainOrder(false);
-                }}
-              >
-                申请开票
-              </Button>
-            ) : (
-              ''
-            )}*/}
-
             {optRecord.subPath?.includes('applyInvoicing') ? (
               <Button
                 className="p-0"
@@ -1831,13 +1814,13 @@ const OrderPage = () =&gt; {
                   setIsMainOrder(false);
                 }}
               >
-                申请开票
+                申请开票（新）
               </Button>
             ) : (
               ''
             )}
-            {optRecord.subPath?.includes('applyInvoicing') ? (
+            {optRecord.subPath?.includes('applyInvoicing_old') ? (
               <Button
                 className="p-0"
                 type="link"
@@ -2720,12 +2703,12 @@ const OrderPage = () =&gt; {
                         setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
                       }}
                     >
-                      加急审核
+                      加急审核（新）
                     </Button>
                   ) : (
                     ''
                   )}
-                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
+                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING_old') ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -2870,7 +2853,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('confirmReissue') ? (
+                  {record.mainPath?.includes('confirmReissue_old') ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -2898,7 +2881,7 @@ const OrderPage = () =&gt; {
                         setReissueVisible(true);
                       }}
                     >
-                      重新开票
+                      重新开票（新）
                     </Button>
                   ) : (
                     ''
@@ -2915,7 +2898,7 @@ const OrderPage = () =&gt; {
                         setOrderCheckType(CHECK_TYPE.CONFIRM_REISSUE);
                       }}
                     >
-                      重新开票审核
+                      重新开票审核（新）
                     </Button>
                   ) : (
                     ''
@@ -3334,7 +3317,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('applyInvoicing') ? (
+                  {record.mainPath?.includes('applyInvoicing_old') ? (
                     <Button
                       type="link"
                       className="p-0"
@@ -3402,7 +3385,7 @@ const OrderPage = () =&gt; {
                         setIsMainOrder(false);
                       }}
                     >
-                      申请开票
+                      申请开票（新）
                     </Button>
                   ) : (
                     ''
@@ -3610,7 +3593,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('saleCancelInvoicing') ? (
+                  {record.mainPath?.includes('saleCancelInvoicing_old') ? (
                     <ButtonConfirm
                       className="p-0"
                       title="确认取消申请开票？"
+import { List } from 'lodash';
+
+export type zoningItem = {
+  id?: number; //id
+  zoning: string; //区域名称
+  orderProvinceVoList: List<provinceItem>; //所包含的省份列表
+  orderUserVoList: List<userItem>; //所包含的销售列表
+};
+
+export type zoningShowItem = {
+  id?: number; //id
+  zoning: string; //区域名称
+  orderProvinceShowList: string; //所包含的省份列表
+  orderUserShowList: string; //所包含的销售列表
+  orderUserNumberShowList: number[]; //销售对应的uId
+};
+
+export type provinceItem = {
+  pId?: number;
+  province: string;
+};
+
+export type userItem = {
+  uId: number;
+  userName?: string;
+};
+
+export const provinceEnum = {
+  全选: '全选',
+  北京市: '北京市',
+  天津市: '天津市',
+  河北省: '河北省',
+  山西省: '山西省',
+  内蒙古自治区: '内蒙古自治区',
+  辽宁省: '辽宁省',
+  吉林省: '吉林省',
+  黑龙江省: '黑龙江省',
+  上海市: '上海市',
+  江苏省: '江苏省',
+  浙江省: '浙江省',
+  安徽省: '安徽省',
+  福建省: '福建省',
+  江西省: '江西省',
+  山东省: '山东省',
+  河南省: '河南省',
+  湖北省: '湖北省',
+  湖南省: '湖南省',
+  广东省: '广东省',
+  广西壮族自治区: '广西壮族自治区',
+  海南省: '海南省',
+  重庆市: '重庆市',
+  四川省: '四川省',
+  贵州省: '贵州省',
+  云南省: '云南省',
+  西藏自治区: '西藏自治区',
+  陕西省: '陕西省',
+  甘肃省: '甘肃省',
+  青海省: '青海省',
+  宁夏回族自治区: '宁夏回族自治区',
+  新疆维吾尔自治区: '新疆维吾尔自治区',
+  台湾省: '台湾省',
+  香港特别行政区: '香港特别行政区',
+  澳门特别行政区: '澳门特别行政区',
+};
+import {
+  getOrderErpOrderZoNingSelectUserAll,
+  postOrderErpOrderZoNingSaveOrUpdate,
+} from '@/services';
+import { PlusOutlined } from '@ant-design/icons';
+import {
+  ModalForm,
+  ProForm,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { provinceEnum, zoningItem } from './constant';
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+export default ({ toReload, option, needEditBody }) => {
+  const [form] = Form.useForm<zoningItem>();
+
+  return (
+    <ModalForm<{
+      zoning: string;
+      province: string[];
+      user: number[];
+    }>
+      title={option}
+      trigger={
+        <Button type="primary" key={option.id}>
+          {option !== '编辑' && <PlusOutlined />}
+          {option}
+        </Button>
+      }
+      form={form}
+      autoFocusFirstInput
+      initialValues={{
+        zoning: needEditBody.zoning ? needEditBody.zoning : '',
+        province: needEditBody.orderProvinceShowList
+          ? needEditBody.orderProvinceShowList.split('、')
+          : [],
+        user: needEditBody.orderUserNumberShowList
+          ? needEditBody.orderUserNumberShowList
+          : [],
+      }}
+      modalProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={500}
+      onFinish={async (values) => {
+        console.log(values);
+        const orderProvinceList = values.province.map((item) => {
+          return { province: item };
+        });
+        const orderUserList = values.user.map((item) => {
+          return { uId: item };
+        });
+        const fetchData: zoningItem = {
+          zoning: values.zoning,
+          orderProvinceVoList: orderProvinceList,
+          orderUserVoList: orderUserList,
+        };
+        let res = await postOrderErpOrderZoNingSaveOrUpdate({
+          data: fetchData,
+        });
+        if (res) {
+          console.log(res);
+          await waitTime(500);
+          console.log(values);
+          message.success('提交成功');
+          toReload();
+          return true;
+        }
+        return false;
+      }}
+    >
+      <ProForm.Group>
+        <ProFormText
+          width="lg"
+          name="zoning"
+          label="区域名称"
+          placeholder="请输入"
+          rules={[{ required: true, message: '此项为必填项' }]}
+        />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormSelect
+          name="user"
+          width="lg"
+          label="负责销售"
+          request={async () => {
+            const userList = await getOrderErpOrderZoNingSelectUserAll();
+            if (userList) {
+              let userSelList = [];
+              userList.data.forEach((item: { uId: any; userName: any }) =>
+                userSelList.push({
+                  value: item.uId,
+                  label: item.userName,
+                }),
+              );
+              userSelList.unshift({
+                value: 0,
+                label: '全选',
+              });
+              return userSelList;
+            }
+            return [];
+          }}
+          fieldProps={{
+            mode: 'multiple',
+          }}
+          placeholder="请选择"
+          rules={[
+            {
+              required: true,
+              message: '请选择!',
+              type: 'array',
+            },
+          ]}
+        />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormSelect
+          name="province"
+          width="lg"
+          label="管辖地区"
+          valueEnum={provinceEnum}
+          fieldProps={{
+            mode: 'multiple',
+          }}
+          placeholder="请选择"
+          rules={[
+            {
+              required: true,
+              message: '请选择!',
+              type: 'array',
+            },
+          ]}
+        />
+      </ProForm.Group>
+    </ModalForm>
+  );
+};
+import {
+  deleteOrderErpOrderZoNingDelete,
+  getOrderErpOrderZoNingSelectAll,
+} from '@/services';
+import type { ProColumns } from '@ant-design/pro-components';
+import { EditableProTable } from '@ant-design/pro-components';
+import { Button, Popconfirm, PopconfirmProps, message } from 'antd';
+import React, { useRef, useState } from 'react';
+import '../index.less';
+import { zoningItem, zoningShowItem } from './constant';
+import Modal from './modal';
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+function changeToShow(array: zoningItem[]) {
+  console.log(JSON.parse(localStorage.getItem('userInfo')).username);
+  const showArray: zoningShowItem[] = array.map((item) => {
+    let orderProvinceShowList = '';
+    let orderUserShowList = '';
+    let orderUserNumberShowList: number[] = [];
+    item.orderProvinceVoList.forEach((element, index) => {
+      orderProvinceShowList += element.province;
+      if (index < item.orderProvinceVoList.length - 1) {
+        orderProvinceShowList += '、';
+      }
+    });
+
+    item.orderUserVoList.forEach((event, index) => {
+      orderUserShowList += event.userName;
+      orderUserNumberShowList.push(event.uId);
+      if (index < item.orderUserVoList.length - 1) {
+        orderUserShowList += '、';
+      }
+    });
+
+    if (orderUserShowList === '') {
+      orderUserShowList = '全选';
+      orderUserNumberShowList.push(0);
+    }
+
+    return {
+      id: item.id,
+      zoning: item.zoning,
+      orderProvinceShowList,
+      orderUserShowList,
+      orderUserNumberShowList,
+    };
+  });
+  return showArray;
+}
+
+export default () => {
+  const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
+  const [dataSource, setDataSource] = useState<readonly zoningItem[]>([]);
+  const [position] = useState<'top' | 'bottom' | 'hidden'>('hidden');
+
+  interface ActionType {
+    reload: (resetPageIndex?: boolean) => void;
+    reloadAndRest: () => void;
+    reset: () => void;
+    clearSelected?: () => void;
+    startEditable: (rowKey: Key) => boolean;
+    cancelEditable: (rowKey: Key) => boolean;
+  }
+
+  const ref = useRef<ActionType>({
+    reload: () => {},
+    reloadAndRest: () => {},
+    reset: () => {},
+    startEditable: () => {},
+    cancelEditable: () => {},
+  });
+
+  function reload() {
+    ref.current.reload();
+  }
+
+  const confirm: PopconfirmProps['onConfirm'] = async (id) => {
+    await deleteOrderErpOrderZoNingDelete({
+      data: id,
+    });
+    reload();
+    message.success('删除成功');
+  };
+
+  const cancel: PopconfirmProps['onCancel'] = () => {
+    message.error('取消删除');
+  };
+
+  const columns: ProColumns<zoningItem>[] = [
+    {
+      title: '区域名称',
+      dataIndex: 'zoning',
+      width: 200,
+    },
+    {
+      title: '管辖省份',
+      dataIndex: 'orderProvinceShowList',
+      readonly: true,
+      width: 600,
+    },
+    {
+      title: '负责销售',
+      key: 'state',
+      dataIndex: 'orderUserShowList',
+      valueType: 'select',
+      width: 200,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (text, record) => [
+        <>
+          <Modal
+            toReload={reload}
+            option={'编辑'}
+            needEditBody={record}
+            key={record.id}
+          />
+          <Popconfirm
+            title="删除此项"
+            description="你确定你要删除此项吗?"
+            onConfirm={() => {
+              confirm(record.id);
+            }}
+            onCancel={cancel}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button>删除</Button>
+          </Popconfirm>
+        </>,
+      ],
+    },
+  ];
+
+  return (
+    <EditableProTable<zoningItem>
+      rowKey="id"
+      className="table-index"
+      deletePopconfirmMessage
+      actionRef={ref}
+      headerTitle={
+        <Modal toReload={reload} option={'新增区域'} needEditBody={{}}></Modal>
+      }
+      maxLength={5}
+      scroll={{
+        x: 960,
+      }}
+      recordCreatorProps={
+        position !== 'hidden'
+          ? {
+              position: position as 'top',
+              record: () => ({ id: (Math.random() * 1000000).toFixed(0) }),
+            }
+          : false
+      }
+      loading={false}
+      columns={columns}
+      request={async () => {
+        const res = await getOrderErpOrderZoNingSelectAll();
+        if (res) {
+          const initDataSource = changeToShow(res.data);
+          return { data: initDataSource || [] };
+        }
+      }}
+      value={dataSource}
+      onChange={setDataSource}
+      editable={{
+        type: 'multiple',
+        editableKeys,
+        onSave: async (rowKey, data, row) => {
+          console.log(rowKey, data, row);
+          await waitTime(2000);
+        },
+        onChange: setEditableRowKeys,
+      }}
+    />
+  );
+};
+.item {
+  background: '#0092ff';
+  padding: '8px 0';
+  display: flex;
+  flex-flow: row nowrap;
+  align-content: normal;
+  align-items: center;
+  padding-bottom: 20px;
+}
+
+.table-index td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 14px;
+}
+.item {
+  background: '#0092ff';
+  padding: '8px 0';
+  display: flex;
+  flex-flow: row nowrap;
+  // flex-direction: row;
+  // flex-wrap: nowrap;
+  align-content: normal;
+  align-items: center;
+  padding-bottom: 20px;
+}
+
+.table-index td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 14px;
+}
+import Table from './components/table';
+const instalment_contect: React.FC = () => (
+  <>
+    <Table></Table>
+  </>
+);
+
+export default instalment_contect;
@@ -83,6 +83,117 @@ export interface AdminAuthUserVO {
   userId?: number;
 }
+export interface AdminClientDto {
+  /**
+   * @description
+   *   市
+   */
+  city?: string;
+  /**
+   * @description
+   *   单位地址
+   */
+  companyAddress?: string;
+  /**
+   * @description
+   *   单位地址
+   */
+  companyAddressText?: string;
+  companyId?: string;
+  /**
+   * @description
+   *   单位名称
+   */
+  companyName?: string;
+  contacts?: string;
+  createBy?: string;
+  /** @format date-time */
+  createTime?: string;
+  /**
+   * @description
+   *   区
+   */
+  district?: string;
+  /** @format int32 */
+  enableFlag?: number;
+  /**
+   * @description
+   *   是否已报方案
+   */
+  hasScheme?: boolean;
+  hasSchemeText?: string;
+  /** @format int64 */
+  id?: number;
+  /** @format date-time */
+  latestCommunicationTime?: string;
+  /**
+   * @description
+   *   客户等级
+   */
+  level?: string;
+  /**
+   * @description
+   *   客户等级
+   */
+  levelText?: string;
+  modifyBy?: string;
+  /** @format date-time */
+  modifyTime?: string;
+  /**
+   * @description
+   *   名称
+   */
+  name?: string;
+  /**
+   * @description
+   *   备注
+   */
+  notes?: string;
+  /**
+   * @description
+   *   电话号码
+   */
+  phoneNumber?: string;
+  /**
+   * @description
+   *   省
+   */
+  province?: string;
+  /**
+   * @description
+   *   报价时间
+   * @format date-time
+   */
+  quoteDatetime?: string;
+  /**
+   * @description
+   *   推荐人
+   */
+  referrers?: string;
+  /**
+   * @description
+   *   需求
+   */
+  requirements?: string;
+  /**
+   * @description
+   *   来源
+   */
+  source?: string;
+  /**
+   * @description
+   *   跟进状态
+   */
+  tradeStatus?: string;
+  /**
+   * @description
+   *   跟进状态
+   */
+  tradeStatusText?: string;
+  /** @format int32 */
+  version?: number;
+}
+
 export interface AdminDeptQueryVO {
   /** @format int32 */
   current?: number;
@@ -916,6 +1027,50 @@ export interface CommonAuditRequest {
   type?: string;
 }
+export interface CompanyInfoDto {
+  address?: string;
+  bank?: string;
+  bankAccount?: string;
+  /**
+   * @description
+   *   创建字段的用户的名字
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   创建时间
+   * @format date-time
+   */
+  createTime?: string;
+  /** @format int64 */
+  id?: number;
+  /**
+   * @description
+   *   逻辑删除 默认为1表示未删除，为0表示已经删除
+   */
+  logicDelete?: boolean;
+  name?: string;
+  phoneNumber?: string;
+  taxId?: string;
+  /**
+   * @description
+   *   更新字段的用户的名字
+   */
+  updateByName?: string;
+  /**
+   * @description
+   *   更新时间
+   * @format date-time
+   */
+  updateTime?: string;
+  /**
+   * @description
+   *   版本号
+   * @format int32
+   */
+  version?: number;
+}
+
 export interface Contactperson {
   birthday?: string;
   contactAddress?: string;
@@ -2421,7 +2576,7 @@ export interface QueryClientDto {
   current?: number;
   /** @format int32 */
   end?: number;
-  hasScheme?: string;
+  hasScheme?: boolean;
   level?: string;
   namelike?: string;
   /** @format int32 */
@@ -2434,6 +2589,27 @@ export interface QueryClientDto {
   tradeStatus?: string;
 }
+export interface QueryCommunicationInfoDto {
+  /** @format int64 */
+  clientId?: number;
+  content?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format date-time */
+  datetime?: string;
+  /** @format int32 */
+  end?: number;
+  /** @format int64 */
+  id?: number;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+  way?: string;
+}
+
 export interface QueryCustomerInformationDto {
   /**
    * @description
@@ -3518,50 +3694,40 @@ export interface ApiOrderConfirmReceiveRequest {
   subOrderIds?: Array<number>;
 }
-export interface CompanyInfo {
-  address?: string;
-  addressLike?: string;
-  bank?: string;
-  bankAccount?: string;
+export interface ClientCommunicationInfo {
+  /** @format int64 */
+  clientId?: number;
   /**
    * @description
-   *   创建字段的用户的名字
+   *   内容
    */
+  content?: string;
   createByName?: string;
+  /** @format date-time */
+  createTime?: string;
   /**
    * @description
-   *   创建时间
+   *   跟进时间
    * @format date-time
    */
-  createTime?: string;
+  datetime?: string;
   /** @format int64 */
   id?: number;
-  /**
-   * @description
-   *   逻辑删除 默认为1表示未删除，为0表示已经删除
-   */
   logicDelete?: boolean;
-  name?: string;
-  nameLike?: string;
-  phoneNumber?: string;
-  taxId?: string;
-  /**
-   * @description
-   *   更新字段的用户的名字
-   */
   updateByName?: string;
-  /**
-   * @description
-   *   更新时间
-   * @format date-time
-   */
+  /** @format date-time */
   updateTime?: string;
   /**
    * @description
-   *   版本号
-   * @format int32
+   *   方式
    */
-  version?: number;
+  way?: string;
+}
+
+export interface CompanyInfo {
+  addressLike?: string;
+  nameLike?: string;
+  taxIdIsNotNull?: boolean;
 }
 export interface TsgFile {
@@ -6,6 +6,7 @@ import { request as requester } from &#39;umi&#39;;
 import type {
   AdminAuthRoleVO,
   AdminAuthUserVO,
+  AdminClientDto,
   AdminDeptQueryVO,
   AdminDeptVO,
   AdminJobQueryVO,
@@ -35,8 +36,10 @@ import type {
   CancelInvoiceAndBankStatementDto,
   CancelSendOrderDto,
   CaptchaMessageVO,
+  ClientCommunicationInfo,
   CommonAuditRequest,
   CompanyInfo,
+  CompanyInfoDto,
   CustomFieldRes,
   CustomerCustomerListReq,
   CustomerDetailDto,
@@ -59,7 +62,6 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -84,6 +86,7 @@ import type {
   QueryAnnexDto,
   QueryBankStatementDto,
   QueryClientDto,
+  QueryCommunicationInfoDto,
   QueryCustomerInformationDto,
   QueryHistoryRecordDto,
   QueryInvoiceDetailDto,
@@ -130,6 +133,631 @@ import type {
   UserNowMoneyCheckRequest,
 } from './definition';
+/** @description request parameter type for postAdminClientAddAdminClient */
+export interface PostAdminClientAddAdminClientOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: AdminClientDto;
+  };
+}
+
+/** @description response type for postAdminClientAddAdminClient */
+export interface PostAdminClientAddAdminClientResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientAddAdminClientResponseSuccess =
+  PostAdminClientAddAdminClientResponse[200];
+/**
+ * @description
+ *   添加客户
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientAddAdminClient = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/addAdminClient';
+  function request(
+    option: PostAdminClientAddAdminClientOption,
+  ): Promise<PostAdminClientAddAdminClientResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientAddAdminClientResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postAdminClientAddClientComunicationInfo */
+export interface PostAdminClientAddClientComunicationInfoOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryCommunicationInfoDto;
+  };
+}
+
+/** @description response type for postAdminClientAddClientComunicationInfo */
+export interface PostAdminClientAddClientComunicationInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientAddClientComunicationInfoResponseSuccess =
+  PostAdminClientAddClientComunicationInfoResponse[200];
+/**
+ * @description
+ *   添加跟进信息
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientAddClientComunicationInfo = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/addClientComunicationInfo';
+  function request(
+    option: PostAdminClientAddClientComunicationInfoOption,
+  ): Promise<PostAdminClientAddClientComunicationInfoResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientAddClientComunicationInfoResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postAdminClientAddOrModifyClientComunicationInfo */
+export interface PostAdminClientAddOrModifyClientComunicationInfoOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ClientCommunicationInfo;
+  };
+}
+
+/** @description response type for postAdminClientAddOrModifyClientComunicationInfo */
+export interface PostAdminClientAddOrModifyClientComunicationInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientAddOrModifyClientComunicationInfoResponseSuccess =
+  PostAdminClientAddOrModifyClientComunicationInfoResponse[200];
+/**
+ * @description
+ *   修改跟进信息
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientAddOrModifyClientComunicationInfo =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/admin/client/addOrModifyClientComunicationInfo';
+    function request(
+      option: PostAdminClientAddOrModifyClientComunicationInfoOption,
+    ): Promise<PostAdminClientAddOrModifyClientComunicationInfoResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostAdminClientAddOrModifyClientComunicationInfoResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
+/** @description response type for postAdminClientDownloadImportTemplate */
+export interface PostAdminClientDownloadImportTemplateResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientDownloadImportTemplateResponseSuccess =
+  PostAdminClientDownloadImportTemplateResponse[200];
+/**
+ * @description
+ *   下载导入模板
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientDownloadImportTemplate = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/downloadImportTemplate';
+  function request(): Promise<PostAdminClientDownloadImportTemplateResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostAdminClientDownloadImportTemplateResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postAdminClientExportClients */
+export interface PostAdminClientExportClientsOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryClientDto;
+  };
+}
+
+/** @description response type for postAdminClientExportClients */
+export interface PostAdminClientExportClientsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientExportClientsResponseSuccess =
+  PostAdminClientExportClientsResponse[200];
+/**
+ * @description
+ *   导出客户信息
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientExportClients = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/exportClients';
+  function request(
+    option: PostAdminClientExportClientsOption,
+  ): Promise<PostAdminClientExportClientsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientExportClientsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postAdminClientImportClient */
+export interface PostAdminClientImportClientOption {
+  /**
+   * @description
+   *   file
+   */
+  formData: {
+    /**
+        @description
+          file */
+    file: File;
+  };
+}
+
+/** @description response type for postAdminClientImportClient */
+export interface PostAdminClientImportClientResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientImportClientResponseSuccess =
+  PostAdminClientImportClientResponse[200];
+/**
+ * @description
+ *   导入客户
+ * @tags 客户管理
+ * @produces *
+ * @consumes multipart/form-data
+ */
+export const postAdminClientImportClient = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/importClient';
+  function request(
+    option: PostAdminClientImportClientOption,
+  ): Promise<PostAdminClientImportClientResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientImportClientResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postAdminClientModifyClientComunicationInfo */
+export interface PostAdminClientModifyClientComunicationInfoOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryCommunicationInfoDto;
+  };
+}
+
+/** @description response type for postAdminClientModifyClientComunicationInfo */
+export interface PostAdminClientModifyClientComunicationInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientModifyClientComunicationInfoResponseSuccess =
+  PostAdminClientModifyClientComunicationInfoResponse[200];
+/**
+ * @description
+ *   修改跟进信息
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientModifyClientComunicationInfo =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/admin/client/modifyClientComunicationInfo';
+    function request(
+      option: PostAdminClientModifyClientComunicationInfoOption,
+    ): Promise<PostAdminClientModifyClientComunicationInfoResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostAdminClientModifyClientComunicationInfoResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    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 {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryCommunicationInfoDto;
+  };
+}
+
+/** @description response type for postAdminClientQueryClientComunicationInfo */
+export interface PostAdminClientQueryClientComunicationInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientQueryClientComunicationInfoResponseSuccess =
+  PostAdminClientQueryClientComunicationInfoResponse[200];
+/**
+ * @description
+ *   获取跟进信息
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientQueryClientComunicationInfo =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/admin/client/queryClientComunicationInfo';
+    function request(
+      option: PostAdminClientQueryClientComunicationInfoOption,
+    ): Promise<PostAdminClientQueryClientComunicationInfoResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostAdminClientQueryClientComunicationInfoResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postAdminClientQueryClientPage */
 export interface PostAdminClientQueryClientPageOption {
   /**
@@ -173,33 +801,107 @@ export interface PostAdminClientQueryClientPageResponse {
   404: any;
 }
-export type PostAdminClientQueryClientPageResponseSuccess =
-  PostAdminClientQueryClientPageResponse[200];
+export type PostAdminClientQueryClientPageResponseSuccess =
+  PostAdminClientQueryClientPageResponse[200];
+/**
+ * @description
+ *   客户管理
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientQueryClientPage = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/queryClientPage';
+  function request(
+    option: PostAdminClientQueryClientPageOption,
+  ): Promise<PostAdminClientQueryClientPageResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientQueryClientPageResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postAdminClientRemoveClientComunicationInfo */
+export interface PostAdminClientRemoveClientComunicationInfoOption {
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  query?: {
+    /**
+        @description
+          id
+        @format int64 */
+    id?: number;
+  };
+}
+
+/** @description response type for postAdminClientRemoveClientComunicationInfo */
+export interface PostAdminClientRemoveClientComunicationInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientRemoveClientComunicationInfoResponseSuccess =
+  PostAdminClientRemoveClientComunicationInfoResponse[200];
 /**
  * @description
- *   客户管理
+ *   删除跟进信息
  * @tags 客户管理
  * @produces *
  * @consumes application/json
  */
-export const postAdminClientQueryClientPage = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/admin/client/queryClientPage';
-  function request(
-    option: PostAdminClientQueryClientPageOption,
-  ): Promise<PostAdminClientQueryClientPageResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostAdminClientQueryClientPageResponseSuccess>;
-  }
+export const postAdminClientRemoveClientComunicationInfo =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/admin/client/removeClientComunicationInfo';
+    function request(
+      option?: PostAdminClientRemoveClientComunicationInfoOption,
+    ): Promise<PostAdminClientRemoveClientComunicationInfoResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostAdminClientRemoveClientComunicationInfoResponseSuccess>;
+    }
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
 /** @description request parameter type for postApiLocalStorageUpload */
 export interface PostApiLocalStorageUploadOption {
@@ -1916,6 +2618,78 @@ export const postDistrictAddOrderAndProvince = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postDistrictFindProvinceAndCityAndDistrict */
+export interface PostDistrictFindProvinceAndCityAndDistrictOption {
+  /**
+   * @description
+   *   str
+   */
+  body: {
+    /**
+        @description
+          str */
+    str: string;
+  };
+}
+
+/** @description response type for postDistrictFindProvinceAndCityAndDistrict */
+export interface PostDistrictFindProvinceAndCityAndDistrictResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostDistrictFindProvinceAndCityAndDistrictResponseSuccess =
+  PostDistrictFindProvinceAndCityAndDistrictResponse[200];
+/**
+ * @description
+ *   读取字符串中的数据
+ * @tags order-district-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postDistrictFindProvinceAndCityAndDistrict =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/district/findProvinceAndCityAndDistrict';
+    function request(
+      option: PostDistrictFindProvinceAndCityAndDistrictOption,
+    ): Promise<PostDistrictFindProvinceAndCityAndDistrictResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostDistrictFindProvinceAndCityAndDistrictResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postDistrictSelOrderProvince */
 export interface PostDistrictSelOrderProvinceOption {
   /**
@@ -2396,7 +3170,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -2417,9 +3193,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -2443,7 +3219,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -2469,9 +3247,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -2496,7 +3274,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -2522,9 +3302,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -2549,7 +3329,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2570,9 +3352,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -2596,7 +3378,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2617,9 +3401,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -2644,7 +3428,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2665,9 +3451,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -2692,7 +3478,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2713,9 +3501,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -7945,6 +8733,78 @@ export const postOrderErpOrderZoNingSelectSaleUserByProvince =
     return request;
   })();
+/** @description request parameter type for postOrderErpOrderZoNingSelectSaleUserHasZoning */
+export interface PostOrderErpOrderZoNingSelectSaleUserHasZoningOption {
+  /**
+   * @description
+   *   id
+   */
+  body: {
+    /**
+        @description
+          id */
+    id: number;
+  };
+}
+
+/** @description response type for postOrderErpOrderZoNingSelectSaleUserHasZoning */
+export interface PostOrderErpOrderZoNingSelectSaleUserHasZoningResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostOrderErpOrderZoNingSelectSaleUserHasZoningResponseSuccess =
+  PostOrderErpOrderZoNingSelectSaleUserHasZoningResponse[200];
+/**
+ * @description
+ *   查询出该销售所在的大区
+ * @tags order-zo-ning-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postOrderErpOrderZoNingSelectSaleUserHasZoning =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/order/erp/orderZoNing/selectSaleUserHasZoning';
+    function request(
+      option: PostOrderErpOrderZoNingSelectSaleUserHasZoningOption,
+    ): Promise<PostOrderErpOrderZoNingSelectSaleUserHasZoningResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostOrderErpOrderZoNingSelectSaleUserHasZoningResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description response type for getOrderErpOrderZoNingSelectUserAll */
 export interface GetOrderErpOrderZoNingSelectUserAllResponse {
   /**
@@ -11017,6 +11877,60 @@ export const postServiceConstCanApplyAfterInvoicingStatus =
     return request;
   })();
+/** @description response type for postServiceConstClientLevels */
+export interface PostServiceConstClientLevelsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstClientLevelsResponseSuccess =
+  PostServiceConstClientLevelsResponse[200];
+/**
+ * @description
+ *   客户等级
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstClientLevels = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/clientLevels';
+  function request(): Promise<PostServiceConstClientLevelsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstClientLevelsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstGetPayeeEnum */
 export interface PostServiceConstGetPayeeEnumResponse {
   /**
@@ -11305,6 +12219,60 @@ export const postServiceConstNotCanModifyInvoiceRecordStatus =
     return request;
   })();
+/** @description response type for postServiceConstTradeStatus */
+export interface PostServiceConstTradeStatusResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstTradeStatusResponseSuccess =
+  PostServiceConstTradeStatusResponse[200];
+/**
+ * @description
+ *   跟进状态
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstTradeStatus = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/tradeStatus';
+  function request(): Promise<PostServiceConstTradeStatusResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstTradeStatusResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for getServiceInvoiceListInvoiceProject */
 export interface GetServiceInvoiceListInvoiceProjectOption {
   /** @format int32 */
@@ -12524,7 +13492,7 @@ export interface PostServiceInvoicePutCompanyInfoOption {
     /**
         @description
           dto */
-    dto: CompanyInfo;
+    dto: CompanyInfoDto;
   };
 }