feat: 银行流水修改。

曾国涛
1 parent 8a28192c
Showing 6 changed files with 32 additions and 170 deletions
src/pages/Invoice/components/BankChooseModal.tsx
src/pages/Invoice/components/BankImportModal.tsx
src/pages/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/OrderDrawer.tsx
@@ -13,7 +13,8 @@ import { Button, Divider, Flex, Modal, Tag, message } from &#39;antd&#39;;
 import { useRef, useState } from 'react';
 import { BANK_STATEMENT_COLUMNS, INVOICE_STATUS } from '../constant';
 import '../index.less';
-export default ({ invoiceId, setVisible, onClose }) => {
+
+export default ({ loadInvoiceData, invoiceId, setVisible, onClose }) => {
   const [selectedStatement, setSelectedStatement] = useState([]);
   const [selectedStatementIdSet, setSelectedStatementIdSet] = useState(
     new Set(),
@@ -50,7 +51,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   };
  
   /**
-   * 加载银行流水列表表格的各个列格式
+   * 加载列表表格的各个列格式
    */
   const bankStatementColumnsInit = () => {
     let columns = BANK_STATEMENT_COLUMNS.map((item) => {
@@ -226,7 +227,9 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
               bankStatementIds: bankStatementIds,
             },
           });
-
+          setTimeout(() => {
+            loadInvoiceData();
+          }, 500);
           if (res.result === RESPONSE_CODE.SUCCESS) {
             if (res.data?.length > 0) {
               message.info(res.data);
@@ -236,7 +239,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
  
             onClose();
           }
-
           setBtnLoading(false);
         }}
         okButtonProps={{
@@ -41,7 +41,7 @@ export default ({ setVisible, onClose }) =&gt; {
         const downloadUrl = window.URL.createObjectURL(blob);
         const a = document.createElement('a');
         a.href = downloadUrl;
-        a.download = '银行流水导入模板.xlsx'; // 你可以为文件命名
+        a.download = '导入模板.xlsx'; // 你可以为文件命名
         document.body.appendChild(a);
         a.click(); // 模拟点击操作来下载文件
         URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
@@ -44,7 +44,8 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     if (res && res.data) {
       setInvoiceInfo(res.data);
       setRelationOrderIds(res.data.mainOrderIds);
-      setRelationBankStatements(res.data.bankStatementResponseDtos);
+      console.log('bs:' + res.data.bankStatementDtos);
+      setRelationBankStatements(res.data.bankStatementDtos);
     }
   };
  
@@ -149,7 +150,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   };
  
   /**
-   * 加载银行流水列表表格的各个列格式
+   * 加载表格的各个列格式
    */
   const bankStatementColumnsInit = () => {
     let columns = BANK_STATEMENT_COLUMNS.map((item) => {
@@ -367,6 +368,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
  
       {bankChooseModalVisible ? (
         <BankChooseModal
+          loadInvoiceData={loadInvoiceData}
           setVisible={setBankChooseModalVisible}
           invoiceId={invoiceId}
           onClose={() => {
@@ -142,15 +142,11 @@ export const BANK_STATEMENT_COLUMNS = [
     editable: false,
   },
   {
-    dataIndex: 'status',
+    dataIndex: 'statusText',
     title: '状态',
     valueType: 'select',
     width: 100,
     editable: false,
-    valueEnum: enumToProTableEnumValue({
-      ABNORMAL: '异常',
-      VERIFIED: '已核销',
-    }),
   },
   {
     dataIndex: 'serialNumber',
@@ -159,191 +155,50 @@ export const BANK_STATEMENT_COLUMNS = [
     width: 100,
   },
   {
-    dataIndex: 'merchantOrderNumber',
-    title: '商户订单号',
-    valueType: 'text',
-    width: 100,
-  },
-  {
-    dataIndex: 'bankOrderNumber',
-    title: '银行订单号',
-    valueType: 'text',
-    width: 100,
-  },
-  {
-    dataIndex: 'thirdPartyOrderNumber',
-    title: '第三方订单号',
-    valueType: 'text',
-    width: 100,
-  },
-  {
-    dataIndex: 'accountNumber',
-    title: '账号',
-    valueType: 'text',
-    width: 180,
-  },
-  {
-    dataIndex: 'accountName',
-    title: '帐号名称',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'currency',
-    title: '币种',
-    valueType: 'text',
-    width: 100,
-  },
-  {
-    dataIndex: 'transactionDate',
-    title: '交易日',
-    valueType: 'dateRange',
+    dataIndex: 'collectionDate',
+    title: '收款时间',
+    valueType: 'date',
     width: 100,
-    search: {
-      transform: (value) => {
-        if (value) {
-          return {
-            beginTransactionDate: value[0],
-            endTransactionDate: value[1],
-          };
-        }
-      },
-    },
-  },
-  {
-    dataIndex: 'transactionTime',
-    title: '交易时间',
-    valueType: 'text',
     hideInSearch: true,
-    width: 100,
-  },
-  {
-    dataIndex: 'transactionType',
-    title: '交易类型',
-    valueType: 'text',
-    width: 100,
-  },
-  {
-    dataIndex: 'transactionBankBranch',
-    title: '交易行所',
-    valueType: 'text',
-    width: 100,
   },
   {
-    dataIndex: 'valueDate',
-    title: '起息日',
+    dataIndex: 'collectionDateSearch',
+    title: '收款时间',
     valueType: 'dateRange',
     width: 100,
+    hideInTable: true,
     search: {
       transform: (value) => {
         if (value) {
           return {
-            beginValueDate: value[0],
-            endValueDate: value[1],
+            collectionDateBegin: value[0],
+            collectionDateEnd: value[1],
           };
         }
       },
     },
   },
   {
-    dataIndex: 'loanAmount',
-    title: '贷方金额',
-    valueType: 'money',
-    width: 100,
-  },
-  {
-    dataIndex: 'borrowedAmount',
-    title: '借方金额',
-    valueType: 'money',
-    width: 100,
-  },
-  {
-    dataIndex: 'transactionAmount',
-    title: '交易金额',
-    valueType: 'money',
-    width: 100,
-  },
-  {
-    dataIndex: 'balance',
-    title: '余额',
-    valueType: 'money',
-    width: 100,
-  },
-  {
-    dataIndex: 'actualPaymentAmount',
-    title: '实付金额',
-    valueType: 'money',
-    width: 100,
-  },
-  {
-    dataIndex: 'collectionChannel',
-    title: '收款渠道',
+    dataIndex: 'payeeText',
+    title: '收款方',
     valueType: 'text',
     width: 100,
   },
   {
-    dataIndex: 'paymentType',
-    title: '支付类型',
+    dataIndex: 'payer',
+    title: '付款方',
     valueType: 'text',
     width: 100,
   },
   {
-    dataIndex: 'summary',
-    title: '摘要',
-    valueType: 'text',
-    width: 300,
-  },
-  {
-    dataIndex: 'cashier',
-    title: '收银员',
-    valueType: 'text',
-    width: 100,
-  },
-  {
-    dataIndex: 'payeePayerUnit',
-    title: '收(付)方单位',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'payeePayerName',
-    title: '收(付)方名称',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'payeePayerAccountNumber',
-    title: '收(付)方账号',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'payeePayerBankBranchCode',
-    title: '收(付)方开户行行号',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'payeePayerBankName',
-    title: '收(付)方开户行名',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'payeePayerBankAddress',
-    title: '收(付)方开户行地址',
-    valueType: 'text',
-    width: 260,
-  },
-  {
-    dataIndex: 'extendedSummary',
-    title: '扩展摘要',
+    dataIndex: 'amount',
+    title: '金额',
     valueType: 'text',
     width: 100,
   },
   {
-    dataIndex: 'transactionAnalysisCode',
-    title: '交易分析码',
+    dataIndex: 'remark',
+    title: '备注',
     valueType: 'text',
     width: 100,
   },
@@ -23,6 +23,7 @@ import { INVOCING_STATUS, PAYEE_OPTIONS } from &#39;../Order/constant&#39;;
 import BankImportModal from './components/BankImportModal';
 import InvoiceVerificationModal from './components/InvoiceVerificationModal';
 import './index.less';
+
 const InvoicePage = () => {
   const invoiceActionRef = useRef<ActionType>();
   const bankActionRef = useRef<ActionType>();
@@ -1209,9 +1209,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 let totalPayment = form.getFieldValue('totalPayment');
                 let list = form.getFieldValue('list');
                 let reduce = list.reduce(
-                  (sum, item) => sum + item.subOrderPayment,
+                  (sum, item) => FloatAdd(sum, item.subOrderPayment),
                   0,
                 );
+                console.log(reduce);
+                console.log(totalPayment);
                 if (reduce === totalPayment || value) {
                   return Promise.resolve();
                 }