Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/appoint/components/saleContract/transportPrice.vue

@@ -776,7 +776,10 @@ export default {
         let j = cols.length - 1
         let priceCol = null
         let tonnageCol = null
+        let carrierCol = null
         for (j = cols.length - 1; j > 0; j--) {
+          console.log(workbook.Sheets[workbook.SheetNames[0]][cols[j] + (index)]);
+          console.log(workbook.Sheets[workbook.SheetNames[0]][cols[j] + (index + 1)]);
           if (
             workbook.Sheets[workbook.SheetNames[0]][cols[j] + (index + 1)] &&
             priceCol == null &&
@@ -795,10 +798,18 @@ export default {
                 .v == '吨公里\r\n（元/吨.km）')
           ) {
             tonnageCol = cols[j]
+          }else if(
+            workbook.Sheets[workbook.SheetNames[0]][cols[j] + (index)] &&
+            carrierCol == null &&
+            (workbook.Sheets[workbook.SheetNames[0]][cols[j] + (index)].v ==
+              '承运单位')
+          ){
+            carrierCol = cols[j]
           }
         }
         console.log('最新单价列数:' + priceCol)
         console.log('最新单价吨公里:' + tonnageCol)
+        console.log('承运单位:' + carrierCol)
         //读取表格
         for (let i = index + 2; i <= rows.length + 1; i++) {
           let temp = {
@@ -847,7 +858,7 @@ export default {
           //承运商
           try {
             temp.carrierName =
-              workbook.Sheets[workbook.SheetNames[0]]['O' + i].v
+              workbook.Sheets[workbook.SheetNames[0]][carrierCol + i].v
           } catch (error) {}
           //单价
           try {