feat(wms): 添加钢卷报表导出功能的多行合并选项
- 在异常报表页面添加导出产出钢卷(多行合并)和导出消耗钢卷(多行合并)菜单项 - 新增 mergeCoilCells 工具函数实现 Excel 单元格合并功能 - 实现 exportWithMerge 通用方法处理带合并的 Excel 导出 - 添加导出时的加载提示和错误处理机制 - 优化 MES 质检样本详情加载逻辑,移除不必要的异步请求
This commit is contained in:
@@ -344,27 +344,24 @@ export default {
|
||||
|
||||
loadMainDetails() {
|
||||
if (this.mainList.length === 0) return
|
||||
const promises = this.mainList.map(main => {
|
||||
return listInspectionDetail({ mainId: main.mainId, pageNum: 1, pageSize: 9999 }).then(response => {
|
||||
const details = response.rows || []
|
||||
details.forEach(detail => {
|
||||
if (main._items[detail.itemName]) {
|
||||
main._items[detail.itemName] = {
|
||||
detailId: detail.detailId,
|
||||
mainId: detail.mainId,
|
||||
itemName: detail.itemName,
|
||||
itemValue: detail.itemValue || '',
|
||||
itemUnit: detail.itemUnit || main._items[detail.itemName].itemUnit,
|
||||
upperLimit: detail.upperLimit,
|
||||
lowerLimit: detail.lowerLimit,
|
||||
rangeDesc: detail.rangeDesc
|
||||
}
|
||||
this.mainList.forEach(main => {
|
||||
const details = main.detailList || []
|
||||
details.forEach(detail => {
|
||||
if (main._items[detail.itemName]) {
|
||||
main._items[detail.itemName] = {
|
||||
detailId: detail.detailId,
|
||||
mainId: detail.mainId,
|
||||
itemName: detail.itemName,
|
||||
itemValue: detail.itemValue || '',
|
||||
itemUnit: detail.itemUnit || main._items[detail.itemName].itemUnit,
|
||||
upperLimit: detail.upperLimit,
|
||||
lowerLimit: detail.lowerLimit,
|
||||
rangeDesc: detail.rangeDesc
|
||||
}
|
||||
})
|
||||
main._originalItems = JSON.parse(JSON.stringify(main._items))
|
||||
}).catch(() => {})
|
||||
}
|
||||
})
|
||||
main._originalItems = JSON.parse(JSON.stringify(main._items))
|
||||
})
|
||||
return Promise.all(promises)
|
||||
},
|
||||
|
||||
handleAddMain() {
|
||||
|
||||
Reference in New Issue
Block a user