feat: 问题修复

src/pages/PaymentMange/data.js

@@ -148,7 +148,7 @@ export function columns(res, pages) {
           <Button
             type="primary"
             disabled={
-              !(row.blueInvoiceState === 1 || row.blueInvoiceState === 3) && row.payState === 3
+              !((row.blueInvoiceState === 1 || row.blueInvoiceState === 3) && row.payState === 3)
             }
             className={styles.button}
             onClick={() => res.edit(1, row)}

src/pages/PaymentMange/index.jsx

@@ -25,6 +25,7 @@ const PaymentMange = () => {
   const [loading, setloading] = useState(false);
   const [status, setstatus] = useState(1);
   const [pages, setpages] = useState({});
+  const [rest, setrest] = useState(1);
   const [toExamineModalVisibel, setToExamineModalVisibel] = useState(false);
 
   const reload = () => {
@@ -132,6 +133,7 @@ const PaymentMange = () => {
       onClick={() => {
         // eslint-disable-next-line no-unused-expressions
         form?.resetFields();
+        setrest(2);
         reload();
       }}
     >
@@ -159,7 +161,14 @@ const PaymentMange = () => {
           request={params => {
             const { current, pageSize } = params;
             setpages({ current, pageSize });
-            return query({ ...params });
+            let param = {};
+            if (rest === 2) {
+              param = { current, pageSize };
+            } else {
+              param = params;
+            }
+            setrest(1);
+            return query({ ...param });
           }}
           columns={columns(res, pages)}
           rowKey={r => r.id}

src/pages/ReconciliationQuery/index.jsx

@@ -104,30 +104,6 @@ const ReconciliationQuery = () => {
     onChange: onSelectChange,
   };
 
-  const searchRender = ({ searchText, resetText }, { form }) => [
-    <Button
-      key="search"
-      type="primary"
-      style={{ marginRight: '10px' }}
-      onClick={() => {
-        // eslint-disable-next-line no-unused-expressions
-        form?.submit();
-      }}
-    >
-      {searchText}
-    </Button>,
-    <Button
-      key="rest"
-      style={{ marginRight: '10px' }}
-      onClick={() => {
-        // eslint-disable-next-line no-unused-expressions
-        form?.resetFields();
-        reload();
-      }}
-    >
-      {resetText}
-    </Button>,
-  ];
   return (
     <Spin tip="处理中..." spinning={loading} delay={100}>
       <PageHeaderWrapper>
@@ -142,7 +118,6 @@ const ReconciliationQuery = () => {
           rowKey={r => r.id}
           search={{
             collapsed: false,
-            optionRender: searchRender,
           }}
           rowSelection={rowSelection}
           bordered

src/pages/SettlementSheet/index.jsx

@@ -109,31 +109,6 @@ const SettlementSheet = () => {
       disabled: !(record.settleState === 1 && !record.payBatchNo), // Column configuration not to be checked
     }),
   };
-
-  const searchRender = ({ searchText, resetText }, { form }) => [
-    <Button
-      key="search"
-      type="primary"
-      style={{ marginRight: '10px' }}
-      onClick={() => {
-        // eslint-disable-next-line no-unused-expressions
-        form?.submit();
-      }}
-    >
-      {searchText}
-    </Button>,
-    <Button
-      key="rest"
-      style={{ marginRight: '10px' }}
-      onClick={() => {
-        // eslint-disable-next-line no-unused-expressions
-        form?.resetFields();
-        reload();
-      }}
-    >
-      {resetText}
-    </Button>,
-  ];
   return (
     <Spin tip="处理中..." spinning={loading} delay={100}>
       <PageHeaderWrapper>
@@ -148,7 +123,6 @@ const SettlementSheet = () => {
           rowKey={r => r.settleBatchNo}
           search={{
             collapsed: false,
-            optionRender: searchRender,
           }}
           rowSelection={rowSelection}
           bordered