币种位置调整

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');//获取借方选中的数据

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",