Explorar el Código

09表计量\r单位没有导入问题

zhongzewei hace 6 años
padre
commit
7df54aeca2
Se han modificado 1 ficheros con 9 adiciones y 9 borrados
  1. 9 9
      web/building_saas/main/js/views/importBills.js

+ 9 - 9
web/building_saas/main/js/views/importBills.js

@@ -154,39 +154,39 @@ const importBills = (function(){
                 continue;
             }
             //序号
-            if(colMapping.serialNo === undefined && cellData === colText.serialNo[0]){
+            if(colMapping.serialNo === undefined && _deESC(cellData) === colText.serialNo[0]){
                 colMapping.serialNo = colIdx;
             }
             //编码
-            else if(colMapping.code === undefined && (cellData === colText.code[0] || cellData === colText.code[1])){
+            else if(colMapping.code === undefined && (_deESC(cellData) === colText.code[0] || _deESC(cellData) === colText.code[1])){
                 colMapping.code = colIdx;
             }
             //名称
-            else if(colMapping.name === undefined && (cellData === colText.name[0] || cellData === colText.name[1])){
+            else if(colMapping.name === undefined && (_deESC(cellData) === colText.name[0] || _deESC(cellData) === colText.name[1])){
                 colMapping.name = colIdx;
             }
             //项目特征
-            else if(colMapping.itemCharacterText === undefined && (cellData === colText.itemCharacterText[0] || cellData === colText.itemCharacterText[1])){
+            else if(colMapping.itemCharacterText === undefined && (_deESC(cellData) === colText.itemCharacterText[0] || _deESC(cellData) === colText.itemCharacterText[1])){
                 colMapping.itemCharacterText = colIdx;
             }
             //单位
-            else if(colMapping.unit === undefined && (cellData === colText.unit[0] || cellData === colText.unit[1])){
+            else if(colMapping.unit === undefined && (_deESC(cellData) === colText.unit[0] || _deESC(cellData) === colText.unit[1])){
                 colMapping.unit = colIdx;
             }
             //工程量
-            else if(colMapping.quantity === undefined && (cellData === colText.quantity[0] || cellData === colText.quantity[1])){
+            else if(colMapping.quantity === undefined && (_deESC(cellData) === colText.quantity[0] || _deESC(cellData) === colText.quantity[1])){
                 colMapping.quantity = colIdx;
             }
             //金额
-            else if(colMapping.money === undefined && cellData.includes(colText.money[0])){
+            else if(colMapping.money === undefined && _deESC(cellData).includes(colText.money[0])){
                 colMapping.money = colIdx;
             }
             //工程量明细
-            else if(colMapping.quantityDetail === undefined && cellData === colText.quantityDetail[0]){
+            else if(colMapping.quantityDetail === undefined && _deESC(cellData) === colText.quantityDetail[0]){
                 colMapping.quantityDetail = colIdx;
             }
             //费用明细
-            else if(colMapping.feeDetail === undefined && cellData === colText.feeDetail[0]){
+            else if(colMapping.feeDetail === undefined && _deESC(cellData) === colText.feeDetail[0]){
                 colMapping.feeDetail = colIdx;
             }
         }