feat: update 发票核销

zhongnanhuang
1 parent 6adca975
Showing 6 changed files with 30 additions and 6 deletions
.umirc.ts
src/access.ts
src/pages/Invoice/components/BankChooseModal.tsx
src/pages/Invoice/components/BankImportModal.tsx
src/pages/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/index.tsx
@@ -50,7 +50,7 @@ export default defineConfig({
       path: '/invoiceManage',
       component: './Invoice',
       icon: 'BookOutlined',
-      access: 'canReadAdmin',
+      access: 'canReadAdminAndFinance',
     },
     {
       name: '打印',
@@ -6,5 +6,7 @@ export default (initialState: API.UserInfo) =&gt; {
   return {
     canReadAdmin: roleSmallVO?.code === 'admin',
     canReadProcure: roleSmallVO?.code === 'procure',
+    canReadAdminAndFinance:
+      roleSmallVO?.code === 'admin' || roleSmallVO?.code === 'finance',
   };
 };
@@ -231,7 +231,12 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
           });
  
           if (res.result === RESPONSE_CODE.SUCCESS) {
-            message.success(res.message);
+            if (res.data?.length > 0) {
+              message.info(res.data);
+            } else {
+              message.success(res.message);
+            }
+
             onClose();
           }
  
@@ -99,6 +99,7 @@ export default ({ setVisible, onClose }) =&gt; {
           a.click(); // 模拟点击操作来下载文件
           URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
           document.body.removeChild(a);
+          onClose();
         }
       })
       .catch((error) => {
@@ -9,7 +9,12 @@ import {
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
 import { PlusOutlined } from '@ant-design/icons';
-import { ModalForm, ProCard, ProTable } from '@ant-design/pro-components';
+import {
+  ActionType,
+  ModalForm,
+  ProCard,
+  ProTable,
+} from '@ant-design/pro-components';
 import {
   Button,
   Descriptions,
@@ -19,7 +24,7 @@ import {
   Form,
   message,
 } from 'antd';
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { BANK_STATEMENT_COLUMNS, INVOICE_STATUS } from '../constant';
 import '../index.less';
 import BankChooseModal from './BankChooseModal';
@@ -30,6 +35,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   const [invoiceInfo, setInvoiceInfo] = useState({});
   const [relationOrderIds, setRelationOrderIds] = useState([]);
   const [relationBankStatements, setRelationBankStatements] = useState([]);
+  const actionRef = useRef<ActionType>();
  
   const loadInvoiceData = async () => {
     let res = await postServiceInvoiceQueryInvoiceDetail({
@@ -265,6 +271,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
           destroyOnClose: true,
           onCancel: () => {
             setVisible(false);
+            onClose();
           },
         }}
         submitter={{
@@ -303,6 +310,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
  
         <ProTable
           columns={bankStatementColumnsInit()}
+          actionRef={actionRef}
           cardBordered
           pagination={{
             pageSize: 10,
@@ -364,6 +372,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
           onClose={() => {
             setBankChooseModalVisible(false);
             loadInvoiceData();
+            actionRef.current?.reload();
           }}
         ></BankChooseModal>
       ) : (
@@ -22,6 +22,7 @@ import {
   PageContainer,
   ProTable,
 } from '@ant-design/pro-components';
+import { history } from '@umijs/max';
 import { Avatar, Button, Dropdown, Tabs, Tag, message } from 'antd';
 import { useRef, useState } from 'react';
 import { INVOCING_STATUS, PAYEE_OPTIONS } from '../Order/constant';
@@ -472,7 +473,10 @@ const InvoicePage = () =&gt; {
       {bankImportModalVisible ? (
         <BankImportModal
           setVisible={setBankImportModalVisible}
-          onClose={() => {}}
+          onClose={() => {
+            invoiceActionRef.current?.reload();
+            bankActionRef.current?.reload();
+          }}
         ></BankImportModal>
       ) : (
         ''
@@ -482,7 +486,10 @@ const InvoicePage = () =&gt; {
         <InvoiceVerificationModal
           setVisible={setInvoiceVerificationVisible}
           invoiceId={invoiceId}
-          onClose={() => {}}
+          onClose={() => {
+            invoiceActionRef.current?.reload();
+            bankActionRef.current?.reload();
+          }}
         ></InvoiceVerificationModal>
       ) : (
         ''