|
@@ -1,7 +1,7 @@
|
|
<template>
|
|
<template>
|
|
<div>
|
|
<div>
|
|
<avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
|
|
<avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
|
|
- @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
|
|
|
|
|
|
+ @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset"
|
|
@saveColumn="saveColumn" :page.sync="page" @on-load="onLoad">
|
|
@saveColumn="saveColumn" :page.sync="page" @on-load="onLoad">
|
|
<template slot="costTypeSearch">
|
|
<template slot="costTypeSearch">
|
|
<breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
|
|
<breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
|
|
@@ -120,11 +120,19 @@ export default {
|
|
refreshChange() {
|
|
refreshChange() {
|
|
this.onLoad(this.page);
|
|
this.onLoad(this.page);
|
|
},
|
|
},
|
|
|
|
+ // 清空
|
|
|
|
+ searchReset(){
|
|
|
|
+ this.onLoad(this.page,this.params);
|
|
|
|
+ },
|
|
searchChange(params, done) {
|
|
searchChange(params, done) {
|
|
if (params.createStart) {
|
|
if (params.createStart) {
|
|
params.createStartDate = params.createStart[0]
|
|
params.createStartDate = params.createStart[0]
|
|
params.createEndDate = params.createStart[1]
|
|
params.createEndDate = params.createStart[1]
|
|
}
|
|
}
|
|
|
|
+ params = {
|
|
|
|
+ ...this.params,
|
|
|
|
+ ...params,
|
|
|
|
+ }
|
|
this.onLoad(this.page, params);
|
|
this.onLoad(this.page, params);
|
|
done()
|
|
done()
|
|
},
|
|
},
|
|
@@ -133,6 +141,7 @@ export default {
|
|
this.goodsListSave = row
|
|
this.goodsListSave = row
|
|
},
|
|
},
|
|
onLoad(page, params) {
|
|
onLoad(page, params) {
|
|
|
|
+ console.log(page,params,140)
|
|
if(params && params.rentStartDate ){
|
|
if(params && params.rentStartDate ){
|
|
params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
|
|
params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
|
|
params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
|
|
params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
|
|
@@ -143,11 +152,11 @@ export default {
|
|
if (params.customerId != this.params.customerId) {
|
|
if (params.customerId != this.params.customerId) {
|
|
this.params = params
|
|
this.params = params
|
|
}
|
|
}
|
|
- params = {
|
|
|
|
- // ...params,
|
|
|
|
- ...page,
|
|
|
|
- ...this.params
|
|
|
|
- }
|
|
|
|
|
|
+ // params = {
|
|
|
|
+ // // ...params,
|
|
|
|
+ // ...page,
|
|
|
|
+ // ...this.params
|
|
|
|
+ // }
|
|
|
|
|
|
// ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
|
|
// ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
|
|
params.billType = this.billType
|
|
params.billType = this.billType
|