liyg il y a 2 ans
Parent
commit
994df1c996
1 fichiers modifiés avec 6 ajouts et 3 suppressions
  1. 6 3
      src/views/appoint/components/saleContract/transportPrice.vue

+ 6 - 3
src/views/appoint/components/saleContract/transportPrice.vue

@@ -498,7 +498,8 @@ export default {
         let index=1;
         for (index=1;index<rows.length;index++){
           if (workbook.Sheets[workbook.SheetNames[0]]["A"+index] &&  
-          (workbook.Sheets[workbook.SheetNames[0]]["A"+index].v=="序号" || workbook.Sheets[workbook.SheetNames[0]]["A"+index].v=="序\n号")){
+          (workbook.Sheets[workbook.SheetNames[0]]["A"+index].v=="序号" || workbook.Sheets[workbook.SheetNames[0]]["A"+index].v=="序\n号"
+           || workbook.Sheets[workbook.SheetNames[0]]["A"+index].v=="序\r\n号")){
             break;
           }
         }
@@ -517,10 +518,12 @@ export default {
         let tonnageCol=null;
         for (j=cols.length-1;j>0;j--){
          if (workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)] &&  priceCol==null
-         && workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)].v=="运价\n(元/吨)"){
+         && (workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)].v=="运价\n(元/吨)"
+            || workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)].v=="运价\r\n(元/吨)")){
             priceCol=cols[j];
           }else if (workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)] &&  tonnageCol==null
-         && workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)].v=="吨公里\n(元/吨.km)"){
+         && (workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)].v=="吨公里\n(元/吨.km)"
+            || workbook.Sheets[workbook.SheetNames[0]][cols[j]+(index+1)].v=="吨公里\r\n(元/吨.km)")){
             tonnageCol=cols[j];
           }
         }