|
@@ -47,6 +47,16 @@
|
|
|
<el-option label="否" :value="false"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="开票类型" prop="invoiceType">
|
|
|
+ <el-select v-model="queryModel.invoiceType" size="mini" >
|
|
|
+ <el-option
|
|
|
+ v-for="item in invoiceTypeList"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="支付时间" prop="payTimeRange">
|
|
|
<el-date-picker
|
|
|
v-model="queryModel.payTimeRange"
|
|
@@ -169,7 +179,8 @@ export default {
|
|
|
pushTimeRange: "",
|
|
|
payTimeRange:"",
|
|
|
payStatus:"",
|
|
|
- invoiced: null
|
|
|
+ invoiced: null,
|
|
|
+ invoiceType:"",
|
|
|
},
|
|
|
treeData: [],
|
|
|
loading: false,
|
|
@@ -196,6 +207,7 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
tableData: [],
|
|
|
+ invoiceTypeList:[],
|
|
|
payStatusList:[
|
|
|
{
|
|
|
id:"10",
|
|
@@ -274,6 +286,11 @@ export default {
|
|
|
this.collectionAccountList = jsonData.data;
|
|
|
});
|
|
|
|
|
|
+ billPushApi.getInvoiceTypeList().then((response)=>{
|
|
|
+ var jsonData = response.data;
|
|
|
+ this.invoiceTypeList = jsonData.data;
|
|
|
+ });
|
|
|
+
|
|
|
setTimeout(()=>{
|
|
|
this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
|
|
|
},1000);
|
|
@@ -308,6 +325,8 @@ export default {
|
|
|
formData.append("payTimeRange", self.queryModel.payTimeRange);
|
|
|
formData.append("payStatus", self.queryModel.payStatus);
|
|
|
|
|
|
+ formData.append("invoiceType", self.queryModel.invoiceType);
|
|
|
+
|
|
|
if(self.queryModel.invoiced!=null){
|
|
|
formData.append("invoiced", self.queryModel.invoiced);
|
|
|
}
|