|
@@ -267,7 +267,7 @@ export default {
|
|
|
auditEndDate: '',
|
|
|
outWarehouseBeginDate: '',
|
|
|
outWarehouseEndDate: '',
|
|
|
- buyerName: undefined, // 客户名称
|
|
|
+ buyerNameCurrent: undefined, // 客户名称
|
|
|
buyerSn: undefined,
|
|
|
salesBillNo: '', // 销售单号
|
|
|
purchaseBillNo: '', // 采购单号
|
|
@@ -290,7 +290,7 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
|
|
|
{ title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
|
|
|
- { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -356,9 +356,9 @@ export default {
|
|
|
console.log(v, row)
|
|
|
if (row && row.customerSn) {
|
|
|
this.queryParam.buyerSn = row.customerSn
|
|
|
- this.queryParam.buyerName = undefined
|
|
|
+ this.queryParam.buyerNameCurrent = undefined
|
|
|
} else {
|
|
|
- this.queryParam.buyerName = v
|
|
|
+ this.queryParam.buyerNameCurrent = v
|
|
|
this.queryParam.buyerSn = undefined
|
|
|
}
|
|
|
},
|
|
@@ -434,7 +434,7 @@ export default {
|
|
|
}
|
|
|
this.$confirm({
|
|
|
title: '提示',
|
|
|
- content: <div><div style='font-size:16px;margin-bottom:10px;'>{content}</div><div>销售单号:{row.salesBillNo}</div><div>客户名称:{row.buyerName}</div></div>,
|
|
|
+ content: <div><div style='font-size:16px;margin-bottom:10px;'>{content}</div><div>销售单号:{row.salesBillNo}</div><div>客户名称:{row.buyerNameCurrent}</div></div>,
|
|
|
centered: true,
|
|
|
closable: true,
|
|
|
onOk () {
|
|
@@ -491,7 +491,7 @@ export default {
|
|
|
this.$refs.outWareRangeDate.resetDate('')
|
|
|
}
|
|
|
|
|
|
- this.queryParam.buyerName = undefined
|
|
|
+ this.queryParam.buyerNameCurrent = undefined
|
|
|
this.queryParam.buyerSn = undefined
|
|
|
this.queryParam.salesBillNo = ''
|
|
|
this.queryParam.purchaseBillNo = ''
|