前端代码合并提交

src/views/noCar/invoice.vue

@@ -13,6 +13,15 @@
                 <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="formCondition.waybillNum"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="formCondition.buyerTaxpayerCode"></el-input>
+                  <el-select class="input-demo" v-model="formCondition.invoiceStatus" placeholder="发票状态">
+                               
+                      <el-option
+                        v-for="item in invoiceStatusA"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                </el-select>
                
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
@@ -260,7 +269,12 @@ import XLSX from "xlsx";
               invoiceCode:'',
               invoiceNum:'',
               waybillNum:''
-            },
+            },            
+            invoiceStatusA:[ 
+            {"label":"待开票","value":"1"},
+            {"label":"开票中","value":"2"},
+            {"label":"开票完成","value":"3"}
+           ],
             formUserList: {
             "file": ""
             },
@@ -632,7 +646,7 @@ import XLSX from "xlsx";
 }
 .invoice_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .invoice_container .block {