|
|
@@ -223,6 +223,30 @@
|
|
|
minWidth: 110,
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
+ {
|
|
|
+ prop: 'currentUpNum',
|
|
|
+ label: '本期用量',
|
|
|
+ align: 'center',
|
|
|
+ minWidth: 110,
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ formatter: (_row) => {
|
|
|
+ // 集抄记录未计算本期耗用量(如手动录入)时,回退取 quantity(本期用量)
|
|
|
+ const upNum = _row.currentUpNum;
|
|
|
+ const quantity =
|
|
|
+ _row.quantity === null || _row.quantity === undefined
|
|
|
+ ? 0
|
|
|
+ : _row.quantity;
|
|
|
+ if (
|
|
|
+ upNum === null ||
|
|
|
+ upNum === '' ||
|
|
|
+ upNum === undefined ||
|
|
|
+ Number(upNum) === 0
|
|
|
+ ) {
|
|
|
+ return quantity;
|
|
|
+ }
|
|
|
+ return upNum;
|
|
|
+ }
|
|
|
+ },
|
|
|
{
|
|
|
prop: 'unit',
|
|
|
label: '单位',
|