|
@@ -25,8 +25,7 @@
|
|
|
<a-descriptions size="small" :column="3" v-if="detailData">
|
|
|
<a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="客户地址">{{ detailData.shippingAddressProvinceName || '--' }}{{ detailData.shippingAddressCityName || '--' }}{{ detailData.shippingAddressCountyName || '--' }}{{ detailData.shippingAddress || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="支付方式">{{ detailData.payType || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收款方式">{{ detailData.settleStyleSn || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收款方式">{{ detailData.settleStyleDictValue || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="联系电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="备注">{{ detailData.buyerName || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="销售单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
|
|
@@ -104,7 +103,7 @@ export default {
|
|
|
{ title: '销售数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
- { title: '折后小计', dataIndex: 'totalCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
+ { title: '折后小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
{ title: '折扣金额', dataIndex: 'discountAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
{ title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center' },
|
|
|
{ title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center' },
|