|
@@ -136,7 +136,6 @@ export default {
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
- data.list[i].percentageUnit = data.list[i].percentage ? data.list[i].percentage + '%' : undefined
|
|
|
}
|
|
|
this.disabled = false
|
|
|
}
|
|
@@ -176,7 +175,7 @@ export default {
|
|
|
]
|
|
|
if (this.$hasPermissions('M_ShowAllCost')) {
|
|
|
arr.splice(4, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
- arr.splice(5, 0, { title: '毛利率', dataIndex: 'percentageUnit', width: '15%', align: 'right', customRender: function (text) { return text || '--' }, sorter: true })
|
|
|
+ arr.splice(5, 0, { title: '毛利率', dataIndex: 'percentage', width: '15%', align: 'right', customRender: function (text) { return text + '%' || '--' }, sorter: true })
|
|
|
}
|
|
|
return arr
|
|
|
}
|