chore(release): 重构下载文件方法

- 将 orderExport 方法重命名为 downloadFile，以更准确地反映其功能 - 更新了多个页面和组件中对下载文件方法的调用 - 修改了部分接口和类型定义，以适应新的下载文件方法

chore(release): 重构下载文件方法
- 将 orderExport 方法重命名为 downloadFile，以更准确地反映其功能 - 更新了多个页面和组件中对下载文件方法的调用 - 修改了部分接口和类型定义，以适应新的下载文件方法
曾国涛
1 parent 4226626f
Showing 16 changed files with 248 additions and 41 deletions
src/pages/Client/Components/ClientImportModal.tsx
src/pages/Client/index.tsx
src/pages/Instalment/components/title/title.tsx
src/pages/Instalment/components/title/titletest.tsx
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceRecord/index.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
src/pages/Invoice/constant.tsx
src/pages/Order/Order/components/ImportModal.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/OrderWarning/components/ImportModal.tsx
src/pages/ResearchGroup/components/ImportModal.tsx
src/pages/procure/index.tsx
src/services/definition.ts
src/services/order.ts
src/services/request.ts
 import { RESPONSE_CODE } from '@/constants/enum';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { blobToJson } from '@/utils';
 import { ModalForm, ProFormUploadDragger } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
@@ -15,7 +15,7 @@ export default () =&gt; {
       content: '正在导入...',
       duration: 0,
     });
