|
@@ -26,6 +26,11 @@
|
|
|
start-placeholder="开始日期" end-placeholder="结束日期">
|
|
start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ <el-form-item label="支付时间">
|
|
|
|
|
+ <el-date-picker v-model="queryForm.timeFiltering" type="daterange" range-separator="至" value-format="yyyy-MM-dd"
|
|
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
|
|
+ </el-date-picker>
|
|
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
<el-button type="primary" size="small" @click="findPage">查询</el-button>
|
|
<el-button type="primary" size="small" @click="findPage">查询</el-button>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -260,8 +265,17 @@ export default {
|
|
|
this.queryForm.startTime = "";
|
|
this.queryForm.startTime = "";
|
|
|
this.queryForm.endTime = "";
|
|
this.queryForm.endTime = "";
|
|
|
}
|
|
}
|
|
|
|
|
+ if (this.queryForm.timeFiltering && this.queryForm.timeFiltering.length > 0) {
|
|
|
|
|
+ this.queryForm.startAuditingTime = this.queryForm.timeFiltering[0];
|
|
|
|
|
+ this.queryForm.endAuditingTime = this.queryForm.timeFiltering[1];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.queryForm.startAuditingTime = "";
|
|
|
|
|
+ this.queryForm.endAuditingTime = "";
|
|
|
|
|
+ }
|
|
|
|
|
+ let form={...this.queryForm}
|
|
|
|
|
+ delete form.timeFiltering
|
|
|
that.$api.task
|
|
that.$api.task
|
|
|
- .payqueryPage({ ...this.pageRequest, ...this.queryForm, amountStatus: '1' })
|
|
|
|
|
|
|
+ .payqueryPage({ ...this.pageRequest, ...form, amountStatus: '1' })
|
|
|
.then(res => {
|
|
.then(res => {
|
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
|
that.pageResult = res.data;
|
|
that.pageResult = res.data;
|
|
@@ -270,7 +284,7 @@ export default {
|
|
|
.then(data != null ? data.callback : "");
|
|
.then(data != null ? data.callback : "");
|
|
|
that.$api.task
|
|
that.$api.task
|
|
|
.querySumAmount({
|
|
.querySumAmount({
|
|
|
- ...this.queryForm,
|
|
|
|
|
|
|
+ ...form,
|
|
|
...this.pageRequest,
|
|
...this.pageRequest,
|
|
|
})
|
|
})
|
|
|
.then(res => {
|
|
.then(res => {
|