|
|
@@ -406,9 +406,12 @@
|
|
|
label: '发货数量',
|
|
|
slot: 'saleCount',
|
|
|
formatter: (row, column) => {
|
|
|
- if (row.saleCount) {
|
|
|
+ if (row.saleCount && row.saleUnit) {
|
|
|
return row.saleCount + ' ' + row.saleUnit;
|
|
|
}
|
|
|
+ if (row.orderProductType === 2 && row.totalCount != null) {
|
|
|
+ return row.totalCount + ' ' + row.measuringUnit;
|
|
|
+ }
|
|
|
},
|
|
|
headerSlot: 'headerTotalCount',
|
|
|
align: 'center'
|
|
|
@@ -700,8 +703,13 @@
|
|
|
}
|
|
|
},
|
|
|
getSummaries(param) {
|
|
|
+ const data = param.data.map((row) =>
|
|
|
+ row.orderProductType === 2 && (!row.saleCount || !row.saleUnit)
|
|
|
+ ? { ...row, saleCount: row.totalCount }
|
|
|
+ : row
|
|
|
+ );
|
|
|
return getSummaries(
|
|
|
- param,
|
|
|
+ { ...param, data },
|
|
|
['saleCount', 'blockCount', 'totalCount'],
|
|
|
' '
|
|
|
);
|