|
|
@@ -230,21 +230,20 @@
|
|
|
minWidth: 110,
|
|
|
showOverflowTooltip: true,
|
|
|
formatter: (_row) => {
|
|
|
- // 集抄记录未计算本期耗用量(如手动录入)时,回退取 quantity(本期用量)
|
|
|
- const upNum = _row.currentUpNum;
|
|
|
- const quantity =
|
|
|
- _row.quantity === null || _row.quantity === undefined
|
|
|
- ? 0
|
|
|
- : _row.quantity;
|
|
|
+ // 优先取 quantity(本期用量);quantity 为 0/null/空时回退取 currentUpNum(本期耗用量)
|
|
|
+ const quantity = _row.quantity;
|
|
|
if (
|
|
|
- upNum === null ||
|
|
|
- upNum === '' ||
|
|
|
- upNum === undefined ||
|
|
|
- Number(upNum) === 0
|
|
|
+ quantity === null ||
|
|
|
+ quantity === '' ||
|
|
|
+ quantity === undefined ||
|
|
|
+ Number(quantity) === 0
|
|
|
) {
|
|
|
- return quantity;
|
|
|
+ const upNum = _row.currentUpNum;
|
|
|
+ return upNum === null || upNum === '' || upNum === undefined
|
|
|
+ ? 0
|
|
|
+ : upNum;
|
|
|
}
|
|
|
- return upNum;
|
|
|
+ return quantity;
|
|
|
}
|
|
|
},
|
|
|
{
|