diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue index e1944e2..617c671 100644 --- a/src/components/TableModel/index.vue +++ b/src/components/TableModel/index.vue @@ -418,10 +418,10 @@ export default { if (res.code === 200) { if (res.data) { this.tableList = res.data.rows || res.data; - this.total = res.data.total; + this.total = res.data.total || res.data.length } else { this.tableList = res.rows || res.data; - this.total = res.total; + this.total = res.total || res.rows.length; } } } diff --git a/src/views/base/crew/components/form-crew.vue b/src/views/base/crew/components/form-crew.vue index 55310a1..067ae41 100644 --- a/src/views/base/crew/components/form-crew.vue +++ b/src/views/base/crew/components/form-crew.vue @@ -134,9 +134,10 @@ export default { mixins: [commonMixin], components: { }, created() { + // this.getRanges() }, - mounted() { - this.getRanges() + async mounted() { + this.open = true if (this.crewParams) { this.crewParams.proId = Number(this.crewParams.proId) this.ableSelect = this.crewParams.relId @@ -145,10 +146,13 @@ export default { } else { this.subSort = 1 } + await this.getRanges() + this.open = false }, data() { return { columnsListCrew, + open: false, exportList: [], subSort: '', // 提交类型:新增 1 / 修改 2 ableSelect: undefined, diff --git a/src/views/base/crew/index.vue b/src/views/base/crew/index.vue index 1b4a389..b0389e5 100644 --- a/src/views/base/crew/index.vue +++ b/src/views/base/crew/index.vue @@ -16,8 +16,8 @@