前端代码合并提交

src/views/noCar/billwayException.vue

@@ -11,14 +11,14 @@
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-date-picker v-model="noCarWayBill.endBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="指令结束始" end-placeholder="指令结束止"></el-date-picker>
-                  <el-select style="margin-left: 30px;" v-model="noCarWayBill.billwayStatus" placeholder="运单状态">
+                  <!-- <el-select style="margin-left: 30px;" v-model="noCarWayBill.billwayStatus" placeholder="运单状态">
                       <el-option
                         v-for="item in tradeStatus"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
                       </el-option>
-                </el-select>
+                </el-select> -->
                 <!-- <el-date-picker v-model="noCarWayBill.startEnd" type="date" placeholder="开始指令上传时间止"></el-date-picker>
                  <el-date-picker v-model="noCarWayBill.startBegin"  type="date" placeholder="开始指令上传时间始"></el-date-picker> -->
                 <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>

src/views/noCar/invoice.vue

@@ -305,9 +305,13 @@ import XLSX from "xlsx";
            }
            if(item['发票号码']!=null && item['发票号码']!='' && typeof item['发票号码']!='undefined'){
                invoiceNums+= item['发票号码']+',';
+           }else{
+             invoiceNums+= '#,';
            }
             if(item['发票代码']!=null && item['发票代码']!='' && typeof item['发票代码']!='undefined'){
                invoiceCodes+= item['发票代码']+',';
+           }else{
+             invoiceNums+= '#,';
            }
         });