|
|
@@ -325,14 +325,26 @@
|
|
|
label: '包装规格',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
- {
|
|
|
+ // 华泰临时改动?
|
|
|
+ // {
|
|
|
+ // width: 80,
|
|
|
+ // prop: 'totalCount',
|
|
|
+ // label: '收货数量',
|
|
|
+ // align: 'center',
|
|
|
+ // formatter: (row, column) => {
|
|
|
+ // if (row.totalCount) {
|
|
|
+ // return row.totalCount + ' ' + row.measuringUnit;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ {
|
|
|
width: 80,
|
|
|
- prop: 'totalCount',
|
|
|
+ prop: 'receiveTotalCount',
|
|
|
label: '收货数量',
|
|
|
align: 'center',
|
|
|
formatter: (row, column) => {
|
|
|
- if (row.totalCount) {
|
|
|
- return row.totalCount + ' ' + row.measuringUnit;
|
|
|
+ if (row.receiveTotalCount) {
|
|
|
+ return row.receiveTotalCount + ' ' + row.measuringUnit;
|
|
|
}
|
|
|
}
|
|
|
},
|