|
@@ -158,6 +158,17 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="开票时间">
|
|
|
+ <el-date-picker
|
|
|
+ style="width: 230px;"
|
|
|
+ v-model="queryParams.invoiceTime"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -389,11 +400,8 @@ export default {
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
let params = {...this.addDateRange(this.queryParams, this.dateRange)};
|
|
|
- if(params.performDate&¶ms.performDate.length==2){
|
|
|
- params.performDateStart = params.performDate[0];
|
|
|
- params.performDateEnd = params.performDate[1];
|
|
|
- }
|
|
|
delete params.performDate;
|
|
|
+ delete params.invoiceTime
|
|
|
pageList(params)
|
|
|
.then(response => {
|
|
|
this.dataList = response.data.rows;
|
|
@@ -429,6 +437,13 @@ export default {
|
|
|
this.queryParams.performDateStart = null
|
|
|
this.queryParams.performDateEnd = null
|
|
|
}
|
|
|
+ if(this.queryParams.invoiceTime&&this.queryParams.invoiceTime.length==2){
|
|
|
+ this.queryParams.invoiceBeginTime =this.queryParams.invoiceTime[0];
|
|
|
+ this.queryParams.invoiceEndTime =this.queryParams.invoiceTime[1];
|
|
|
+ }else {
|
|
|
+ this.queryParams.invoiceBeginTime = null
|
|
|
+ this.queryParams.invoiceEndTime = null
|
|
|
+ }
|
|
|
this.getList();
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
@@ -450,6 +465,7 @@ export default {
|
|
|
this.$set(this.queryParams, 'timeSnapshot', '');
|
|
|
this.$set(this.queryParams, 'performTimeId', '');
|
|
|
this.$set(this.queryParams, 'payWay', '');
|
|
|
+ this.$set(this.queryParams, 'invoiceTime', '');
|
|
|
this.queryParams.pageNum = 1;
|
|
|
this.handleQuery();
|
|
|
},
|
|
@@ -518,9 +534,16 @@ export default {
|
|
|
this.queryParams.performDateStart = null
|
|
|
this.queryParams.performDateEnd = null
|
|
|
}
|
|
|
+ if(this.queryParams.invoiceTime&&this.queryParams.invoiceTime.length==2){
|
|
|
+ this.queryParams.invoiceBeginTime =this.queryParams.invoiceTime[0];
|
|
|
+ this.queryParams.invoiceEndTime =this.queryParams.invoiceTime[1];
|
|
|
+ }else {
|
|
|
+ this.queryParams.invoiceBeginTime = null
|
|
|
+ this.queryParams.invoiceEndTime = null
|
|
|
+ }
|
|
|
let params = JSON.parse(JSON.stringify(this.queryParams))
|
|
|
for (let key in params) {
|
|
|
- if(key != 'pageNum' && key != 'pageSize' && key != 'time' && key != 'createTime' && key != 'performDate'){
|
|
|
+ if(key != 'pageNum' && key != 'pageSize' && key != 'time' && key != 'createTime' && key != 'performDate' && key != 'invoiceTime'){
|
|
|
postMap[key] = params[key]
|
|
|
}
|
|
|
}
|