refactor(order): 确保枚举值在引用前正确定义

重构订单页面的枚举值引用，确保在使用之前已经定义。这避免了在组件中直接引用枚举值可能导致的错误。添加了核销记录按钮，以提供更直观的访问点。 - 修正了银行报表删除操作的错误，该操作在以前的代码中错误地包含了。这些变化提供了更流畅的用户体验，并确保用户可以更有效地执行核销相关操作。

refactor(order): 确保枚举值在引用前正确定义
重构订单页面的枚举值引用，确保在使用之前已经定义。这避免了在组件中直接引用枚举值可能导致的错误。添加了核销记录按钮，以提供更直观的访问点。 - 修正了银行报表删除操作的错误，该操作在以前的代码中错误地包含了。这些变化提供了更流畅的用户体验，并确保用户可以更有效地执行核销相关操作。
曾国涛
1 parent 01578991
Showing 2 changed files with 65 additions and 47 deletions
src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
@@ -104,29 +104,27 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
         valueType: 'date',
       },
     ];
-    if (!readOnly) {
-      columns.push({
-        title: '操作',
-        valueType: 'option',
-        width: 200,
-        render: (text, record) => [
-          <a
-            key="delete"
-            onClick={() => {
-              const tableDataSource =
-                formRef.current?.getFieldValue('bankStatements');
-              console.log(JSON.stringify(tableDataSource));
-              formRef.current?.setFieldValue(
-                'bankStatements',
-                tableDataSource.filter((item) => item.id !== record.id),
-              );
-            }}
-          >
-            删除
-          </a>,
-        ],
-      });
-    }
+    columns.push({
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (text, record) => [
+        <a
+          key="delete"
+          onClick={() => {
+            const tableDataSource =
+              formRef.current?.getFieldValue('bankStatements');
+            console.log(JSON.stringify(tableDataSource));
+            formRef.current?.setFieldValue(
+              'bankStatements',
+              tableDataSource.filter((item) => item.id !== record.id),
+            );
+          }}
+        >
+          删除
+        </a>,
+      ],
+    });
     return columns;
   };
  
@@ -295,30 +293,27 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
         recordCreatorProps={false}
         toolBarRender={() => [
           <>
-            {!readOnly && (
-              <AddBankStatementModal
-                getRows={() => formRef.current?.getFieldValue('bankStatements')}
-                onFinish={(datas) => {
-                  const bankStatements =
-                    formRef.current?.getFieldValue('bankStatements');
-                  // 添加非空判断，并处理为空的情况
-                  const mergedBankStatements =
-                    bankStatements && Array.isArray(bankStatements)
-                      ? bankStatements
-                      : [];
-                  const mergedDatas =
-                    datas && Array.isArray(datas) ? datas : [];
-                  let res = [...mergedBankStatements, ...mergedDatas];
-                  //对res 进行去重处理，根据id去重
-                  const resMap = new Map();
-                  res.forEach((item) => {
-                    resMap.set(item.id, item);
-                  });
-                  res = Array.from(resMap.values());
-                  formRef.current?.setFieldValue('bankStatements', res);
-                }}
-              />
-            )}
+            <AddBankStatementModal
+              getRows={() => formRef.current?.getFieldValue('bankStatements')}
+              onFinish={(datas) => {
+                const bankStatements =
+                  formRef.current?.getFieldValue('bankStatements');
+                // 添加非空判断，并处理为空的情况
+                const mergedBankStatements =
+                  bankStatements && Array.isArray(bankStatements)
+                    ? bankStatements
+                    : [];
+                const mergedDatas = datas && Array.isArray(datas) ? datas : [];
+                let res = [...mergedBankStatements, ...mergedDatas];
+                //对res 进行去重处理，根据id去重
+                const resMap = new Map();
+                res.forEach((item) => {
+                  resMap.set(item.id, item);
+                });
+                res = Array.from(resMap.values());
+                formRef.current?.setFieldValue('bankStatements', res);
+              }}
+            />
           </>,
         ]}
         columns={getBankStatementColumns()}
 import ButtonConfirm from '@/components/ButtomConfirm';
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
 import { RESPONSE_CODE } from '@/constants/enum';
+import InvoiceWriteOffModal from '@/pages/Invoice/Invoice/components/invoiceWriteOffModal';
 import BankImportModal from '@/pages/Invoice/InvoiceVerification/components/BankImportModal';
 import InvoiceRecordDetailModal from '@/pages/Invoice/InvoiceVerification/components/InvoiceRecordDetailModal';
 import InvoiceVerificationModal from '@/pages/Invoice/InvoiceVerification/components/InvoiceVerificationModal';
@@ -13,6 +14,7 @@ import {
   postServiceBankStatementDeleteBankStatement,
   postServiceBankStatementEditBankStatement,
   postServiceBankStatementQueryBankStatement,
+  postServiceInvoiceGetWriteOffRecord,
 } from '@/services';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
@@ -133,6 +135,27 @@ const InvoiceRecord = () =&gt; {
           );
         }
  
+        if (record.writeOffId !== null) {
+          btns.push(
+            <InvoiceWriteOffModal
+              getData={async () => {
+                const res = await postServiceInvoiceGetWriteOffRecord({
+                  data: { id: record.writeOffId },
+                });
+                const data = res.data;
+                return {
+                  invoiceWriteOffId: data.id,
+                  invoices: data.invoiceDtos,
+                  bankStatements: data.bankStatementDtos,
+                };
+              }}
+              key="writeOff"
+              triggerButton={<Button type="link">核销记录</Button>}
+              readOnly={true}
+            />,
+          );
+        }
+
         if (record.paths?.includes('deleteBankStatement')) {
           btns.push(
             <ButtonConfirm