|
@@ -234,7 +234,7 @@ export default {
|
|
|
{ title: '客户名称', dataIndex: 'salesTargetName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '收款方式', dataIndex: 'settleStyleName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'productEntity.name', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productEntity.name', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '数量', dataIndex: 'productQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '成本', dataIndex: 'productCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
|
|
@@ -249,9 +249,6 @@ export default {
|
|
|
this.spinning = true
|
|
|
delete params.time
|
|
|
delete params.warehouseCascade
|
|
|
- if (params.dealerSn == 'all') {
|
|
|
- params.dealerSn = ''
|
|
|
- }
|
|
|
return reportSalesBillDetailList(params).then(res => {
|
|
|
// 总计
|
|
|
this.getCount(params)
|
|
@@ -394,9 +391,13 @@ export default {
|
|
|
const all = [{ dealerName: '全部', dealerSn: 'all' }]
|
|
|
if (res.status == 200) {
|
|
|
const data = res.data || []
|
|
|
- this.linkageGroupData = [...all, ...data]
|
|
|
+ if (data.length > 0) {
|
|
|
+ this.linkageGroupData = [...all, ...data]
|
|
|
+ } else {
|
|
|
+ this.linkageGroupData = []
|
|
|
+ }
|
|
|
} else {
|
|
|
- this.linkageGroupData = all
|
|
|
+ this.linkageGroupData = []
|
|
|
}
|
|
|
})
|
|
|
},
|