Merge remote-tracking branch 'origin/dev' into dev

src/views/billM/expenseCenter/index.vue

@@ -1409,15 +1409,13 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      var querys = this.query
-      if (this.query.etd) {
+      if (this.query.etdList) {
         var etdList = []
-        etdList[0] = this.query.etd[0] + ' 00:00'
-        etdList[1] = this.query.etd[1] + ' 23:59'
-        querys.etdList = etdList;
-        querys.etd = null
+        etdList[0] = this.query.etdList[0] + ' 00:00'
+        etdList[1] = this.query.etdList[1] + ' 23:59'
+        this.query.etdList = etdList;
       }
-      feecenterList(page.currentPage, page.pageSize, Object.assign(params, querys)).then(res => {
+      feecenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;