diff --git a/src/views/planning-production/batch-management/batch-list/index.vue b/src/views/planning-production/batch-management/batch-list/index.vue index 0f88f1c6..3b7c6e31 100644 --- a/src/views/planning-production/batch-management/batch-list/index.vue +++ b/src/views/planning-production/batch-management/batch-list/index.vue @@ -467,12 +467,30 @@ export default { } }, normalizeListResponse (res) { - const data = Array.isArray(res) ? res : (res && res.data) || [] - if (Array.isArray(data)) return { list: data, total: data.length } - return { - list: data.data || [], - total: data.count || 0 + const root = res || {} + const data = res && res.data !== undefined ? res.data : res + if (Array.isArray(data)) { + return { list: data, total: Number(root.count || root.total || data.length) } } + if (data && Array.isArray(data.list)) { + return { list: data.list, total: Number(root.count || root.total || data.count || data.total || data.list.length) } + } + if (data && Array.isArray(data.rows)) { + return { list: data.rows, total: Number(root.count || root.total || data.count || data.total || data.rows.length) } + } + if (data && Array.isArray(data.records)) { + return { list: data.records, total: Number(root.count || root.total || data.count || data.total || data.records.length) } + } + if (data && Array.isArray(data.data)) { + return { list: data.data, total: Number(root.count || root.total || data.count || data.total || data.data.length) } + } + if (data && data.data && Array.isArray(data.data.data)) { + return { list: data.data.data, total: Number(root.count || root.total || data.count || data.total || data.data.count || data.data.total || data.data.data.length) } + } + if (data && data.data && Array.isArray(data.data.list)) { + return { list: data.data.list, total: Number(root.count || root.total || data.count || data.total || data.data.count || data.data.total || data.data.list.length) } + } + return { list: [], total: 0 } }, async fetchData () { this.loading = true