Merge branch 'master' into zgt移除ManualInvoicingModal中的非必要注释代码

发现并删除了ManualInvoicingModal组件中未使用的注释代码，以提高代码清晰度和维护性。

Merge branch 'master' into zgt移除ManualInvoicingModal中的非必要注释代码
发现并删除了ManualInvoicingModal组件中未使用的注释代码，以提高代码清晰度和维护性。
曾国涛
2 parents 3dd1b455 6940a4c6
Showing 14 changed files with 1005 additions and 78 deletions
.umirc.ts
src/pages/Invoice/InvoiceRecord/components/ManualInvoicingModal.tsx
src/pages/Invoice/InvoiceRecord/index.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
src/pages/Invoice/waitProcessRecord/index.tsx
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/hooks.ts
src/pages/Order/index.tsx
src/pages/procure/components/AddDrawer.tsx
src/pages/procure/index.less
src/pages/procure/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -87,7 +87,6 @@ export default defineConfig({
         },
       ],
     },
-
     {
       name: '预存管理',
       path: '/prepaidManage',
@@ -129,6 +128,13 @@ export default defineConfig({
       component: './OrderPrint',
       layout: false,
     },
+    {
+      name: '采购退货管理',
+      path: '/procure',
+      component: './procure',
+      icon: 'BookOutlined',
+      access: 'canReadAdmin',
+    },
     /*{
       name: '用户管理',
       path: '/user',
@@ -48,12 +48,6 @@ export default ({ record }) =&gt; {
         }
       }}
     >
-      {/*<ProFormText
-        rules={[{ required: true, message: '此项为必填项' }]}
-        width={'md'}
-        name="invoicingPerson"
-        label="开票人"
-      />*/}
       <ProFormText
         rules={[{ required: true, message: '此项为必填项' }]}
         width={'md'}
@@ -98,33 +92,6 @@ export default ({ record }) =&gt; {
           ></UploadC>
         </Col>
       </Row>
-      {/*<ProFormList
-        name="invoiceDetailDtoList"
-        label="明细"
-        creatorButtonProps={false}
-        copyIconProps={false}
-        itemRender={({ listDom }, { index }) => (
-          <ProCard
-            bordered
-            style={{ marginBlockEnd: 8 }}
-            title={`明细${index + 1}`}
-            bodyStyle={{ paddingBlockEnd: 0 }}
-          >
-            {listDom}
-          </ProCard>
-        )}
-        creatorRecord={{ name: '', items: [{ name: '' }] }}
-        initialValue={record.invoiceDetails}
-      >
-        <ProFormText
-          name="projectName"
-          label="名称"
-          placeholder="请输入名称"
-          readonly
-        />
-        <ProFormDigit label="税率" name="taxRate" min={0} max={100} />
-        <ProFormMoney label="税额" name="taxPrice" locale="zh-CN" min={0} />
-      </ProFormList>*/}
     </ModalForm>
   );
 };
