xls转xlsx后导入出现\r\r问题

web/building_saas/main/js/views/importBills.js

@@ -23,6 +23,10 @@ const importBills = (function(){
         return _isDef(data) ? data.toString().replace(/[\r,\n,\s,\t]/g, '') : data;
     }
 
+    function _deNR(data) {
+        return _isDef(data) ? data.toString().replace(/\r\r/g, '\r') : data;
+    }
+
     //列名对应中文字符
     const colText = {
         serialNo: ['序号'],
@@ -347,7 +351,7 @@ const importBills = (function(){
                     //合并续数据
                     preBill.code += rData[colMapping.code] && rData[colMapping.code]['value'] ? rData[colMapping.code]['value'] : '';
                     preBill.name += rData[colMapping.name] && rData[colMapping.name]['value'] ? rData[colMapping.name]['value'] : '';
-                    preBill.itemCharacterText += rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? '\n' + rData[colMapping.itemCharacterText]['value'] : '';
+                    preBill.itemCharacterText += rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? '\n' + _deNR(rData[colMapping.itemCharacterText]['value']) : '';
                     preBill.unit += rData[colMapping.unit] && rData[colMapping.unit]['value'] ? rData[colMapping.unit]['value'] : '';
                     preBill.quantity += rData[colMapping.quantity] && rData[colMapping.quantity]['value'] ? rData[colMapping.quantity]['value'] : '';
                 }
@@ -368,12 +372,13 @@ const importBills = (function(){
                     preBill = billIdx[preLeafID];
                 }
                 //set bill data
+                console.log(rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? rData[colMapping.itemCharacterText]['value'] : '');
                 billIdx[newID] = {
                     nodeType: nodeType,
                     ID: newID, ParentID: pID, NextSiblingID: -1,
                     code: rData[colMapping.code] && rData[colMapping.code]['value'] ? _deESC(rData[colMapping.code]['value']) : '',
                     name: rData[colMapping.name] && rData[colMapping.name]['value'] ? _deESC(rData[colMapping.name]['value']) : '',
-                    itemCharacterText: rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? rData[colMapping.itemCharacterText]['value'] : '',
+                    itemCharacterText: rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? _deNR(rData[colMapping.itemCharacterText]['value']) : '',
                     itemCharacter: [],
                     jobContentText: '',
                     jobContent: [],