feat: update 发票核销

zhongnanhuang
1 parent 53ad288e
Showing 4 changed files with 75 additions and 20 deletions
src/pages/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
+import ButtonConfirm from '@/components/ButtomConfirm';
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
 import { INVOCING_STATUS, PAYEE_OPTIONS } from '@/pages/Order/constant';
-import { postServiceInvoiceQueryInvoiceDetail } from '@/services';
+import {
+  postServiceInvoiceCancelInvoiceAndBankStatement,
+  postServiceInvoiceQueryInvoiceDetail,
+} from '@/services';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
 import { PlusOutlined } from '@ant-design/icons';
@@ -12,6 +16,7 @@ import {
   Divider,
   Flex,
   Form,
+  message,
 } from 'antd';
 import { useEffect, useState } from 'react';
 import { BANK_STATEMENT_COLUMNS, INVOICE_STATUS } from '../constant';
@@ -205,25 +210,24 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       fixed: 'right',
       width: 70,
       render: (text, record) => [
-        <Button
+        <ButtonConfirm
+          key="delete"
           className="p-0"
-          key="choose"
-          type="link"
-          onClick={() => {
-            //去掉表格中对应的数据
-            let newBankData = bankData.filter((item) => {
-              return item.id !== record.id;
+          title={'确认删除此项吗？'}
+          text="删除"
+          onConfirm={async () => {
+            let res = await postServiceInvoiceCancelInvoiceAndBankStatement({
+              data: {
+                invoiceId: invoiceId,
+                cancelId: [record.id],
+              },
             });
-            setBankData(newBankData);
-
-            //添加到已选中区域中
-            let newSelectedStatement = [...selectedStatement];
-            newSelectedStatement.push(record);
-            setSelectedStatement(newSelectedStatement);
+            if (res) {
+              message.success(res.message);
+              loadInvoiceData();
+            }
           }}
-        >
-          选中
-        </Button>,
+        />,
       ],
     });
  
@@ -25,8 +25,10 @@ import {
   QuestionCircleOutlined,
 } from '@ant-design/icons';
 import {
+  ActionType,
   PageContainer,
   ProColumns,
+  ProFormInstance,
   ProTable,
 } from '@ant-design/pro-components';
 import { history } from '@umijs/max';
@@ -45,7 +47,7 @@ import {
   message,
 } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { Key, useRef, useState } from 'react';
+import React, { Key, useEffect, useRef, useState } from 'react';
 import OrderPrintModal from '../OrderPrint/OrderPrintModal';
 import AfterSalesDrawer from './components/AfterSalesDrawer';
 import ApplyForInvoicingModal from './components/ApplyForInvoicingModal';
@@ -143,7 +145,8 @@ const OrderPage = () =&gt; {
   const [mainOrderSelectedRows, setMainOrderSelectedRows] = useState([]); //选中的主订单集合
   const [onlyShowFinancialToBeProcessed, setOnlyShowFinancialToBeProcessed] =
     useState(false);
-  const mainTableRef = useRef();
+  const mainTableRef = useRef<ActionType>();
+  const mainTableFormRef = useRef<ProFormInstance>();
   let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
   const [messageApi, contextHolder] = message.useMessage();
  
@@ -2322,6 +2325,15 @@ const OrderPage = () =&gt; {
     return toolBtns;
   }
  
+  useEffect(() => {
+    // 使用URLSearchParams来解析查询参数
+    const params = new URLSearchParams(location.search);
+    const id = params.get('id');
+    if (id) {
+      mainTableFormRef.current?.setFieldValue('id', id);
+    }
+  }, []);
+
   return (
     <PageContainer
       className="order-page-container"
@@ -2365,6 +2377,7 @@ const OrderPage = () =&gt; {
         // tableStyle={{backgroundColor:'red'}}
  
         actionRef={mainTableRef}
+        formRef={mainTableFormRef}
         expandIconColumnIndex={-1}
         columns={mainOrdersColumns}
         rowKey="id"
@@ -2396,6 +2409,12 @@ const OrderPage = () =&gt; {
           filter,
         ) => {
           //订单id处理
+          /**
+           * 以params中的id为主，如果params没id，则取url中的id
+           * 第一次进来这个页面，url带有id的话，会自动填充到查询表单中，但是第一次查询params不会带这个id进来
+           */
+          let orderIds = mainTableFormRef.current?.getFieldValue('id');
+          params.id = params.id || orderIds;
           if (params.id !== '') {
             if (params.id?.indexOf(',')) {
               params.id = params.id.split(',');
@@ -324,6 +324,20 @@ export interface AuditVO {
   total?: number;
 }
  
+export interface CancelInvoiceAndBankStatementDto {
+  /**
+   * @description
+   *   取消关联的银行流水id集合
+   */
+  cancelId?: Array<number>;
+  /**
+   * @description
+   *   发票id
+   * @format int64
+   */
+  invoiceId?: number;
+}
+
 export interface CaptchaMessageVO {
   /** @format int32 */
   current?: number;
@@ -22,6 +22,7 @@ import type {
   AdminUserRegisterVO,
   AdminUserVO,
   AuditVO,
+  CancelInvoiceAndBankStatementDto,
   CaptchaMessageVO,
   DictionaryQueryVO,
   DictionaryVO,
@@ -5119,6 +5120,20 @@ export const postServiceBankStatementQueryBankStatement =
     return request;
   })();
  
+/** @description request parameter type for postServiceInvoiceCancelInvoiceAndBankStatement */
+export interface PostServiceInvoiceCancelInvoiceAndBankStatementOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: CancelInvoiceAndBankStatementDto;
+  };
+}
+
 /** @description response type for postServiceInvoiceCancelInvoiceAndBankStatement */
 export interface PostServiceInvoiceCancelInvoiceAndBankStatementResponse {
   /**
@@ -5161,9 +5176,12 @@ export const postServiceInvoiceCancelInvoiceAndBankStatement =
   /* #__PURE__ */ (() => {
     const method = 'post';
     const url = '/service/invoice/cancelInvoiceAndBankStatement';
-    function request(): Promise<PostServiceInvoiceCancelInvoiceAndBankStatementResponseSuccess> {
+    function request(
+      option: PostServiceInvoiceCancelInvoiceAndBankStatementOption,
+    ): Promise<PostServiceInvoiceCancelInvoiceAndBankStatementResponseSuccess> {
       return requester(request.url, {
         method: request.method,
+        ...option,
       }) as unknown as Promise<PostServiceInvoiceCancelInvoiceAndBankStatementResponseSuccess>;
     }