@@ -12,7 +12,7 @@ import {
 import { excelExport } from '@/services/exportRequest';
 import { enumToProTableEnumValue, enumToSelect } from '@/utils';
 import { ActionType, ModalForm, ProTable } from '@ant-design/pro-components';
-import { Button, message } from 'antd';
+import { Button, Divider, Space, Tooltip, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 const InvoiceRecord = () => {
@@ -69,9 +69,31 @@ const InvoiceRecord = () =&gt; {
       ellipsis: true,
     },
     {
+      title: '重开发票',
+      key: 'reissueInvoiceNumbers',
+      width: 120,
+      ellipsis: true,
+      hideInSearch: true,
+      render: (_, record) => {
+        //将record.reissueInvoiceNumbers用，拼接
+        const numbersText = record.reissueInvoiceNumbers?.join(',');
+        return record.reissueInvoiceNumbers?.map((item) => {
+          return (
+            <Tooltip title={numbersText} key={item}>
+              <Space key={item}>
+                {item}
+                <Divider type={'vertical'} />
+              </Space>
+            </Tooltip>
+          );
+        });
+      },
+    },
+    {
       title: '开票日期',
       dataIndex: 'invoicingDate',
       valueType: 'date',
+      width: 140,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -97,22 +119,22 @@ const InvoiceRecord = () =&gt; {
       ellipsis: true,
     },
     {
-      title: '购方税号',
+      title: '联系人',
       valueType: 'text',
-      dataIndex: 'partyATaxid',
+      dataIndex: 'contacts',
+      hideInSearch: true,
       ellipsis: true,
     },
     {
-      title: '收款单位',
+      title: '购方税号',
       valueType: 'text',
-      dataIndex: 'partyBName',
-      hideInSearch: true,
+      dataIndex: 'partyATaxid',
       ellipsis: true,
     },
     {
-      title: '联系人',
+      title: '收款单位',
       valueType: 'text',
-      dataIndex: 'contacts',
+      dataIndex: 'partyBName',
       hideInSearch: true,
       ellipsis: true,
     },
@@ -152,6 +174,18 @@ const InvoiceRecord = () =&gt; {
       hideInTable: true,
     },
     {
+      title: '主订单号',
+      valueType: 'Text',
+      dataIndex: 'mainOrderId',
+      hideInTable: true,
+    },
+    {
+      title: '子订单号',
+      valueType: 'Text',
+      dataIndex: 'subOrderId',
+      hideInTable: true,
+    },
+    {
       title: '发票类型',
       valueType: 'select',
       dataIndex: 'type',
@@ -160,7 +194,6 @@ const InvoiceRecord = () =&gt; {
       hideInTable: true,
       valueEnum: enumToProTableEnumValue(invoiceTypeValueEnum),
     },
-
     {
       title: '开票状态',
       valueType: 'select',
@@ -31,7 +31,6 @@ const InvoiceRecord = () =&gt; {
   const [invoiceRecordDetailVisible, setInvoiceRecordDetailVisible] =
     useState(false);
   const [invoiceRecord] = useState({});
-  const [contextHolder] = message.useMessage();
   const reloadBankStatementTable = () => {
     bankActionRef.current?.reload();
@@ -261,7 +260,6 @@ const InvoiceRecord = () =&gt; {
       ) : (
         ''
       )}
-      {contextHolder}
     </div>
   );
 };
@@ -12,7 +12,7 @@ import {
 } from '@/services';
 import { enumToProTableEnumValue, enumToSelect } from '@/utils';
 import { ActionType, ProTable } from '@ant-design/pro-components';
-import { Space, Table, message } from 'antd';
+import { Divider, Space, Table, Tooltip } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 const InvoiceRecord = () => {
@@ -23,7 +23,6 @@ const InvoiceRecord = () =&gt; {
   const [invoiceRecordDetailVisible, setInvoiceRecordDetailVisible] =
     useState(false);
   const [invoiceRecord, setInvoiceRecord] = useState({});
-  const [contextHolder] = message.useMessage();
   useEffect(() => {
     async function extracted() {
@@ -82,20 +81,50 @@ const InvoiceRecord = () =&gt; {
       valueType: 'Text',
       dataIndex: 'statusText',
       ellipsis: true,
+      width: 100,
       hideInSearch: true,
     },
     {
+      title: '重开发票',
+      key: 'reissueInvoiceNumbers',
+      ellipsis: true,
+      width: 160,
+      hideInSearch: true,
+      render: (_, record) => {
+        //将record.reissueInvoiceNumbers用，拼接
+        const numbersText = record.reissueInvoiceNumbers?.join(',');
+        return record.reissueInvoiceNumbers?.map((item) => {
+          return (
+            <Tooltip title={numbersText} key={item}>
+              <Space>
+                {item}
+                <Divider type={'vertical'} />
+              </Space>
+            </Tooltip>
+          );
+        });
+      },
+    },
+    {
       title: '申请开票时间',
       dataIndex: 'createTime',
       valueType: 'dateTime',
+      width: 160,
       hideInSearch: true,
       ellipsis: true,
     },
     {
+      title: '订单号',
+      valueType: 'text',
+      dataIndex: 'mainOrderId',
+      hideInTable: true,
+    },
+    {
       title: '销售代表',
       valueType: 'text',
       hideInSearch: true,
       ellipsis: true,
+      width: 100,
       dataIndex: 'createByName',
     },
     {
@@ -123,6 +152,7 @@ const InvoiceRecord = () =&gt; {
       title: '开票金额',
       valueType: 'money',
       dataIndex: 'price',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -130,6 +160,7 @@ const InvoiceRecord = () =&gt; {
       title: '开具类型',
       valueType: 'Text',
       dataIndex: 'invoicingTypeText',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -137,6 +168,7 @@ const InvoiceRecord = () =&gt; {
       title: '发票类型',
       valueType: 'Text',
       dataIndex: 'typeText',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -144,6 +176,7 @@ const InvoiceRecord = () =&gt; {
       title: '是否加急',
       valueType: 'Text',
       dataIndex: 'isUrgentText',
+      width: 50,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -259,6 +292,7 @@ const InvoiceRecord = () =&gt; {
       title: '操作',
       valueType: 'option',
       key: 'option',
+      width: 200,
       render: (text, record) => {
         return [
           /*<InvoiceRecordDetailModal
@@ -368,7 +402,7 @@ const InvoiceRecord = () =&gt; {
         form={{}}
         dateFormatter="string"
         headerTitle="待开票列表"
-        scroll={{ x: 1400, y: 360 }}
+        scroll={{ x: 2400, y: 500 }}
       />
       {invoiceRecordDetailVisible ? (
         <InvoiceRecordDetailModal
@@ -379,7 +413,6 @@ const InvoiceRecord = () =&gt; {
       ) : (
         ''
       )}
-      {contextHolder}
     </div>
   );
 };
@@ -10,7 +10,7 @@ import {
   postServiceInvoiceQueryCompanyInfo,
   postServiceInvoiceWaitReissueInvoices,
 } from '@/services';
-import { enum2ReverseSelect, enumToSelect } from '@/utils';
+import { FloatAdd, enum2ReverseSelect, enumToSelect } from '@/utils';
 import { convertCurrency } from '@/utils/numberUtil';
 import {
   DrawerForm,
@@ -27,7 +27,7 @@ import {
 import { Button, Divider, Form, Space, Tooltip, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
-export default ({ dataList, setVisible, onClose }) => {
+export default ({ dataList, setVisible, mainOrder, onClose }) => {
   // let subOrderIds = dataList?.map((item) => {
   //   return item.id;
   // })
@@ -62,6 +62,7 @@ export default ({ dataList, setVisible, onClose }) =&gt; {
         };
       });
       form.setFieldValue('invoiceDetails', initialValue);
+      form.setFieldValue('contacts', mainOrder.customerName);
     };
     initOptions();
   }, []);
@@ -116,7 +117,7 @@ export default ({ dataList, setVisible, onClose }) =&gt; {
                 const totalPrice = form
                   .getFieldValue('invoiceDetails')
                   .reduce((accumulator, currentValue) => {
-                    return accumulator + currentValue.totalPrice;
+                    return FloatAdd(accumulator, currentValue.totalPrice);
                   }, 0);
                 const partyBName = form.getFieldValue('partyBName');
                 const openBank = form.getFieldValue('openBank');
@@ -283,6 +284,11 @@ export default ({ dataList, setVisible, onClose }) =&gt; {
         label="开户行账号"
         placeholder="请输入名称"
       />
+      <ProFormText
+        name="contacts"
+        label="联系人"
+        rules={[{ required: true, message: '请选择银行联行号!' }]}
+      />
       <ProFormMoney
         label="开票金额"
         name="price"
@@ -870,8 +870,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;
+          // values.customerShippingAddress =
+          //   province + city + district + values.customerShippingAddress;
           if (typeof values.erpCustomerId !== 'string') {
             values.erpCustomerId = values.erpCustomerId?.id;
@@ -46,6 +46,8 @@ export const useFieldAuth = ({ operation }: { operation: OPERATION_TYPE }) =&gt; {
     },
   } as Record<string, boolean | object>;
+  console.log(role);
+
   if (operation === OPERATION_TYPE.CREATE) {
     return authFields;
   } else if (operation === OPERATION_TYPE.EDIT) {
@@ -178,7 +178,7 @@ const OrderPage = () =&gt; {
   const [rolePath, setRolePath] = useState([]); //当前角色权限（新增跟打印按钮）
   const userInfo = getUserInfo();
   // const [tableHeight, setTableHeight] = useState(200);
-  const [selectedRows, setSelectedRows] = useState({});
+  const [selectedRows, setSelectedRows] = useState([]);
   const [mainOrderIdSubOrderIdRelationsMap] = useState(new Map()); //主订单id与子订单id的对照关系，用于主订单子订单的勾选校验，子订单全选中对应的主订单自动勾选上
   const [selectedMainOrderKeys, setSelectedMainOrderKeys] = useState<any[]>([]);
   const [selectedSubOrderKeys, setSelectedSubOrderKeys] = useState<any[]>([]);
@@ -227,6 +227,12 @@ const OrderPage = () =&gt; {
   const exportLoadingDestory = () => {
     messageApi.destroy();
   };
+  useEffect(() => {
+    console.log(
+      'selectedRows',
+      selectedRows.every((item) => item.paths.includes('applyInvoicing_old')),
+    );
+  }, [selectedRows]);
   const refreshTable = () => {
     mainTableRef.current?.reload();
@@ -667,6 +673,8 @@ const OrderPage = () =&gt; {
      * @param optRecord
      */
     function getOrderStatusTag(optRecord: any): import('react').ReactNode {
+      console.log(optRecord);
+
       const orderStatus = optRecord.orderStatus;
       const paymentMethod = optRecord.paymentMethod;
       let orderStatusTagText = enumValueToLabel(
@@ -4314,7 +4322,12 @@ const OrderPage = () =&gt; {
             setIsMainOrder(true);
             setApplyForInvoicingVisible(true);
           }}
-          disabled={true} /*{selectedSubOrderKeys?.length === 0}*/
+          disabled={
+            selectedRows.length === 0 ||
+            !selectedRows.every((item) =>
+              item.paths.includes('applyInvoicing_old'),
+            )
+          } /*{selectedSubOrderKeys?.length === 0}*/
         >
           {roleCode === 'admin' ? '合并(销售)' : '合并开票'}
         </Button>,
+import {
+  postOrderErpOrderStagesUpload,
+  postServiceConstStores,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import {
+  DrawerForm,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+  ProFormUploadDragger,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { RcFile } from 'antd/es/upload';
+
+export default () => {
+  const [form] = Form.useForm();
+  return (
+    <DrawerForm
+      title="新增采购退货单"
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 300,
+      }}
+      form={form}
+      trigger={<Button type="primary">新增</Button>}
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        console.log(values.name);
+        message.success('提交成功');
+        // 不返回不会关闭弹框
+        return true;
+      }}
+    >
+      <ProFormText
+        name="consignee"
+        label="收货人"
+        placeholder="请输入收货人"
+        rules={[
+          {
+            required: true,
+            message: '请输入收货人',
+          },
+        ]}
+      />
+      <ProFormText
+        name="phoneNumber"
+        label="联系电话"
+        placeholder="请输入联系电话"
+        rules={[
+          {
+            required: true,
+            message: '请输入联系电话',
+          },
+        ]}
+      />
+      <ProFormText
+        name="address"
+        label="收货地址"
+        placeholder="请输入收货地址"
+        rules={[
+          {
+            required: true,
+            message: '请输入联系电话',
+          },
+        ]}
+      />
+      <ProFormTextArea
+        name="productDetail"
+        label="产品明细"
+        placeholder="请输入产品明细"
+        rules={[
+          {
+            required: true,
+            message: '请输入联系电话',
+          },
+        ]}
+      ></ProFormTextArea>
+      <ProFormSelect
+        name="sendStore"
+        label="发货仓库"
+        request={async () => {
+          const res = await postServiceConstStores();
+          return enumToSelect(res.data);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请输入联系电话',
+          },
+        ]}
+      ></ProFormSelect>
+      <ProFormTextArea
+        name="notes"
+        label="备注"
+        placeholder="请输入备注"
+      ></ProFormTextArea>
+      <ProFormUploadDragger
+        label="附件"
+        name="attachmentsFile"
+        action="upload.do"
+        onChange={({ fileList: newFileList }) => {
+          if (newFileList.length > 0) {
+            const formData = new FormData();
+            formData.append('file', newFileList[0].originFileObj as RcFile);
+            const res = await postOrderErpOrderStagesUpload({
+              data: formData,
+              headers: {
+                'Content-Type':
+                  'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+              },
+            });
+            const url = res.data;
+            form.setFieldValue('attachments', url);
+          } else {
+            form.setFieldValue('attachments', null);
+          }
+        }}
+        max={1}
+      />
+      <ProFormText name="attachments" hidden></ProFormText>
+    </DrawerForm>
+  );
+};
+.prepaid-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 AddDrawer from '@/pages/procure/components/AddDrawer';
+import {
+  postProcureReturnBillPage,
+  postServiceConstProcureReturnBills,
+  postServiceConstStores,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import { EllipsisOutlined } from '@ant-design/icons';
+import type { ActionType, ProColumns } from '@ant-design/pro-components';
+import { ProTable, TableDropdown } from '@ant-design/pro-components';
+import { Button, Dropdown } from 'antd';
+import { useRef } from 'react';
+export const waitTimePromise = async (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+export const waitTime = async (time: number = 100) => {
+  await waitTimePromise(time);
+};
+
+const columns: ProColumns[] = [
+  {
+    title: '订单编号',
+    width: 120,
+    dataIndex: 'id',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '收获人',
+    width: 120,
+    dataIndex: 'consignee',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '联系电话',
+    width: 120,
+    dataIndex: 'phoneNumber',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '收货地址',
+    width: 120,
+    dataIndex: 'address',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '产品明细',
+    width: 120,
+    dataIndex: 'productDetail',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '发货仓库',
+    width: 120,
+    dataIndex: 'sendStoreText',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '创建人',
+    width: 120,
+    dataIndex: 'createByName',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '创建时间',
+    width: 120,
+    valueType: 'dateTime',
+    dataIndex: 'createTime',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '订单状态',
+    width: 120,
+    dataIndex: 'statusText',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '附件',
+    width: 120,
+    dataIndex: 'attachments',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '备注',
+    width: 120,
+    dataIndex: 'notes',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+  {
+    title: '发货信息',
+    width: 120,
+    dataIndex: 'sendInfo',
+    ellipsis: true,
+    hideInSearch: true,
+  },
+
+  {
+    title: '订单编号',
+    width: 120,
+    dataIndex: 'id',
+    hideInTable: true,
+  },
+  {
+    title: '收货人',
+    width: 120,
+    dataIndex: 'consigneeLike',
+    hideInTable: true,
+  },
+  {
+    title: '联系电话',
+    width: 120,
+    dataIndex: 'phoneNumberLike',
+    hideInTable: true,
+  },
+  {
+    title: '发货仓库',
+    width: 120,
+    dataIndex: 'sendStore',
+    valueType: 'select',
+    hideInTable: true,
+    request: async () => {
+      const res = await postServiceConstStores();
+      return enumToSelect(res.data);
+    },
+  },
+  {
+    title: '订单状态',
+    width: 120,
+    dataIndex: 'status',
+    valueType: 'select',
+    hideInTable: true,
+    request: async () => {
+      const res = await postServiceConstProcureReturnBills();
+      return enumToSelect(res.data);
+    },
+  },
+  {
+    title: '创建人',
+    width: 120,
+    dataIndex: 'createByNameLike',
+    hideInTable: true,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    valueType: 'dateTimeRange',
+    search: {
+      transform: (value: any) => ({
+        createTimeGe: value[0],
+        createTimeLe: value[1],
+      }),
+    },
+    hideInTable: true,
+  },
+  {
+    title: '操作',
+    valueType: 'option',
+    key: 'option',
+    render: (text, record, _, action) => [
+      <a
+        key="editable"
+        onClick={() => {
+          action?.startEditable?.(record.id);
+        }}
+      >
+        编辑
+      </a>,
+      <a href={record.url} target="_blank" rel="noopener noreferrer" key="view">
+        查看
+      </a>,
+      <TableDropdown
+        key="actionGroup"
+        onSelect={() => action?.reload()}
+        menus={[
+          { key: 'copy', name: '复制' },
+          { key: 'delete', name: '删除' },
+        ]}
+      />,
+    ],
+  },
+];
+
+export default () => {
+  const actionRef = useRef<ActionType>();
+  return (
+    <ProTable
+      columns={columns}
+      actionRef={actionRef}
+      cardBordered
+      request={async (params, sort, filter) => {
+        console.log(sort, filter);
+        const res = await postProcureReturnBillPage({
+          data: params,
+        });
+        console.log(res);
+        return res.data;
+      }}
+      editable={{
+        type: 'multiple',
+      }}
+      scroll={{ x: 1300 }}
+      columnsState={{
+        persistenceKey: 'pro-table-singe-demos',
+        persistenceType: 'localStorage',
+        defaultValue: {
+          option: { fixed: 'right', disable: true },
+        },
+        onChange(value) {
+          console.log('value: ', value);
+        },
+      }}
+      rowKey="id"
+      search={{
+        labelWidth: 'auto',
+      }}
+      options={{
+        setting: {
+          listsHeight: 400,
+        },
+      }}
+      form={{
+        // 由于配置了 transform，提交的参数与定义的不同这里需要转化一下
+        syncToUrl: (values, type) => {
+          if (type === 'get') {
+            return {
+              ...values,
+              created_at: [values.startTime, values.endTime],
+            };
+          }
+          return values;
+        },
+      }}
+      pagination={{
+        pageSize: 5,
+        onChange: (page) => console.log(page),
+      }}
+      dateFormatter="string"
+      headerTitle="高级表格"
+      toolBarRender={() => [
+        <AddDrawer key="add" />,
+        <Dropdown
+          key="menu"
+          menu={{
+            items: [
+              {
+                label: '1st item',
+                key: '1',
+              },
+              {
+                label: '2nd item',
+                key: '2',
+              },
+              {
+                label: '3rd item',
+                key: '3',
+              },
+            ],
+          }}
+        >
+          <Button>
+            <EllipsisOutlined />
+          </Button>
+        </Dropdown>,
+      ]}
+    />
+  );
+};
@@ -71,6 +71,14 @@ export type ModelAndViewStatus =
   | '509 BANDWIDTH_LIMIT_EXCEEDED'
   | '510 NOT_EXTENDED'
   | '511 NETWORK_AUTHENTICATION_REQUIRED';
+export type ProcureReturnBillDtoSendStore =
+  | 'DALANG_WAREHOUSE'
+  | 'HOUJIE_WAREHOUSE';
+export type ProcureReturnBillDtoStatus =
+  | 'AUDIT_NOTPASS'
+  | 'WAIT_SEND'
+  | 'SENDED'
+  | 'WAIT_AUDIT';
 export interface AdminAuthRoleVO {
   menuIds?: Array<number>;
   /** @format int64 */
@@ -863,6 +871,7 @@ export interface ApplyInvoiceDTO {
    *   接收邮箱地址
    */
   receiveEmail?: string;
+  reissueInvoiceNumbers?: Array<string>;
   reissueInvoiceRecordIds?: Array<number>;
   /**
    * @description
@@ -1600,6 +1609,7 @@ export interface InvoiceRecordDTO {
    *   接收邮箱地址
    */
   receiveEmail?: string;
+  reissueInvoiceNumbers?: Array<string>;
   reissueInvoiceRecordIds?: Array<number>;
   /**
    * @description
@@ -2513,6 +2523,84 @@ export interface ProcurePrintDto {
   ids?: Array<number>;
 }
+export interface ProcureReturnBillDto {
+  /**
+   * @description
+   *   收货地址
+   */
+  address?: string;
+  /**
+   * @description
+   *   附件
+   */
+  attachments?: string;
+  /**
+   * @description
+   *   收获人
+   */
+  consignee?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  /**
+   * @description
+   *   订单编号
+   * @format int64
+   */
+  id?: number;
+  logicDelete?: boolean;
+  /**
+   * @description
+   *   备注
+   */
+  notes?: string;
+  paths?: Array<string>;
+  /**
+   * @description
+   *   联系电话
+   */
+  phoneNumber?: string;
+  /**
+   * @description
+   *   产品明细
+   */
+  productDetail?: string;
+  /**
+   * @description
+   *   发货信息
+   */
+  sendInfo?: string;
+  /**
+   * @description
+   *   发货仓库
+   */
+  sendStore?: ProcureReturnBillDtoSendStore;
+  /**
+   * @description
+   *   发货仓库
+   */
+  sendStoreText?: string;
+  /**
+   * @description
+   *   订单状态
+   */
+  status?: ProcureReturnBillDtoStatus;
+  /**
+   * @description
+   *   订单状态
+   * @format int32
+   */
+  statusCode?: number;
+  /**
+   * @description
+   *   订单状态
+   */
+  statusText?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
 export interface ProductInformationDto {
   /**
    * @description
@@ -2899,6 +2987,32 @@ export interface QueryMainOrderDto {
   customerName?: string;
 }
+export interface QueryProcureReturnBillDto {
+  consigneeLike?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /** @format int64 */
+  id?: number;
+  /** @format int32 */
+  pageSize?: number;
+  phoneNumberLike?: string;
+  /** @format int32 */
+  sendStore?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  status?: number;
+  /** @format int32 */
+  total?: number;
+}
+
 export interface QueryReportFormsDto {
   /**
    * @description
@@ -63,7 +63,6 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -83,6 +82,7 @@ import type {
   ProcureConvertProcureDto,
   ProcureOrderDto,
   ProcurePrintDto,
+  ProcureReturnBillDto,
   ProductInformationDto,
   QueryAfterSalesInfoSnapshotDto,
   QueryAnnexDto,
@@ -95,6 +95,7 @@ import type {
   QueryInvoiceProjectDto,
   QueryInvoiceRecordDto,
   QueryMainOrderDto,
+  QueryProcureReturnBillDto,
   QueryReportFormsDto,
   ReissueInvoiceDto,
   ResearchGroupAddRequest,
@@ -3226,7 +3227,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -3247,9 +3250,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';
@@ -3273,7 +3276,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -3299,9 +3304,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__ */ (() => {
@@ -3326,7 +3331,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -3352,9 +3359,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__ */ (() => {
@@ -3379,7 +3386,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -3400,9 +3409,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';
@@ -3426,7 +3435,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -3447,9 +3458,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__ */ (() => {
@@ -3474,7 +3485,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -3495,9 +3508,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__ */ (() => {
@@ -3522,7 +3535,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -3543,9 +3558,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__ */ (() => {
@@ -10523,6 +10538,219 @@ export const postPrepaidUpdate = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postProcureReturnBillAdd */
+export interface PostProcureReturnBillAddOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProcureReturnBillDto;
+  };
+}
+
+/** @description response type for postProcureReturnBillAdd */
+export interface PostProcureReturnBillAddResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProcureReturnBillAddResponseSuccess =
+  PostProcureReturnBillAddResponse[200];
+/**
+ * @description
+ *   添加
+ * @tags procure-return-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProcureReturnBillAdd = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/procureReturnBill/add';
+  function request(
+    option: PostProcureReturnBillAddOption,
+  ): Promise<PostProcureReturnBillAddResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProcureReturnBillAddResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postProcureReturnBillModify */
+export interface PostProcureReturnBillModifyOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProcureReturnBillDto;
+  };
+}
+
+/** @description response type for postProcureReturnBillModify */
+export interface PostProcureReturnBillModifyResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProcureReturnBillModifyResponseSuccess =
+  PostProcureReturnBillModifyResponse[200];
+/**
+ * @description
+ *   修改
+ * @tags procure-return-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProcureReturnBillModify = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/procureReturnBill/modify';
+  function request(
+    option: PostProcureReturnBillModifyOption,
+  ): Promise<PostProcureReturnBillModifyResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProcureReturnBillModifyResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postProcureReturnBillPage */
+export interface PostProcureReturnBillPageOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryProcureReturnBillDto;
+  };
+}
+
+/** @description response type for postProcureReturnBillPage */
+export interface PostProcureReturnBillPageResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProcureReturnBillPageResponseSuccess =
+  PostProcureReturnBillPageResponse[200];
+/**
+ * @description
+ *   分页查询
+ * @tags procure-return-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProcureReturnBillPage = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/procureReturnBill/page';
+  function request(
+    option: PostProcureReturnBillPageOption,
+  ): Promise<PostProcureReturnBillPageResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProcureReturnBillPageResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postResearchGroupMemberRequestsAdd */
 export interface PostResearchGroupMemberRequestsAddOption {
   /**
@@ -12440,6 +12668,114 @@ export const postServiceConstNotCanModifyInvoiceRecordStatus =
     return request;
   })();
+/** @description response type for postServiceConstProcureReturnBills */
+export interface PostServiceConstProcureReturnBillsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstProcureReturnBillsResponseSuccess =
+  PostServiceConstProcureReturnBillsResponse[200];
+/**
+ * @description
+ *   获取仓库
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstProcureReturnBills = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/procureReturnBills';
+  function request(): Promise<PostServiceConstProcureReturnBillsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstProcureReturnBillsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for postServiceConstStores */
+export interface PostServiceConstStoresResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstStoresResponseSuccess =
+  PostServiceConstStoresResponse[200];
+/**
+ * @description
+ *   获取仓库
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstStores = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/stores';
+  function request(): Promise<PostServiceConstStoresResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstStoresResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstTradeStatus */
 export interface PostServiceConstTradeStatusResponse {
   /**