sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

修复批次托盘分页和设备监控统计排序
Some checks failed
Release pipeline / publish (push) Has been cancelled
Details
Release pipeline / Always run job (push) Has been cancelled
Details

Browse Source
This commit is contained in:
sheng
2026-06-25 01:00:08 +08:00
parent c2db61dad9
commit f07f5d91c4
2 changed files with 119 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/planning-production/batch-management/tray-tracking/index.vue
View File

@@ -297,12 +297,30 @@ export default {
},
methods: {
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 = root.data !== undefined ? root.data : root
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: Number(root.count || root.total || data.count || data.total || 0) }
},
async fetchData () {
this.loading = true
@@ -329,8 +347,8 @@ export default {
this.fetchData()
},
onPageChange (page) {
this.pagination.current = page.current
this.pagination.size = page.size
this.pagination.current = Number(page.current || page.currentPage || 1)
this.pagination.size = Number(page.size || page.pageSize || this.pagination.size)
this.fetchData()
},
openTrayDetails (row) {