#149 master

Merged
yangxzh1 merged 2 commits from OpenI/octopus:master into master 11 months ago
  1. +1
    -0
      admin-portal/src/views/timeManager/component/consumption.vue
  2. +1
    -0
      admin-portal/src/views/timeManager/component/time.vue

+ 1
- 0
admin-portal/src/views/timeManager/component/consumption.vue View File

@@ -145,6 +145,7 @@
},
getSearchData(val) {
let data = {}
this.searchData.pageIndex = 1
data = Object.assign(val, { pageIndex: 1, pageSize: this.searchData.pageSize })
this.getPay(data)
if (val.searchKey) {


+ 1
- 0
admin-portal/src/views/timeManager/component/time.vue View File

@@ -328,6 +328,7 @@
userClick() {this.getUserOptions() },
search() {
let data = {}
this.searchData.pageIndex = 1
if (this.type == 'user') {
data = { pageIndex: 1, pageSize: this.searchData.pageSize, userId: this.userId }
}


Loading…
Cancel
Save