From b822d549cd0bc02d4a38de7f98d5472bc2aedc09 Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Tue, 11 Mar 2025 16:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=81=E7=A7=8D=E4=BD=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vrify/events/handleCrossCurrency.js       |  4 +-
 src/gl/verify/verify/vrify/exportVrify.js     | 44 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/gl/verify/verify/vrify/events/handleCrossCurrency.js b/src/gl/verify/verify/vrify/events/handleCrossCurrency.js
index 5bb5f34..6c63e30 100644
--- a/src/gl/verify/verify/vrify/events/handleCrossCurrency.js
+++ b/src/gl/verify/verify/vrify/events/handleCrossCurrency.js
@@ -4,10 +4,10 @@ import verifyUnverifySum from './verifyUnverifySum';
 export default function handleCrossCurrency(self){
     //todo
     console.log('异币种核销=============')
-    return false
+    // return false
 
 
-    let url= '/nccloud/gl/verify/onverify.do';
+    let url= '/nccloud/gl/verify/onverifyMul.do';
     let {creditDataArr,creditSelectedData,debitSelectedData,queryCondition}=self.state;
     creditSelectedData=self.filterSelectedData('credit');//获取借方选中的数据
     debitSelectedData=self.filterSelectedData('debit');//获取借方选中的数据
diff --git a/src/gl/verify/verify/vrify/exportVrify.js b/src/gl/verify/verify/vrify/exportVrify.js
index c3d04a5..2084589 100644
--- a/src/gl/verify/verify/vrify/exportVrify.js
+++ b/src/gl/verify/verify/vrify/exportVrify.js
@@ -2320,17 +2320,6 @@ class ExportVrify extends Component {
                             );
                         }
                     },
-                    {
-                        title: (<div fieldid="m_currtypeName" className="mergecells">{json['20020VRIFYPAGE-000034']}</div>),/* 国际化处理： 币种*/
-                        dataIndex: "m_currtypeName",
-                        key: "m_currtypeName",
-                        width: 100,
-                        render: (text, record, index) => {
-                            return (
-                               <div fieldid="m_currtypeName"  className="defovercol">{text==null||(text&&!text.display)?<span>&nbsp;</span>:text.display}</div>
-                            );
-                        }
-                    },
                     {
                         title: (<div fieldid="m_prepareddate" className="mergecells">{json['20020VRIFYPAGE-000021']}</div>),/* 国际化处理： 凭证日期*/
                         dataIndex: "m_prepareddate",
@@ -2408,6 +2397,17 @@ class ExportVrify extends Component {
                             );
                         }
                     },
+                    {
+                        title: (<div fieldid="m_currtypeName" className="mergecells">{json['20020VRIFYPAGE-000034']}</div>),/* 国际化处理： 币种*/
+                        dataIndex: "m_currtypeName",
+                        key: "m_currtypeName",
+                        width: 100,
+                        render: (text, record, index) => {
+                            return (
+                               <div fieldid="m_currtypeName"  className="defovercol">{text==null||(text&&!text.display)?<span>&nbsp;</span>:text.display}</div>
+                            );
+                        }
+                    },
                     {
                         title: (<div fieldid="m_explanation" className="mergecells">{json['20020VRIFYPAGE-000029']}</div>),/* 国际化处理： 摘要*/
                         dataIndex: "m_explanation",
@@ -2816,17 +2816,6 @@ class ExportVrify extends Component {
                             );
                         }
                     },
-                    {
-                        title: (<div fieldid="m_currtypeName" className="mergecells">{json['20020VRIFYPAGE-000034']}</div>),/* 国际化处理： 币种*/
-                        dataIndex: "m_currtypeName",
-                        key: "m_currtypeName",
-                        width: 100,
-                        render: (text, record, index) => {
-                            return (
-                               <div fieldid="m_currtypeName" className="defovercol">{text==null||(text&&!text.display)?<span>&nbsp;</span>:text.display}</div>
-                            );
-                        }
-                    },
                     {
                         title: (<div fieldid="m_prepareddate" className="mergecells">{json['20020VRIFYPAGE-000021']}</div>),/* 国际化处理： 凭证日期*/
                         dataIndex: "m_prepareddate",
@@ -2905,6 +2894,17 @@ class ExportVrify extends Component {
                             );
                         }
                     },
+                    {
+                        title: (<div fieldid="m_currtypeName" className="mergecells">{json['20020VRIFYPAGE-000034']}</div>),/* 国际化处理： 币种*/
+                        dataIndex: "m_currtypeName",
+                        key: "m_currtypeName",
+                        width: 100,
+                        render: (text, record, index) => {
+                            return (
+                               <div fieldid="m_currtypeName" className="defovercol">{text==null||(text&&!text.display)?<span>&nbsp;</span>:text.display}</div>
+                            );
+                        }
+                    },
                     {
                         title: (<div fieldid="m_explanation" className="mergecells">{json['20020VRIFYPAGE-000029']}</div>),/* 国际化处理： 摘要*/
                         dataIndex: "m_explanation",