前端代码合并提交

src/views/selfCar/invoice.vue

@@ -291,21 +291,29 @@ importExcel (content) {
         this.xlsxJson = tabJson
         this.fileList = this.xlsxJson[0].sheet
         let n = '匹配的字段'
+        var i=0;
+        var j=0;
         this.fileList.forEach((item, index, arr) => {
            if(item['etc卡号']!=null && item['etc卡号']!='' && typeof item['etc卡号']!='undefined'){
                etcIds+= item['etc卡号'].trim()+',';
+               i++;
+           }else{
+               etcIds+= '#,';
            }
            if(item['交易id']!=null && item['交易id']!='' && typeof item['交易id']!='undefined'){
                tradeIds+= item['交易id'].trim()+',';
+               j++;
+           }else{
+             tradeIds+= '#,';
            }
         });
 
       }
-      if(etcIds!=''){
+      if(etcIds!='' && i>0){
         this.formCondition.cardId =etcIds.substring(0,etcIds.length-1);
       }
-      if(tradeIds!=null){
-        this.formCondition.tradeId = tradeIds.substring(0,tradeIds.length-1) ;
+      if(tradeIds!='' && j>0){
+        this.formCondition.tradeId = tradeIds.substring(0,tradeIds.length-1)  ;
       }
 
     })

src/views/selfCar/selfCarTrade.vue

@@ -230,20 +230,28 @@ import XLSX from "xlsx";
         this.xlsxJson = tabJson
         this.fileList = this.xlsxJson[0].sheet
         let n = '匹配的字段'
+        var i=0;
+        var j=0;
         this.fileList.forEach((item, index, arr) => {
            if(item['etc卡号']!=null && item['etc卡号']!='' && typeof item['etc卡号']!='undefined'){
                etcIds+= item['etc卡号'].trim()+',';
+               i++;
+           }else{
+               etcIds+= '#,';
            }
            if(item['交易id']!=null && item['交易id']!='' && typeof item['交易id']!='undefined'){
                tradeIds+= item['交易id'].trim()+',';
+               j++;
+           }else{
+             tradeIds+= '#,';
            }
         });
 
       }
-      if(etcIds!=''){
+      if(etcIds!='' && i>0){
         this.formCondition.cardId =etcIds.substring(0,etcIds.length-1);
       }
-      if(tradeIds!=null){
+      if(tradeIds!='' && j>0){
         this.formCondition.tradeId = tradeIds.substring(0,tradeIds.length-1)  ;
       }