feat: update地区管理

PurelzMgnead
1 parent c56d1a59
Showing 17 changed files with 748 additions and 1268 deletions
.umirc.ts
src/pages/Instalment/components/comfire/comfire.tsx
src/pages/Instalment/components/detail/detail.tsx
src/pages/Instalment/components/edit/edit.tsx
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
src/pages/Instalment/components/upload/payWayUpload.tsx
src/pages/Instalment/components/upload/uploadApp.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/OrderReport/index.tsx
src/pages/ResearchGroup/components/ImportModal.tsx
src/pages/ResearchGroup/index.css
src/pages/ZoNing/components/constant.tsx
src/pages/ZoNing/components/modal.tsx
src/pages/ZoNing/components/table.tsx
src/pages/ZoNing/index.css
src/pages/ZoNing/index.less
src/services/definition.ts
@@ -84,7 +84,7 @@ export default defineConfig({
       path: '/zoning',
       component: './ZoNing',
       icon: 'BookOutlined',
-      access: 'canReadAdminAndSales',
+      access: 'canReadAdmin',
     },
     {
       name: '打印',
 import { ModalForm } from '@ant-design/pro-components';
-import { Form, message } from 'antd';
+import { Form } from 'antd';
 import { useState } from 'react';
 const waitTime = (time: number = 100) => {
@@ -41,7 +41,6 @@ export default ({ currtDid, sureDelete }) =&gt; {
       onFinish={async () => {
         await waitTime(100);
         sureDelete([ids]);
-        message.success('提交成功');
         return true;
       }}
     >
@@ -207,6 +207,7 @@ export default ({ toReload }) =&gt; {
           payWay: values.payWay || contextBody.payWay,
           annex: contextBody.annex,
           remark: values.remark || contextBody.remark,
+          createByName: null,
         };
         if (values.annex) {
           formData.append('file', values.annex[0].originFileObj as RcFile);
@@ -221,6 +222,9 @@ export default ({ toReload }) =&gt; {
             toSendEdit.annex = res.data;
           }
         }
+        toSendEdit.createByName = JSON.parse(
+          localStorage.getItem('userInfo'),
+        ).username;
         const isSaveOrUpdate = await postOrderErpOrderStagesAdd({
           data: { ...toSendEdit },
         });
@@ -230,31 +234,32 @@ export default ({ toReload }) =&gt; {
           otherBody.forEach((item) => {
             let remakeItem = {
-              ossId: item.ossId,
+              ossId: contextBody.id,
               number: item.id,
               dateRange: item.payDate,
               fileName: item.fileName,
+              fileUrl: item.fileUrl,
             };
-            if (
-              typeof item.fileUrl === 'object' &&
-              item.fileUrl instanceof File
-            ) {
-              const formData = new FormData();
-              formData.append('file', item.fileUrl as RcFile);
-              const uploadPromise = async () => {
-                const res = await postOrderErpOrderStagesUpload({
-                  data: formData,
-                  headers: {
-                    'Content-Type':
-                      'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
-                  },
-                });
-                if (res.data) {
-                  remakeItem.fileUrl = res.data;
-                }
-              };
-              promises.push(uploadPromise());
-            }
+            // if (
+            //   typeof item.fileUrl === 'object' &&
+            //   item.fileUrl instanceof File
+            // ) {
+            //   const formData = new FormData();
+            //   formData.append('file', item.fileUrl as RcFile);
+            //   const uploadPromise = async () => {
+            //     const res = await postOrderErpOrderStagesUpload({
+            //       data: formData,
+            //       headers: {
+            //         'Content-Type':
+            //           'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+            //       },
+            //     });
+            //     if (res.data) {
+            //       remakeItem.fileUrl = res.data;
+            //     }
+            //   };
+            //   promises.push(uploadPromise());
+            // }
             remakeValue.push(remakeItem);
           });
@@ -33,7 +33,6 @@ export default ({ currentContract, toReload }) =&gt; {
   const [total, setTotal] = useState(0);
   const [payWayBody, setPayWayBody] = useState([]);
   const [otherBody, setOtherBody] = useState([]);
-
   type OrderStagesWithListItem = {
     //文件编号
     id: number;
@@ -85,6 +84,7 @@ export default ({ currentContract, toReload }) =&gt; {
   }
   function setSave(value) {
+    console.log(value);
     setOtherBody(value);
   }
@@ -134,18 +134,32 @@ export default ({ currentContract, toReload }) =&gt; {
     }
   };
-  async function getBody() {
-    const res = await postOrderErpOrderStagesSearch({
-      data: { contract: currentContract },
-    });
-    const context = res.data[0];
-
-    if (context.contract !== null) {
-      setContextBody(context);
-      setTotal(context.totalPrice);
-      form.setFieldValue('totalPrice', context.totalPrice);
+  async function getBody(value) {
+    if (value !== null) {
+      const res = await postOrderErpOrderStagesSearch({
+        data: { contract: value },
+      });
+      const context = res.data[0];
+      console.log(context);
+      if (context.contract !== null) {
+        setContextBody(context);
+        setTotal(context.totalPrice);
+        form.setFieldValue('totalPrice', context.totalPrice);
+      }
+      handleInputChange(context.payWay, 0, context.totalPrice);
+    } else {
+      const res = await postOrderErpOrderStagesSearch({
+        data: { contract: currentContract },
+      });
+      const context = res.data[0];
+      console.log(context);
+      if (context.contract !== null) {
+        setContextBody(context);
+        setTotal(context.totalPrice);
+        form.setFieldValue('totalPrice', context.totalPrice);
+      }
+      handleInputChange(context.payWay, 0, context.totalPrice);
     }
-    handleInputChange(context.payWay, 0, context.totalPrice);
   }
   function getEditProductBody(value) {
@@ -157,7 +171,8 @@ export default ({ currentContract, toReload }) =&gt; {
   }
   useEffect(() => {
-    getBody();
+    console.log('1');
+    getBody(null);
   }, []);
   return (
@@ -177,34 +192,35 @@ export default ({ currentContract, toReload }) =&gt; {
         }
         let remakeValue = [];
         const promises = [];
-
+        console.log(otherBody);
         otherBody.forEach((item) => {
           let remakeItem = {
             ossId: contextBody.id,
             number: item.id,
             dateRange: item.payDate,
             fileName: item.fileName,
+            fileUrl: item.fileUrl,
           };
-          if (
-            typeof item.fileUrl === 'object' &&
-            item.fileUrl instanceof File
-          ) {
-            const formData = new FormData();
-            formData.append('file', item.fileUrl as RcFile);
-            const uploadPromise = async () => {
-              const res = await postOrderErpOrderStagesUpload({
-                data: formData,
-                headers: {
-                  'Content-Type':
-                    'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
-                },
-              });
-              if (res.data) {
-                remakeItem.fileUrl = res.data;
-              }
-            };
-            promises.push(uploadPromise());
-          }
+          // if (
+          //   typeof item.fileUrl === 'object' &&
+          //   item.fileUrl instanceof File
+          // ) {
+          //   const formData = new FormData();
+          //   formData.append('file', item.fileUrl as RcFile);
+          //   const uploadPromise = async () => {
+          //     const res = await postOrderErpOrderStagesUpload({
+          //       data: formData,
+          //       headers: {
+          //         'Content-Type':
+          //           'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+          //       },
+          //     });
+          //     if (res.data) {
+          //       remakeItem.fileUrl = res.data;
+          //     }
+          //   };
+          //   promises.push(uploadPromise());
+          // }
           remakeValue.push(remakeItem);
         });
         Promise.all(promises).then(async () => {
@@ -243,8 +259,9 @@ export default ({ currentContract, toReload }) =&gt; {
         const isSaveOrUpdate = await postOrderErpOrderStagesSaveOrUpdate({
           data: { ...toSendEdit },
         });
-        if (isSaveOrUpdate) {
-          getBody();
+        if (isSaveOrUpdate.message === '成功') {
+          console.log('2');
+          getBody(toSendEdit.contract);
           toReload();
         }
         await waitTime(2000);
@@ -4,19 +4,18 @@ import {
   EditableProTable,
   ProFormDatePicker,
   ProFormRadio,
-  ProFormUploadButton,
 } from '@ant-design/pro-components';
-import { message } from 'antd';
 import React, { useEffect, useState } from 'react';
+import PayWayUpload from '../upload/payWayUpload';
 import './payWayDetail.less';
-const waitTime = (time: number = 100) => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(true);
-    }, time);
-  });
-};
+// const waitTime = (time: number = 100) => {
+//   return new Promise((resolve) => {
+//     setTimeout(() => {
+//       resolve(true);
+//     }, time);
+//   });
+// };
 type DataSourceType = {
   id: number;
@@ -74,6 +73,7 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
   ];
   const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
+  const [isRetrun, setIsRetrun] = useState(false);
   const [position, setPosition] = useState<'top' | 'bottom' | 'hidden'>(
     'hidden',
   );
@@ -81,9 +81,17 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
     readonly DataSourceType[]
   >([...defaultData]);
   // const [body, setBody] = useState([])
-  const [isAccept, setIsAccept] = useState(null);
+  // const [isAccept, setIsAccept] = useState(null);
   // const [isCurrtSave, setIsCurrtSave] = useState(false);
+  const waitTime = (time: number = 100) => {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(true);
+      }, time);
+    });
+  };
+
   async function getOther(value, arr) {
     const res = await postOrderErpOrderStagesPayWaySelect({
       data: { ossId: value },
@@ -106,11 +114,32 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
         });
         return currt;
       });
+      // console.log(remake);
       setPayWayDetailBody(remake);
+      setIsRetrun(true);
     }
   }
-  function setPayWay(value) {
+  function getUploadFile(value) {
+    let remakeBody = [];
+    let remakeBodyItem = {};
+    payWayDetailBody.forEach((item) => {
+      if (item.id === value.id) {
+        remakeBodyItem = {
+          ...item,
+          fileUrl: value.url,
+          fileName: value.name,
+        };
+      } else {
+        remakeBodyItem = { ...item };
+      }
+      remakeBody.push(remakeBodyItem);
+    });
+    setPayWayDetailBody(remakeBody);
+    currtSave(remakeBody);
+  }
+
+  async function setPayWay(value) {
     const remakeData = payWayDetailBody.map((obj) => {
       return {
         ...obj,
@@ -127,9 +156,6 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
       getOther(thisId, remakeData);
     }
   }
-  // useEffect(() => {
-  //     getOther(thisId)
-  // }, [thisId])
   useEffect(() => {
     setPayWay(payBody);
@@ -175,6 +201,7 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
       render: (text, record) => {
         const handleChange = (value) => {
           const updatedDataSource = payWayDetailBody.map((item) => {
+            console.log(value);
             if (item.id === record.id) {
               return {
                 ...item,
@@ -207,74 +234,33 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
       title: '付款单回执',
       dataIndex: 'fileName',
       render: (text, record) => {
-        if (isAccept !== record.id) {
-          if (
-            typeof record.fileUrl === 'object' &&
-            record.fileUrl instanceof File
-          ) {
-            return (
-              <a onClick={() => message.error('请先保存')}>{record.fileName}</a>
-            );
-          } else {
-            return <a href={record.fileUrl}>{record.fileName}</a>;
-          }
+        if (record.fileUrl !== undefined) {
+          return (
+            <PayWayUpload
+              natureModel={{
+                id: record.id,
+                fileName: record.fileName,
+                fileUrl: record.fileUrl,
+              }}
+              setCurryFile={getUploadFile}
+              key={isRetrun}
+            ></PayWayUpload>
+          );
         } else {
           return (
-            <ProFormUploadButton
-              name={record.id}
-              onChange={(value) => {
-                console.log(value);
-                // console.log(payWayDetailBody);
-                let remakeBody = [];
-                let remakeBodyItem = {};
-                payWayDetailBody.forEach((item) => {
-                  if (item.id === record.id) {
-                    remakeBodyItem = {
-                      ...item,
-                      fileUrl: value.fileList.originFileObj,
-                      fileName: value.fileList.name,
-                    };
-                  } else {
-                    remakeBodyItem = { ...item };
-                  }
-                  // if (value.fileList.length == 0) {
-                  //     remakeBodyItem = { ...item, fileUrl: undefined, fileName: undefined }
-                  // }
-                  remakeBody.push(remakeBodyItem);
-                });
-                setPayWayDetailBody(remakeBody);
-                currtSave(remakeBody);
+            <PayWayUpload
+              natureModel={{
+                id: record.id,
+                fileName: undefined,
+                fileUrl: undefined,
               }}
-              width="md"
-              max={1}
-            />
+              setCurryFile={getUploadFile}
+              key={isRetrun}
+            ></PayWayUpload>
           );
         }
       },
     },
-    {
-      title: '操作',
-      valueType: 'option',
-      width: 200,
-      render: (text, record) => [
-        <a
-          key="editable"
-          onClick={() => {
-            if (isAccept !== record.id) {
-              setIsAccept(record.id);
-            } else {
-              setIsAccept(null);
-            }
-          }}
-        >
-          {record.fileName !== undefined &&
-          record.fileName !== '' &&
-          record.fileName !== null
-            ? '重新上传'
-            : '上传回执'}
-        </a>,
-      ],
-    },
   ];
   return (
+import { postOrderErpOrderStagesUpload } from '@/services/request';
+import { UploadOutlined } from '@ant-design/icons';
+import type { UploadProps } from 'antd';
+import { Button, Upload, message } from 'antd';
+import { RcFile } from 'antd/es/upload';
+import React, { useEffect } from 'react';
+
+const App: React.FC = ({ natureModel, setCurryFile }) => {
+  const [fileList, setFileList] = React.useState([{}]);
+  useEffect(() => {
+    console.log(natureModel);
+    if (natureModel.fileUrl !== undefined && natureModel.fileUrl !== null) {
+      setFileList([{ name: natureModel.fileName, url: natureModel.fileUrl }]);
+    }
+  }, []);
+
+  const handleUploadChange = (value) => {
+    setFileList(value.fileList);
+    setCurryFile({
+      id: natureModel.id,
+      name: null,
+      url: null,
+    });
+    if (
+      value.fileList.length !== 0 &&
+      value.fileList[0].status === 'uploading'
+    ) {
+      (async () => {
+        if (!(value.fileList[0].originFileObj instanceof File)) {
+          console.log('is not file');
+          return false;
+        } else {
+          const formData = new FormData();
+          formData.append('file', value.fileList[0].originFileObj as RcFile);
+          const res = await postOrderErpOrderStagesUpload({
+            data: formData,
+            headers: {
+              'Content-Type': 'multipart/form-data',
+            },
+          });
+          if (res) {
+            message.success('提交成功');
+            console.log({
+              uid: value.fileList[0].originFileObj.uid,
+              name: value.fileList[0].originFileObj.name,
+              url: res.data,
+            });
+            console.log(natureModel.id);
+
+            setCurryFile({
+              id: natureModel.id,
+              name: value.fileList[0].originFileObj.name,
+              url: res.data,
+            });
+            setFileList([
+              {
+                id: value.fileList[0].originFileObj.uid,
+                name: value.fileList[0].originFileObj.name,
+                url: res.data,
+              },
+            ]);
+            return (
+              <a href={res.data} target="_blank" rel="noopener noreferrer">
+                {value.fileList[0].originFileObj.name}
+              </a>
+            );
+          }
+        }
+      })();
+    }
+  };
+
+  const props: UploadProps = {
+    onChange(value) {
+      handleUploadChange(value);
+    },
+  };
+
+  const shouldShowUploadButton =
+    fileList.length !== 1 || fileList[0].url === undefined;
+
+  return (
+    <Upload
+      {...props}
+      fileList={fileList.filter(
+        (item) => item.url !== undefined && item.url !== null,
+      )}
+    >
+      {shouldShowUploadButton && (
+        <Button icon={<UploadOutlined />}>上传</Button>
+      )}
+    </Upload>
+  );
+};
+
+export default App;
+
+{
+  /* {!shouldShowUploadButton && <a href={fileList[0].url}>{fileList[0].name}</a>} */
+}
@@ -21,13 +21,7 @@ const App: React.FC = ({ uploadFile }) =&gt; {
         <p className="ant-upload-drag-icon">
           <InboxOutlined />
         </p>
-        <p className="ant-upload-text">
-          Click or drag file to this area to upload
-        </p>
-        <p className="ant-upload-hint">
-          Support for a single or bulk upload. Strictly prohibited from
-          uploading company data or other banned files.
-        </p>
+        <p className="ant-upload-text">点击或者拖动文件到此处</p>
       </Dragger>
       <a
         href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2035527699&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=npHyEhfRd6LugJ0St8OkvRmLYtQ%3D"
@@ -3,6 +3,8 @@ import {
   postCanrdApiUserAddressList,
   postCanrdApiUserDetail,
   postCanrdApiUserNowMoneyCheck,
+  postDistrictSelectBelongByName,
+  postDistrictSelectByLevel,
   postKingdeeRepCustomerDetail,
   postKingdeeRepMaterial,
   postKingdeeRepMaterialUnit,
@@ -71,6 +73,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   //   [],
   // ); //商品的仓库选项
   const [productUnitOptionsList, setProductUnitOptionsList] = useState([]); //商品的单位选项
+  //省市区
+  const [province, setProvince] = useState('');
+  const [city, setCity] = useState('');
+  const [district, setDistrict] = useState('');
   // const [productCustomerContactOptions, setProductCustomerContactOptions] =
   //   useState([]); //客户的收货人选项
   const [form] = Form.useForm<{
@@ -246,7 +252,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       newAccountOptions.push(uidDetail);
     }
-    //查询当前手机号允许使用的预存账号
+    // 查询当前手机号允许使用的预存账号
     if (phone) {
       let res = await postPrepaidPhoneAvailableList({ data: { phone: phone } });
       if (res && res.result === RESPONSE_CODE.SUCCESS) {
@@ -863,6 +869,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           values.institution = values.institution?.trim();
           values.institutionContactName = values.institutionContactName?.trim();
           values.customerName = values.customerNameString.trim();
+          values.customerShippingAddress =
+            province + city + district + values.customerShippingAddress;
           if (typeof values.erpCustomerId !== 'string') {
             values.erpCustomerId = values.erpCustomerId?.id;
@@ -1015,7 +1023,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           name="contactAddress"
           hidden
         ></ProFormText>
-
         <ProFormSelect
           key="customerName"
           label="收货人"
@@ -1176,6 +1183,113 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           placeholder="请输入课题组"
           rules={[{ required: true, message: '课题组必填' }]}
         />
+        <div
+          style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            width: 340,
+          }}
+        >
+          <ProFormSelect
+            name="province"
+            key="province"
+            width={100}
+            label="省"
+            fieldProps={{
+              labelInValue: true,
+            }}
+            onChange={(value) => {
+              setProvince(value?.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="市"
+            disabled={province === ''}
+            fieldProps={{
+              labelInValue: true,
+            }}
+            placeholder="请选择"
+            onChange={(value) => {
+              setCity(value?.value);
+            }}
+            rules={[
+              {
+                required: true,
+                message: '请选择!',
+              },
+            ]}
+            request={async () => {
+              if (province !== '') {
+                let cityOptions = [];
+                let res = await postDistrictSelectBelongByName({
+                  data: province,
+                });
+                if (res && res.data) {
+                  cityOptions = res.data.map((item) => ({
+                    value: item.district,
+                    label: item.district,
+                  }));
+                }
+                return cityOptions;
+              }
+              return [];
+            }}
+          />
+          <ProFormSelect
+            key={city ? city.toString() : 'district'}
+            name="district"
+            width={100}
+            label="区"
+            onChange={(value) => {
+              setDistrict(value?.value);
+            }}
+            disabled={city === ''}
+            fieldProps={{
+              labelInValue: true,
+            }}
+            placeholder="请选择"
+            rules={[
+              {
+                required: true,
+                message: '请选择!',
+              },
+            ]}
+            request={async () => {
+              if (city !== '') {
+                let districtOptions = [];
+                let res = await postDistrictSelectBelongByName({ data: city });
+                if (res && res.data) {
+                  districtOptions = res.data.map((item) => ({
+                    value: item.district,
+                    label: item.district,
+                  }));
+                }
+                return districtOptions;
+              }
+              return [];
+            }}
+          />
+        </div>
         <ProFormTextArea
           width="lg"
           key="customerShippingAddress"
 import {
+  getOrderErpOrderZoNingSelectAll,
+  getOrderErpOrderZoNingSelectUserAll,
+  postOrderErpOrderZoNingSelectSaleUserByProvince,
   postServiceOrderQueryReportFormsInformation,
   postServiceOrderQuerySalesCode,
 } from '@/services';
@@ -63,7 +66,7 @@ const OrderReportPage = () =&gt; {
     setLoading(true);
     let body = {
       statisticsMethod: '',
-      salesCode: form.getFieldValue('salesCode'),
+      salesCode: [null],
       productBelongBusiness: form.getFieldValue('productBelongBusiness'),
       maxAccount: form.getFieldValue('maxAccount'),
       includeExperimentalEquipment: form.getFieldValue(
@@ -72,6 +75,36 @@ const OrderReportPage = () =&gt; {
       // beginTime:"",
       // endTime:""
     };
+    // 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 };
+    }
+    if (form.getFieldValue('salesCode')) {
+      body = { ...body, salesCode: [form.getFieldValue('salesCode')] };
+    }
+    if (form.getFieldValue('zoning')) {
+      if (
+        form.getFieldValue('zoning').value !== '' ||
+        form.getFieldValue('zoning').value !== null ||
+        form.getFieldValue('zoning').value !== undefined
+      ) {
+        let res = await postOrderErpOrderZoNingSelectSaleUserByProvince({
+          data: form.getFieldValue('zoning').value,
+        });
+        if (res && res.data) {
+          body = { ...body, salesCode: res.data };
+        }
+      }
+    }
+
+    if (form.getFieldValue('zoning')) {
+    }
     // if(form.getFieldValue("dateRange")!==undefined){
     //   body.beginTime=formatDate(form.getFieldValue("dateRange")[0]),
@@ -162,6 +195,30 @@ const OrderReportPage = () =&gt; {
               initialValue={false}
               label="包含实验设备事业部汇总统计"
             />
+
+            <ProFormSelect
+              key="zoning"
+              name="zoning"
+              width="md"
+              label="所属地区"
+              fieldProps={{
+                labelInValue: true,
+              }}
+              placeholder="请选择"
+              request={async () => {
+                let zoningOptions = [];
+                let res = await getOrderErpOrderZoNingSelectAll();
+                if (res && res.data) {
+                  console.log(res.data);
+
+                  zoningOptions = res.data.map((item) => ({
+                    value: item.zoning,
+                    label: item.zoning,
+                  }));
+                }
+                return zoningOptions;
+              }}
+            />
           </QueryFilter>
         </ProCard>
@@ -6,7 +6,7 @@ import { Button, Modal, Upload, message } from &#39;antd&#39;;
 import { RcFile, UploadFile, UploadProps } from 'antd/es/upload';
 import { useState } from 'react';
 export default ({ onClose }) => {
-  // const [form] = Form.useForm<{ name: string; company: string }>();
+  //   const [form] = Form.useForm<{ name: string; company: string }>();
   const [messageApi, contextHolder] = message.useMessage();
   const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [uploading, setUploading] = useState(false);
@@ -41,8 +41,8 @@ export default ({ onClose }) =&gt; {
       //originFileObj二进制文件
       formData.append('file', file.originFileObj as RcFile);
     });
-    // console.log(fileList[0] as RcFile)
-    // formData.append('file', fileList[0] as RcFile);
+    console.log(fileList[0] as RcFile);
+    formData.append('file', fileList[0] as RcFile);
     setUploading(true);
     // You can use any AJAX library you like
     const res = await postResearchGroupsImport({
+.research-group-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: 13px;
+}
 import { List } from 'lodash';
 export type zoningItem = {
-  id: number; //id
+  id?: number; //id
   zoning: string; //区域名称
   orderProvinceVoList: List<provinceItem>; //所包含的省份列表
   orderUserVoList: List<userItem>; //所包含的销售列表
 };
 export type zoningShowItem = {
-  id: number; //id
+  id?: number; //id
   zoning: string; //区域名称
   orderProvinceShowList: string; //所包含的省份列表
   orderUserShowList: string; //所包含的销售列表
+  orderUserNumberShowList: number[]; //销售对应的uId
 };
 export type provinceItem = {
-  pId: number;
+  pId?: number;
   province: string;
 };
 export type userItem = {
   uId: number;
-  userName: string;
+  userName?: string;
+};
+
+export const provinceEnum = {
+  全选: '全选',
+  北京市: '北京市',
+  天津市: '天津市',
+  河北省: '河北省',
+  山西省: '山西省',
+  内蒙古自治区: '内蒙古自治区',
+  辽宁省: '辽宁省',
+  吉林省: '吉林省',
+  黑龙江省: '黑龙江省',
+  上海市: '上海市',
+  江苏省: '江苏省',
+  浙江省: '浙江省',
+  安徽省: '安徽省',
+  福建省: '福建省',
+  江西省: '江西省',
+  山东省: '山东省',
+  河南省: '河南省',
+  湖北省: '湖北省',
+  湖南省: '湖南省',
+  广东省: '广东省',
+  广西壮族自治区: '广西壮族自治区',
+  海南省: '海南省',
+  重庆市: '重庆市',
+  四川省: '四川省',
+  贵州省: '贵州省',
+  云南省: '云南省',
+  西藏自治区: '西藏自治区',
+  陕西省: '陕西省',
+  甘肃省: '甘肃省',
+  青海省: '青海省',
+  宁夏回族自治区: '宁夏回族自治区',
+  新疆维吾尔自治区: '新疆维吾尔自治区',
+  台湾省: '台湾省',
+  香港特别行政区: '香港特别行政区',
+  澳门特别行政区: '澳门特别行政区',
 };
-import { getOrderErpOrderZoNingSelectProvinceAll } from '@/services';
+import {
+  getOrderErpOrderZoNingSelectUserAll,
+  postOrderErpOrderZoNingSaveOrUpdate,
+} from '@/services';
 import { PlusOutlined } from '@ant-design/icons';
 import {
   ModalForm,
@@ -7,8 +10,7 @@ import {
   ProFormText,
 } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
-import { zoningItem } from './constant';
-
+import { provinceEnum, zoningItem } from './constant';
 const waitTime = (time: number = 100) => {
   return new Promise((resolve) => {
     setTimeout(() => {
@@ -17,71 +19,126 @@ const waitTime = (time: number = 100) =&gt; {
   });
 };
-export default () => {
+export default ({ toReload, option, needEditBody }) => {
   const [form] = Form.useForm<zoningItem>();
+
   return (
     <ModalForm<{
-      name: string;
-      company: string;
+      zoning: string;
+      province: string[];
+      user: number[];
     }>
-      title="新增区域"
+      title={option}
       trigger={
-        <Button type="primary">
-          <PlusOutlined />
-          新增区域
+        <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,
-        onCancel: () => console.log('run'),
       }}
-      submitTimeout={2000}
+      submitTimeout={500}
       onFinish={async (values) => {
-        await waitTime(2000);
-        console.log(values.name);
-        message.success('提交成功');
-        return true;
+        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="md"
+          width="lg"
           name="zoning"
           label="区域名称"
           placeholder="请输入"
+          rules={[{ required: true, message: '此项为必填项' }]}
         />
       </ProForm.Group>
       <ProForm.Group>
         <ProFormSelect
+          name="user"
+          width="lg"
+          label="负责销售"
           request={async () => {
-            const provinceList =
-              await getOrderErpOrderZoNingSelectProvinceAll();
-            if (provinceList) {
-              return provinceList.data.map((item) => ({
-                value: { pId: item.pId, province: item.province },
-                label: item.province,
-              }));
+            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 [];
           }}
-          width="xs"
-          name="orderProvinceVoList"
-          label="合同约定生效方式"
+          fieldProps={{
+            mode: 'multiple',
+          }}
+          placeholder="请选择"
+          rules={[
+            {
+              required: true,
+              message: '请选择!',
+              type: 'array',
+            },
+          ]}
         />
       </ProForm.Group>
       <ProForm.Group>
         <ProFormSelect
-          width="xs"
-          options={[
+          name="province"
+          width="lg"
+          label="管辖地区"
+          valueEnum={provinceEnum}
+          fieldProps={{
+            mode: 'multiple',
+          }}
+          placeholder="请选择"
+          rules={[
             {
-              value: 'time',
-              label: '履行完终止',
+              required: true,
+              message: '请选择!',
+              type: 'array',
             },
           ]}
-          name="orderUserVoList"
-          label="合同约定失效效方式"
         />
       </ProForm.Group>
     </ModalForm>
-import type { ProColumns } from '@ant-design/pro-components';
 import {
-  EditableProTable,
-  ProCard,
-  ProFormField,
-} from '@ant-design/pro-components';
-import React, { useState } from 'react';
+  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';
@@ -16,68 +18,81 @@ const waitTime = (time: number = 100) =&gt; {
   });
 };
-const defaultData: zoningItem[] = [
-  {
-    id: 1,
-    zoning: '华南地区',
-    orderProvinceVoList: [
-      {
-        pId: 1,
-        province: '广东省',
-      },
-      {
-        pId: 2,
-        province: '四川省',
-      },
-      {
-        pId: 3,
-        province: '北京市',
-      },
-      {
-        pId: 4,
-        province: '上海市',
-      },
-    ],
-    orderUserVoList: [
-      {
-        uId: 1,
-        userName: '李华',
-      },
-    ],
-  },
-];
+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 += '、';
+      }
+    });
-const defaultShowData: zoningShowItem[] = defaultData.map((item) => {
-  let orderProvinceShowList = '';
-  let orderUserShowList = '';
+    item.orderUserVoList.forEach((event, index) => {
+      orderUserShowList += event.userName;
+      orderUserNumberShowList.push(event.uId);
+      if (index < item.orderUserVoList.length - 1) {
+        orderUserShowList += '、';
+      }
+    });
-  item.orderProvinceVoList.forEach((element, index) => {
-    orderProvinceShowList += element.province;
-    if (index < item.orderProvinceVoList.length - 1) {
-      orderProvinceShowList += '、';
+    if (orderUserShowList === '') {
+      orderUserShowList = '全选';
+      orderUserNumberShowList.push(0);
     }
-  });
-  item.orderUserVoList.forEach((event, index) => {
-    orderUserShowList += event.userName;
-    if (index < item.orderUserVoList.length - 1) {
-      orderUserShowList += '、';
-    }
+    return {
+      id: item.id,
+      zoning: item.zoning,
+      orderProvinceShowList,
+      orderUserShowList,
+      orderUserNumberShowList,
+    };
   });
-
-  return {
-    id: item.id,
-    zoning: item.zoning,
-    orderProvinceShowList,
-    orderUserShowList,
-  };
-});
+  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: '区域名称',
@@ -101,74 +116,72 @@ export default () =&gt; {
       title: '操作',
       valueType: 'option',
       width: 200,
-      render: (text, record, _, action) => [
-        <a
-          key="editable"
-          onClick={() => {
-            action?.startEditable?.(record.id);
-          }}
-        >
-          编辑
-        </a>,
-        <a
-          key="delete"
-          onClick={() => {
-            setDataSource(dataSource.filter((item) => item.id !== record.id));
-          }}
-        >
-          删除
-        </a>,
+      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"
-        headerTitle={<Modal></Modal>}
-        maxLength={5}
-        scroll={{
-          x: 960,
-        }}
-        recordCreatorProps={
-          position !== 'hidden'
-            ? {
-                position: position as 'top',
-                record: () => ({ id: (Math.random() * 1000000).toFixed(0) }),
-              }
-            : false
+    <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 || [] };
         }
-        loading={false}
-        columns={columns}
-        request={async () => ({
-          data: defaultShowData,
-        })}
-        value={dataSource}
-        onChange={setDataSource}
-        editable={{
-          type: 'multiple',
-          editableKeys,
-          onSave: async (rowKey, data, row) => {
-            console.log(rowKey, data, row);
-            await waitTime(2000);
-          },
-          onChange: setEditableRowKeys,
-        }}
-      />
-      <ProCard title="表格数据" headerBordered collapsible defaultCollapsed>
-        <ProFormField
-          ignoreFormItem
-          fieldProps={{
-            style: {
-              width: '100%',
-            },
-          }}
-          mode="read"
-          valueType="jsonCode"
-          text={JSON.stringify(dataSource)}
-        />
-      </ProCard>
-    </>
+      }}
+      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;
+}
@@ -528,221 +528,6 @@ export interface ApiQueryOrderStatusCountsRequest {
   uid?: number;
 }
-export interface ApplyInvoiceDto {
-  /**
-   * @description
-   *   备注
-   */
-  applyInvoicingNotes?: string;
-  /**
-   * @description
-   *   开票备注
-   */
-  comment?: string;
-  /**
-   * @description
-   *   联系人
-   */
-  contacts?: string;
-  /**
-   * @description
-   *   开票内容
-   */
-  content?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  failureReason?: string;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   发票地址
-   */
-  invoiceAddress?: string;
-  /**
-   * @description
-   *   发票明细
-   */
-  invoiceDetails?: Array<InvoiceDetail>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   开票人
-   */
-  invoicingPerson?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTime?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingTypeText?: string;
-  /** @format date */
-  invoicingdate?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   是否加急文本
-   */
-  isUrgentText?: string;
-  logicDelete?: boolean;
-  /**
-   * @description
-   *   买方注册地址
-   */
-  partyAAddress?: string;
-  /**
-   * @description
-   *   买方开户行账号
-   */
-  partyABankAccount?: string;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyAName?: string;
-  /**
-   * @description
-   *   买方开户行
-   */
-  partyAOpenBank?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumber?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   抬头类型
-   */
-  partyAType?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方注册地址
-   */
-  partyBAddress?: string;
-  /**
-   * @description
-   *   卖方开户行账号
-   */
-  partyBBankAccount?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   卖方开户行
-   */
-  partyBOpenBank?: string;
-  /**
-   * @description
-   *   卖方电话号码
-   */
-  partyBPhoneNumber?: string;
-  /**
-   * @description
-   *   卖方税号
-   */
-  partyBTaxid?: string;
-  /**
-   * @description
-   *   发票金额
-   * @format double
-   */
-  price?: number;
-  /**
-   * @description
-   *   接收邮箱地址
-   */
-  receiveEmail?: string;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodes?: Array<string>;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodesText?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  statusText?: string;
-  /**
-   * @description
-   *   子订单id
-   */
-  subOrderIds?: Array<number>;
-  /**
-   * @description
-   *   关联订单
-   */
-  subOrders?: Array<SubOrder>;
-  /** @format double */
-  totalPrice?: number;
-  totalPriceText?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  type?: string;
-  /**
-   * @description
-   *   开票类型文本
-   */
-  typeText?: string;
-  /**
-   * @description
-   *   用户id
-   */
-  uid?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-}
-
 export interface AuditDto {
   /**
    * @description
@@ -1061,6 +846,13 @@ export interface DictionaryVO {
   sort?: number;
 }
+export interface DistrictDo {
+  /** @format int32 */
+  level?: number;
+  /** @format int32 */
+  pid?: number;
+}
+
 export interface Entry {
   bankAccount?: string;
   bankName?: string;
@@ -1169,396 +961,23 @@ export interface InvoiceDto {
    * @description
    *   销售
    */
-  sale?: string;
-  /**
-   * @description
-   *   状态
-   */
-  status?: string;
-}
-
-export interface InvoiceRecordDto {
-  applyInvoicingNotes?: string;
-  /**
-   * @description
-   *   开票备注
-   */
-  comment?: string;
-  /**
-   * @description
-   *   联系人
-   */
-  contacts?: string;
-  /**
-   * @description
-   *   开票内容
-   */
-  content?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  failureReason?: string;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   发票地址
-   */
-  invoiceAddress?: string;
-  /**
-   * @description
-   *   发票明细
-   */
-  invoiceDetails?: Array<InvoiceDetail>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   开票人
-   */
-  invoicingPerson?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTime?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingTypeText?: string;
-  /** @format date */
-  invoicingdate?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   是否加急文本
-   */
-  isUrgentText?: string;
-  logicDelete?: boolean;
-  /**
-   * @description
-   *   买方注册地址
-   */
-  partyAAddress?: string;
-  /**
-   * @description
-   *   买方开户行账号
-   */
-  partyABankAccount?: string;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyAName?: string;
-  /**
-   * @description
-   *   买方开户行
-   */
-  partyAOpenBank?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumber?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   抬头类型
-   */
-  partyAType?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方注册地址
-   */
-  partyBAddress?: string;
-  /**
-   * @description
-   *   卖方开户行账号
-   */
-  partyBBankAccount?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   卖方开户行
-   */
-  partyBOpenBank?: string;
-  /**
-   * @description
-   *   卖方电话号码
-   */
-  partyBPhoneNumber?: string;
-  /**
-   * @description
-   *   卖方税号
-   */
-  partyBTaxid?: string;
-  /**
-   * @description
-   *   发票金额
-   * @format double
-   */
-  price?: number;
-  /**
-   * @description
-   *   接收邮箱地址
-   */
-  receiveEmail?: string;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodes?: Array<string>;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodesText?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  statusText?: string;
-  /**
-   * @description
-   *   子订单id
-   */
-  subOrderIds?: Array<number>;
-  /**
-   * @description
-   *   关联订单
-   */
-  subOrders?: Array<SubOrder>;
-  /** @format double */
-  totalPrice?: number;
-  totalPriceText?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  type?: string;
-  /**
-   * @description
-   *   开票类型文本
-   */
-  typeText?: string;
-  /**
-   * @description
-   *   用户id
-   */
-  uid?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-}
-
-export interface InvoiceRecordQueryRequest {
-  /**
-   * @description
-   *   联系人
-   */
-  contactsLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   IdIn
-   */
-  idIn?: Array<number>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumberLike?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTimeGe?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTimeLe?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   订单号
-   * @format int64
-   */
-  mainOrderId?: number;
-  /**
-   * @description
-   *   主订单idIn
-   */
-  mainOrderIdIn?: Array<number>;
-  /**
-   * @description
-   *   订单号
-   */
-  mainOrderIdLike?: string;
-  /**
-   * @description
-   *   是否需要构建发票明细
-   */
-  needBuildDetails?: boolean;
-  /**
-   * @description
-   *   是否需要构建发票明细
-   */
-  needBuildSubOrders?: boolean;
-  /** @format int32 */
-  pageSize?: number;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyANameLike?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumberLike?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxidLike?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCode?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCodeLike?: string;
-  /** @format int32 */
-  start?: number;
-  /**
-   * @description
-   *   发票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   状态非空
-   */
-  statusIn?: Array<string>;
-  /**
-   * @description
-   *   状态非空
-   */
-  statusIsNotNull?: boolean;
-  /**
-   * @description
-   *   状态为空
-   */
-  statusIsNull?: boolean;
-  /**
-   * @description
-   *   子订单
-   * @format int64
-   */
-  subOrderId?: number;
-  /**
-   * @description
-   *   子订单idIn
-   */
-  subOrderIdIn?: Array<number>;
-  /**
-   * @description
-   *   子订单
-   */
-  subOrderIdLike?: string;
-  /** @format int32 */
-  total?: number;
+  sale?: string;
   /**
    * @description
-   *   开票类型
+   *   状态
    */
-  type?: string;
+  status?: string;
+}
+
+export interface InvoiceRecordQueryRequest {
+  /** @format date */
+  createTimeGe?: string;
+  /** @format date */
+  createTimeLe?: string;
+  /** @format int32 */
+  pageNumber?: number;
+  /** @format int32 */
+  pageSize?: number;
   /**
    * @description
    *   用户id
@@ -1581,14 +1000,6 @@ export interface ItemSaItem {
 export interface MainOrderqueryRequest {
   afterInvoicingStatusIsNull?: boolean;
-  /** @format date */
-  createDateGe?: string;
-  /** @format date */
-  createDateLe?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   orderStatusNotIn?: Array<string>;
   /** @format int32 */
   pageNumber?: number;
@@ -2329,198 +1740,6 @@ export interface QueryInvoiceDetailDto {
   invoiceId?: number;
 }
-export interface QueryInvoiceProjectDto {
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  nameLike?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
-}
-
-export interface QueryInvoiceRecordDto {
-  /**
-   * @description
-   *   联系人
-   */
-  contactsLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   IdIn
-   */
-  idIn?: Array<number>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumberLike?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTimeGe?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTimeLe?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   订单号
-   * @format int64
-   */
-  mainOrderId?: number;
-  /**
-   * @description
-   *   主订单idIn
-   */
-  mainOrderIdIn?: Array<number>;
-  /**
-   * @description
-   *   订单号
-   */
-  mainOrderIdLike?: string;
-  /**
-   * @description
-   *   是否需要构建发票明细
-   */
-  needBuildDetails?: boolean;
-  /**
-   * @description
-   *   是否需要构建发票明细
-   */
-  needBuildSubOrders?: boolean;
-  /** @format int32 */
-  pageSize?: number;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyANameLike?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumberLike?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxidLike?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCode?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCodeLike?: string;
-  /** @format int32 */
-  start?: number;
-  /**
-   * @description
-   *   发票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   状态非空
-   */
-  statusIn?: Array<string>;
-  /**
-   * @description
-   *   状态非空
-   */
-  statusIsNotNull?: boolean;
-  /**
-   * @description
-   *   状态为空
-   */
-  statusIsNull?: boolean;
-  /**
-   * @description
-   *   子订单
-   * @format int64
-   */
-  subOrderId?: number;
-  /**
-   * @description
-   *   子订单idIn
-   */
-  subOrderIdIn?: Array<number>;
-  /**
-   * @description
-   *   子订单
-   */
-  subOrderIdLike?: string;
-  /** @format int32 */
-  total?: number;
-  /**
-   * @description
-   *   开票类型
-   */
-  type?: string;
-  /**
-   * @description
-   *   用户id
-   */
-  uid?: string;
-}
-
 export interface QueryMainOrderDto {
   /**
    * @description
@@ -2551,7 +1770,7 @@ export interface QueryReportFormsDto {
    * @description
    *   销售代表
    */
-  salesCode?: string;
+  salesCode?: Array<string>;
   /**
    * @description
    *   统计方式
@@ -2604,128 +1823,6 @@ export interface ShippingWarehouseChangeDto {
   shippingWarehouse?: string;
 }
-export interface SubOrder {
-  afterInvoicingStatus?: string;
-  /** @format date-time */
-  afterInvoicingStatusUpdateTime?: string;
-  afterSalesAnnex?: string;
-  afterSalesNotes?: string;
-  afterSalesPlan?: string;
-  annex?: string;
-  applyInvoicingAnnex?: string;
-  applyInvoicingNotes?: string;
-  /** @format date-time */
-  applyTime?: string;
-  /** @format int32 */
-  attrId?: number;
-  checkNotes?: string;
-  /** @format date-time */
-  collectMoneyTime?: string;
-  confirmDeliverNotes?: string;
-  confirmReissueNotes?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  /** @format date-time */
-  deadline?: string;
-  ext?: string;
-  extendField?: string;
-  /** @format date-time */
-  financialReceiptIssuanceTime?: string;
-  fullPaymentStatus?: string;
-  /** @format double */
-  goodsVolume?: number;
-  /** @format double */
-  goodsWeight?: number;
-  /** @format int64 */
-  id?: number;
-  image?: string;
-  invoiceApplyUsername?: string;
-  invoiceInformation?: string;
-  /** @format int64 */
-  invoiceRecordId?: number;
-  invoicingCheckAnnex?: string;
-  invoicingNotes?: string;
-  invoicingStatus?: string;
-  /** @format date-time */
-  invoicingTime?: string;
-  invoicingUrgentCause?: string;
-  isUrgent?: boolean;
-  kingdeeErrorMessage?: string;
-  logicDelete?: boolean;
-  logisticsMethod?: string;
-  logisticsNotes?: string;
-  /** @format int64 */
-  mainOrderAmountProportion?: number;
-  /** @format int64 */
-  mainOrderId?: number;
-  materialId?: string;
-  modified?: boolean;
-  modifiedAuditNotes?: string;
-  modifiedAuditStatus?: string;
-  modifiedOptFlag?: string;
-  nextOrderStatus?: string;
-  notes?: string;
-  orderStatus?: string;
-  orderStatusBeforeModify?: string;
-  /** @format date-time */
-  orderStatusUpdateTime?: string;
-  /** @format int32 */
-  packageNumber?: number;
-  parameters?: string;
-  paymentChannel?: string;
-  paymentMethod?: string;
-  paymentReceiptAnnex?: string;
-  paymentReceiptNotes?: string;
-  paymentReceiptStatus?: string;
-  paymentStatus?: string;
-  paymentTransactionId?: string;
-  postAuditNotes?: string;
-  postAuditStatus?: string;
-  /** @format date-time */
-  postAuditStatusUpdateTime?: string;
-  preAfterInvoicingStatus?: string;
-  procureConvertNotes?: string;
-  procureNotes?: string;
-  /** @format date-time */
-  procureOrderDatetime?: string;
-  procureOrderStatus?: string;
-  productBelongBusiness?: string;
-  productCode?: string;
-  /** @format int32 */
-  productId?: number;
-  productName?: string;
-  /** @format int64 */
-  productPrice?: number;
-  /** @format date-time */
-  productionEndTime?: string;
-  /** @format date-time */
-  productionStartTime?: string;
-  productionTimePushStatus?: string;
-  /** @format int32 */
-  quantity?: number;
-  receivingCompany?: string;
-  reissueNotes?: string;
-  serialNumber?: string;
-  shippingWarehouse?: string;
-  /** @format int64 */
-  subOrderPayment?: number;
-  supplierName?: string;
-  supplierNotes?: string;
-  /** @format int64 */
-  totalPayment?: number;
-  /** @format int32 */
-  uid?: number;
-  unit?: string;
-  unitId?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-  urgentInvoiceAuditNotes?: string;
-  /** @format int32 */
-  version?: number;
-}
-
 export interface SysLogQueryVO {
   address?: string;
   browser?: string;
@@ -3039,44 +2136,6 @@ export interface TsgFile {
   writable?: boolean;
 }
-export interface InvoiceDetail {
-  /** @format int64 */
-  id?: number;
-  /**
-   * @description
-   *   发票id
-   * @format int64
-   */
-  invoiceRecordId?: number;
-  /**
-   * @description
-   *   单价
-   * @format double
-   */
-  price?: number;
-  projectName?: string;
-  /** @format double */
-  quantity?: number;
-  /**
-   * @description
-   *   型号
-   */
-  specification?: string;
-  /** @format int64 */
-  subOrderId?: number;
-  /** @format double */
-  taxPrice?: number;
-  /** @format double */
-  taxRate?: number;
-  /**
-   * @description
-   *   总价
-   * @format double
-   */
-  totalPrice?: number;
-  unit?: string;
-}
-
 export interface SalesRechargePrepaymentAuditRequest {
   /**
    * @description