Browse Source

Merge branch 'feature/dev_stat' into dev

# Conflicts:
#	src/mixins/view-module.js
test
zhangyuan 3 years ago
parent
commit
a137aa7aa7
  1. 23
      src/mixins/view-module.js

23
src/mixins/view-module.js

@ -42,17 +42,18 @@ export default {
methods: {
// 获取数据列表
query () {
const params = {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
this.post = true
this.$http.post(
this.mixinViewModuleOptions.getDataListURL,
params
this.dataListLoading = true
this.$http.get(
this.mixinViewModuleOptions.getDataListURL,
{
params: {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}
).then(({ data: res }) => {
this.dataListLoading = false
if (res.code !== 0) {

Loading…
Cancel
Save