Merge branch 'v2-220518' of…

src/pages/balance/invoice/srm/inquire/index.tsx

@@ -65,7 +65,7 @@ const InvoiceInquire: React.FC = () => {
   };
 
   const _handleOrderNo = record => {
-    window.open(
+    history.push(
       `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
     );
   };

src/pages/balance/invoice/srm/joint/index.tsx

@@ -2,7 +2,7 @@
  * 发票协同-发票查询(SRM)
  */
 import React, { useRef, useState } from 'react';
-import { getIntl, useIntl, Link, history } from 'umi';
+import { getIntl, useIntl, history } from 'umi';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Card, Button, DatePicker, Modal } from 'antd';
 import NiceForm from '@/components/NiceForm';
@@ -147,7 +147,7 @@ const InvoiceJoint: React.FC = () => {
   }
 
   const _handleOrderNo = record => {
-    window.open(
+    history.push(
       `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
     );
   };

src/pages/balance/invoice/srm/manage/index.tsx

@@ -129,7 +129,7 @@ const InvoiceManage: React.FC = () => {
   }
 
   const _handleOrderNo = record => {
-    window.open(
+    history.push(
       `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
     );
   };

src/pages/balance/invoice/srm/manage/schema/index.tsx

@@ -227,12 +227,6 @@ const receiptInfo: ISchema = {
           visible: false,
           title: getIntl().formatMessage({ id: 'balance.accountsReceivable.invoice.columns.reconciliationType', defaultMessage: '单据类型' }),
         },
-        returnResource: {
-          type: 'string',
-          readOnly: true,
-          visible: false,
-          title: getIntl().formatMessage({ id: 'balance.accountsReceivable.invoice.columns.returnResource', defaultMessage: '退回原因' }),
-        },
       },
     }
   }
@@ -439,6 +433,12 @@ const billInfo: ISchema = {
           "x-component": "UploadInvoice",
           title: getIntl().formatMessage({ id: 'balance.accountsReceivable.invoice.columns.urlImgs', defaultMessage: '发票文件' }),
         },
+        returnResource: {
+          type: 'string',
+          readOnly: true,
+          visible: false,
+          title: getIntl().formatMessage({ id: 'balance.accountsReceivable.invoice.columns.returnResource', defaultMessage: '退回原因' }),
+        },
       },
     }
   }

src/pages/balance/invoice/srm/readyInvoice/index.tsx

@@ -2,7 +2,7 @@
  * 待开票（SRM）
  */
 import React, { useRef } from 'react';
-import { getIntl, useIntl, Link } from 'umi';
+import { getIntl, useIntl, Link, history } from 'umi';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Card, Button, DatePicker } from 'antd';
 import NiceForm from '@/components/NiceForm';
@@ -58,7 +58,7 @@ const SettlementList: React.FC = () => {
   };
 
   const _handleOrderNo = record => {
-    window.open(
+    history.push(
       `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
     );
   };