Merge branch 'feng-jinfa-20221102' into 'jinfa-20221102'

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

@@ -21,7 +21,7 @@ import {
   getSettleAccountsMemberSettlementAccountStatementCoordinationInvoiceList,
   postSettleAccountsMemberSettlementAccountStatementCoordinationInvoiceConfirm,
   postSettleAccountsMemberSettlementAccountStatementCoordinationInvoiceReturn,
-  postSettleAccountsMemberSettlementAccountStatementCoordinationExport
+  postSettleAccountsMemberSettlementAccountStatementCoordinationExportNew
 } from '@/services/SettleV2Api';
 import AuthButton from '@/components/AuthButton';
 import './index.less';
@@ -294,7 +294,7 @@ const InvoiceJoint: React.FC = () => {
       message.warning(intl.formatMessage({ id: 'balance.export.quantity.limit' }))
       return
     }
-    postSettleAccountsMemberSettlementAccountStatementCoordinationExport({ids: selectedRowKeys}, { responseType: 'blob', getResponse: true }).then((res: any) => {
+    postSettleAccountsMemberSettlementAccountStatementCoordinationExportNew({ids: selectedRowKeys}, { responseType: 'blob', getResponse: true }).then((res: any) => {
       const { data, response } = res
       if (response.status == 200) {
         const suffixName = response.headers.get('content-disposition').split('.')[1]

src/pages/transaction/purchaseRequisition/increaseRequisition/index.tsx

@@ -629,8 +629,8 @@ const IncreaseRequisition: React.FC<{}> = () => {
         linkage.enum('currency', currencyMap)
       })
       getMemberParameterManageGetArrivalArea().then((res: any) => {
-        const arrivalAreaMap = fnMap(res.data)
-        linkage.enum('arrivalArea', arrivalAreaMap);
+        // const arrivalAreaMap = fnMap(res.data)
+        linkage.enum('arrivalArea', res.data.map(el=>({label:el.name,value:el.key})));
       })
     })
   }