-    orderExport(
+    downloadFile(
       '/api/admin/client/downloadImportTemplate',
       '客户导入模板.xlsx',
       'post',
@@ -8,7 +8,7 @@ import {
   postServiceConstClientLevels,
   postServiceConstTradeStatus,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { enumToSelect } from '@/utils';
 import type { ActionType } from '@ant-design/pro-components';
 import { ProTable } from '@ant-design/pro-components';
@@ -267,7 +267,7 @@ export default () =&gt; {
                     content: '导出中...',
                     duration: 0,
                   });
-                  orderExport(
+                  downloadFile(
                     '/api/admin/client/exportClients',
                     '客户信息.xlsx',
                     'POST',
@@ -3,7 +3,7 @@ import {
   getOrderErpOrderStagesListAll,
   postOrderErpOrderStagesSearch,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { VerticalAlignTopOutlined } from '@ant-design/icons';
 import type { ProColumns } from '@ant-design/pro-components';
 import { ProTable } from '@ant-design/pro-components';
@@ -153,7 +153,7 @@ export default () =&gt; {
   async function toExport() {
     // await getOrderErpOrderStagesExport()
-    orderExport(
+    downloadFile(
       '/api/order/erp/orderStages/export',
       '分期订单.xlsx',
       'get',
@@ -3,7 +3,7 @@ import {
   getOrderErpOrderStagesListAll,
   postOrderErpOrderStagesSearch,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { VerticalAlignTopOutlined } from '@ant-design/icons';
 import type { ProColumns } from '@ant-design/pro-components';
 import { EditableProTable } from '@ant-design/pro-components';
@@ -192,7 +192,7 @@ export default () =&gt; {
   async function toExport() {
     // await getOrderErpOrderStagesExport()
-    orderExport(
+    downloadFile(
       '/api/order/erp/orderStages/export',
       '分期订单.xlsx',
       'get',
@@ -7,12 +7,13 @@ import InvoiceWriteOffModal from &#39;@/pages/Invoice/Invoice/components/invoiceWrit
 import { INVOICE_COLUMNS } from '@/pages/Invoice/constant';
 import { INVOCING_STATUS, PAYEE_OPTIONS } from '@/pages/Order/constant';
 import {
+  postServiceInvoiceConfirmInvoice,
   postServiceInvoiceDeleteInvoice,
   postServiceInvoiceGetWriteOffRecord,
   postServiceInvoiceModify,
   postServiceInvoiceQueryInvoice,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
 import { ActionType, ProTable } from '@ant-design/pro-components';
@@ -193,6 +194,25 @@ const InvoiceRecord = () =&gt; {
             />,
           );
         }
+        if (record.paths?.includes('confirmInvoice')) {
+          btns.push(
+            <ButtonConfirm
+              key="delete"
+              className="p-0"
+              title={'确认发票？'}
+              text="确认发票"
+              onConfirm={async () => {
+                let res = await postServiceInvoiceConfirmInvoice({
+                  data: { invoiceIds: [record.id] },
+                });
+                if (res) {
+                  message.success(res.message);
+                  reloadInvoiceTable();
+                }
+              }}
+            />,
+          );
+        }
         return btns;
       },
     });
@@ -255,7 +275,7 @@ const InvoiceRecord = () =&gt; {
                   content: '导出中...',
                   duration: 0,
                 });
-                orderExport(
+                downloadFile(
                   '/api/service/invoice/exportInvoices',
                   '发票.xlsx',
                   'POST',
@@ -5,6 +5,7 @@ import {
   postServiceBankStatementEditBankStatement,
   postServiceConstAfterInvoicingInvoiceRecordStatus,
   postServiceConstInvoiceType,
+  postServiceInvoiceDownloadInvoice,
   postServiceInvoiceInvoicing,
   postServiceInvoiceQueryInvoiceRecordList,
   postServiceOrderQuerySalesCode,
@@ -56,11 +57,13 @@ const InvoiceRecord = () =&gt; {
       duration: 0,
     });
     axios({
-      url: '/api/file/directDown',
+      url: '/api/service/invoice/batchDown',
       method: 'post',
       responseType: 'blob',
       headers: { Authorization: localStorage.getItem('token') },
-      data: urls,
+      data: {
+        invoiceRecordIds: urls,
+      },
     })
       .then((response) => {
         // 创建一个新的 Blob 对象，它包含了服务器响应的数据（即你的 Excel 文件）
@@ -202,6 +205,12 @@ const InvoiceRecord = () =&gt; {
       ellipsis: true,
     },
     {
+      title: '发票下载次数',
+      dataIndex: 'downloadCount',
+      valueType: 'Text',
+      hideInSearch: true,
+    },
+    {
       title: '失败原因',
       valueType: 'text',
       dataIndex: 'failureReason',
@@ -310,7 +319,15 @@ const InvoiceRecord = () =&gt; {
         <>
           {record.status === 'SUCCESS' &&
             record.paths.includes('DOWNLOAD_INVOICE') && (
-              <a href={record.invoiceAddress} download>
+              <a
+                href={record.invoiceAddress}
+                download
+                onClick={() => {
+                  postServiceInvoiceDownloadInvoice({
+                    data: record.id,
+                  });
+                }}
+              >
                 下载发票
               </a>
             )}
@@ -447,10 +464,10 @@ const InvoiceRecord = () =&gt; {
               <Button
                 type={'primary'}
                 onClick={() => {
-                  const urls = selectedRows.map((item) => {
-                    return item.invoiceAddress;
+                  const ids = selectedRows.map((item) => {
+                    return item.id;
                   });
-                  downloadImportTemplate(urls);
+                  downloadImportTemplate(ids);
                 }}
                 disabled={selectedRowKeys.length === 0}
               >
@@ -16,7 +16,7 @@ import {
   postServiceBankStatementQueryBankStatement,
   postServiceInvoiceGetWriteOffRecord,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
 import { PlusOutlined } from '@ant-design/icons';
@@ -241,7 +241,7 @@ const InvoiceRecord = () =&gt; {
                   content: '导出中...',
                   duration: 0,
                 });
-                orderExport(
+                downloadFile(
                   '/api/service/invoice/exportBankStatements',
                   '银行流水.xlsx',
                   'POST',
@@ -146,6 +146,12 @@ export const INVOICE_COLUMNS = [
     width: 100,
   },
   {
+    title: '来源',
+    dataIndex: 'createByName',
+    valueType: 'text',
+    width: 100,
+  },
+  {
     title: '销售',
     dataIndex: 'sale',
     valueType: 'text',
@@ -178,6 +184,7 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'invoicingTime',
     valueType: 'date',
     width: 150,
+    hideInTable: true,
     search: {
       transform: (value) => {
         if (value) {
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderImportExcel } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { UploadOutlined } from '@ant-design/icons';
 import { Button, Modal, Upload, message } from 'antd';
 import { RcFile, UploadFile, UploadProps } from 'antd/es/upload';
@@ -26,7 +26,7 @@ export default ({ onClose }) =&gt; {
   };
   const downloadTemplate = async () => {
     exportLoading('正在下载模板...');
-    orderExport(
+    downloadFile(
       '/api/service/order/exportTemplate',
       '订单.xlsx',
       'post',
@@ -63,7 +63,7 @@ export default ({ onClose }) =&gt; {
       }
       //存在错误信息，下载错误信息模板
       exportLoading('正在下载错误信息...');
-      orderExport(
+      downloadFile(
         '/api/service/order/errorExcelInformation',
         '订单.xlsx',
         'post',
@@ -22,7 +22,7 @@ import {
   postServiceOrderSalesConfirm,
   postServiceOrderWarningOrderStatistics,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import {
   FloatAdd,
   copyToClipboard,
@@ -225,7 +225,7 @@ const OrderPage = () =&gt; {
     );
     return [...subOrderSelectedMap.values()]
       .flat()
-      .every((subItem) => subItem.paths.includes('applyInvoicing_old'));
+      .every((subItem) => subItem.paths?.includes('applyInvoicing_old'));
   }, [selectedSubOrderKeys]);
   console.log(JSON.stringify(userInfo));
@@ -4228,7 +4228,7 @@ const OrderPage = () =&gt; {
         onClick: async () => {
           let body = { flag: 50, ...searchParams };
           exportLoading();
-          orderExport(
+          downloadFile(
             '/api/service/order/export',
             '订单导出结果.xls',
             'POST',
@@ -4247,7 +4247,7 @@ const OrderPage = () =&gt; {
           }
           let body = { flag: 30, id: Array.from(mainOrderSelectedMap.keys()) };
           exportLoading();
-          orderExport(
+          downloadFile(
             '/api/service/order/export',
             '订单导出结果.xls',
             'POST',
@@ -4262,7 +4262,7 @@ const OrderPage = () =&gt; {
         onClick: async () => {
           let body = { flag: 40, ids: [] };
           exportLoading();
-          orderExport(
+          downloadFile(
             '/api/service/order/export',
             '订单导出结果.xls',
             'POST',
@@ -4277,7 +4277,7 @@ const OrderPage = () =&gt; {
         onClick: async () => {
           let body = { flag: 10, ids: [] };
           exportLoading();
-          orderExport(
+          downloadFile(
             '/api/service/order/export',
             '订单导出结果.xls',
             'POST',
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderImportExcel } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { UploadOutlined } from '@ant-design/icons';
 import { Button, Modal, Upload, message } from 'antd';
 import { RcFile, UploadFile, UploadProps } from 'antd/es/upload';
@@ -26,7 +26,7 @@ export default ({ onClose }) =&gt; {
   };
   const downloadTemplate = async () => {
     exportLoading('正在下载模板...');
-    orderExport(
+    downloadFile(
       '/api/service/order/exportTemplate',
       '订单.xlsx',
       'post',
@@ -63,7 +63,7 @@ export default ({ onClose }) =&gt; {
       }
       //存在错误信息，下载错误信息模板
       exportLoading('正在下载错误信息...');
-      orderExport(
+      downloadFile(
         '/api/service/order/errorExcelInformation',
         '订单.xlsx',
         'post',
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postResearchGroupsImport } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { UploadOutlined } from '@ant-design/icons';
 import { Button, Modal, Upload, message } from 'antd';
 import { RcFile, UploadFile, UploadProps } from 'antd/es/upload';
@@ -26,7 +26,7 @@ export default ({ onClose }) =&gt; {
   };
   const downloadTemplate = async () => {
     exportLoading('正在下载模板...');
-    orderExport(
+    downloadFile(
       '/api/research/groups/download/importTemplate',
       '导入模板.xls',
       'POST',
@@ -10,7 +10,7 @@ import {
   postServiceConstProcureReturnBills,
   postServiceConstStores,
 } from '@/services';
-import { orderExport } from '@/services/order';
+import { downloadFile } from '@/services/order';
 import { enumToSelect } from '@/utils';
 import type { ActionType, ProColumns } from '@ant-design/pro-components';
 import { ProTable } from '@ant-design/pro-components';
@@ -284,7 +284,7 @@ export default () =&gt; {
                   content: '导出中...',
                   duration: 0,
                 });
-                orderExport(
+                downloadFile(
                   '/api/procureReturnBill/export',
                   '客户信息.xlsx',
                   'POST',
@@ -749,6 +749,8 @@ export interface ApplyInvoiceDTO {
   createByName?: string;
   /** @format date-time */
   createTime?: string;
+  /** @format int32 */
+  downloadCount?: number;
   failureReason?: string;
   /**
    * @description
@@ -1126,6 +1128,18 @@ export interface CompanyInfoDto {
   version?: number;
 }
+export interface ConfirmInvoiceDTO {
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  invoiceIds?: Array<number>;
+  logicDelete?: boolean;
+  paths?: Array<string>;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
 export interface Contactperson {
   birthday?: string;
   contactAddress?: string;
@@ -1399,6 +1413,10 @@ export interface InventoryMaterialStockReq {
   materialId?: string;
 }
+export interface InvoiceBatchDownloadDto {
+  invoiceRecordIds?: Array<number>;
+}
+
 export interface InvoiceDto {
   /**
    * @description
@@ -1423,6 +1441,7 @@ export interface InvoiceDto {
    */
   contacts?: string;
   createByName?: string;
+  createByNameText?: string;
   /** @format date-time */
   createTime?: string;
   /**
@@ -1552,6 +1571,8 @@ export interface InvoiceRecordDTO {
   createByName?: string;
   /** @format date-time */
   createTime?: string;
+  /** @format int32 */
+  downloadCount?: number;
   failureReason?: string;
   /**
    * @description
 import axios from 'axios';
-export const orderExport = async (
+export const downloadFile = async (
   url: any = '',
   fileName: any = '',
   method: any = '',
@@ -42,6 +42,7 @@ import type {
   CommonAuditRequest,
   CompanyInfo,
   CompanyInfoDto,
+  ConfirmInvoiceDTO,
   CustomFieldRes,
   CustomerCustomerListReq,
   CustomerDetailDto,
@@ -54,6 +55,7 @@ import type {
   DistrictSearchDo,
   Dto,
   InventoryMaterialStockReq,
+  InvoiceBatchDownloadDto,
   InvoiceDto,
   InvoiceRecordDTO,
   InvoiceRecordQueryRequest,
@@ -13965,6 +13967,77 @@ export const postServiceInvoiceApplyInvoice = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceBatchDown */
+export interface PostServiceInvoiceBatchDownOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: InvoiceBatchDownloadDto;
+  };
+}
+
+/** @description response type for postServiceInvoiceBatchDown */
+export interface PostServiceInvoiceBatchDownResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceBatchDownResponseSuccess =
+  PostServiceInvoiceBatchDownResponse[200];
+/**
+ * @description
+ *   directDownFile
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceBatchDown = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/batchDown';
+  function request(
+    option: PostServiceInvoiceBatchDownOption,
+  ): Promise<PostServiceInvoiceBatchDownResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceBatchDownResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceCancelApply */
 export interface PostServiceInvoiceCancelApplyOption {
   /**
@@ -14179,6 +14252,77 @@ export const postServiceInvoiceCancelInvoiceRecord = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceConfirmInvoice */
+export interface PostServiceInvoiceConfirmInvoiceOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ConfirmInvoiceDTO;
+  };
+}
+
+/** @description response type for postServiceInvoiceConfirmInvoice */
+export interface PostServiceInvoiceConfirmInvoiceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceConfirmInvoiceResponseSuccess =
+  PostServiceInvoiceConfirmInvoiceResponse[200];
+/**
+ * @description
+ *   确认发票
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceConfirmInvoice = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/confirmInvoice';
+  function request(
+    option: PostServiceInvoiceConfirmInvoiceOption,
+  ): Promise<PostServiceInvoiceConfirmInvoiceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceConfirmInvoiceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceDealInvoicingResult */
 export interface PostServiceInvoiceDealInvoicingResultOption {
   /**
@@ -14326,14 +14470,12 @@ export interface PostServiceInvoiceDownloadInvoiceOption {
   /**
    * @description
    *   recodId
-   * @format int64
    */
-  query?: {
+  body: {
     /**
         @description
-          recodId
-        @format int64 */
-    recodId?: number;
+          recodId */
+    recodId: number;
   };
 }
@@ -14379,7 +14521,7 @@ export const postServiceInvoiceDownloadInvoice = /* #__PURE__ */ (() =&gt; {
   const method = 'post';
   const url = '/service/invoice/downloadInvoice';
   function request(
-    option?: PostServiceInvoiceDownloadInvoiceOption,
+    option: PostServiceInvoiceDownloadInvoiceOption,
   ): Promise<PostServiceInvoiceDownloadInvoiceResponseSuccess> {
     return requester(request.url, {
       method: request.method,