fix(wms): 修正仓库ID格式和计算逻辑,优化团队报表功能
修复仓库ID格式错误,统一为正确格式 修改calcSummary计算逻辑,使用lossList计算损耗数据 重构团队报表页面,增加班组统计功能 优化日期选择器,支持月份范围选择 调整钢卷标签显示为"投入钢卷"
This commit is contained in:
@@ -71,7 +71,7 @@
|
||||
<el-descriptions title="明细信息" :column="3" border>
|
||||
</el-descriptions>
|
||||
<el-tabs v-model="activeTab">
|
||||
<el-tab-pane label="损耗钢卷" name="loss">
|
||||
<el-tab-pane label="投入钢卷" name="loss">
|
||||
<el-table :data="lossList" border height="calc(100vh - 320px)">
|
||||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
|
||||
<template slot-scope="scope">
|
||||
@@ -186,7 +186,7 @@ export default {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
date: currentDate, // 绑定日期选择器的默认值(当天)
|
||||
// date: currentDate, // 绑定日期选择器的默认值(当天)
|
||||
byCreateTimeStart: start, // 默认当天0点
|
||||
byCreateTimeEnd: end, // 默认当天23:59:59
|
||||
selectType: 'product',
|
||||
@@ -218,32 +218,32 @@ export default {
|
||||
warehouseQueryMap: {
|
||||
'1988150323162836993': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'suanzhakuguan',
|
||||
warehouseId: '1988150323162836993'
|
||||
},
|
||||
'1988150487185289217': {
|
||||
selectType: 'raw_material',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'suanzhakuguan',
|
||||
warehouseId: '1988150487185289217'
|
||||
},
|
||||
'2019583656787259393': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'suanzhakuguan',
|
||||
warehouseId: '2019583656787259393'
|
||||
},
|
||||
'20195833325311414274': {
|
||||
'2019583325311414274': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
warehouseId: '20195833325311414274'
|
||||
createBy: 'suanzhakuguan',
|
||||
warehouseId: '2019583325311414274'
|
||||
},
|
||||
'2019583429955104769': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'suanzhakuguan',
|
||||
warehouseId: '2019583429955104769'
|
||||
},
|
||||
'2019583137616310273': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'suanzhakuguan',
|
||||
warehouseId: '2019583137616310273'
|
||||
},
|
||||
},
|
||||
@@ -252,7 +252,7 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
summary() {
|
||||
return calcSummary(this.list)
|
||||
return calcSummary(this.list, this.lossList)
|
||||
},
|
||||
abSummary() {
|
||||
return calcAbSummary(this.list)
|
||||
|
||||
Reference in New Issue
Block a user