|
@@ -209,18 +209,19 @@ export default {
|
|
|
this.page.currentPage = 1;
|
|
|
this.page.pageSize = val;
|
|
|
},
|
|
|
- onLoad(page, params = {}) {
|
|
|
+ onLoad(page, params) {
|
|
|
this.loading = true;
|
|
|
- let data = params
|
|
|
+ let data = this.deepClone(Object.assign({}, params, this.search));
|
|
|
if (data.careteTime) {
|
|
|
data.beginCreateTime = data.careteTime[0]
|
|
|
data.endCreateTime = data.careteTime[1]
|
|
|
delete data.careteTime
|
|
|
}
|
|
|
+
|
|
|
getList(
|
|
|
page.currentPage,
|
|
|
page.pageSize,
|
|
|
- Object.assign(data)
|
|
|
+ data
|
|
|
).then(res => {
|
|
|
if (res.data.data.records) {
|
|
|
res.data.data.records.forEach(e => {
|