|
@@ -24,13 +24,12 @@
|
|
|
<a-collapse-panel key="1" header="基础信息">
|
|
|
<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.shippingAddressProvinceName || '--' }}{{ detailData.shippingAddressCityName || '--' }}{{ detailData.shippingAddressCountyName || '--' }}{{ detailData.shippingAddress || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="收款方式">{{ detailData.settleStyleEntity.name || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="联系电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货人">{{ detailData.operatorName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="备注">{{ detailData.remarks || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="销售单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="制单人">{{ detailData.operatorName || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="业务员">{{ detailData.salesManName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="审核时间">{{ detailData.auditDate || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="财务状态">{{ detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
</a-descriptions>
|
|
@@ -41,8 +40,8 @@
|
|
|
<!-- alert -->
|
|
|
<a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
|
|
|
<div slot="message">
|
|
|
- 总款数:<strong>{{ detailData.totalCategory || 0 }}</strong>;总数量:<strong>{{ detailData.totalQty || 0 }}</strong>;总赠品数量:<strong>{{ detailData.giftQty || 0 }}</strong>;急件总款数:<strong>{{ detailData.oosCategory || 0 }}</strong>;急件总数量:<strong>{{ detailData.oosQty || 0 }}</strong>;<br/>
|
|
|
- 总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;折后总售价:<strong>{{ detailData.discountedAmount || 0 }}</strong>;折扣:<strong>{{ detailData.discountRate || 0 }}%</strong>;折扣金额:<strong>{{ detailData.discountAmount || 0 }}</strong>;
|
|
|
+ 总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.cancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.pushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.unpushedQty || 0 }}</strong>;<br/>
|
|
|
+ 总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}%</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;
|
|
|
</div>
|
|
|
</a-alert>
|
|
|
<!-- 列表 -->
|
|
@@ -97,17 +96,14 @@ export default {
|
|
|
{ title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center' },
|
|
|
{ title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '成本价', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
- { title: '售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
- { title: '折后售价', dataIndex: 'discountedPrice', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
- { title: '销售数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '成本价', dataIndex: 'realCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
+ { title: '销售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
|
|
|
{ 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: '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' },
|
|
|
- { title: '是否急件', dataIndex: 'oosFlagDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
+ { title: '可用库存数量', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '销售数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '已取消数', dataIndex: 'cancelQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '已下推数', dataIndex: 'pushedQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '待下推数', dataIndex: 'unpushedQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -125,10 +121,6 @@ export default {
|
|
|
data.list[i].productName = productName || '--'
|
|
|
data.list[i].productOrigCode = productOrigCode || '--'
|
|
|
data.list[i].productOrigUnit = productOrigUnit || '--'
|
|
|
- data.list[i].warehouseName = data.list[i].warehouseEntity && data.list[i].warehouseEntity.name || '--'
|
|
|
- data.list[i].warehouseLocationName = data.list[i].warehouseLocationEntity && data.list[i].warehouseLocationEntity.name || '--'
|
|
|
- // 售价小计 由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
|
|
|
- data.list[i].salePriceSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
|
|
|
}
|
|
|
this.disabled = false
|
|
|
return data
|
|
@@ -146,7 +138,7 @@ export default {
|
|
|
// 编辑
|
|
|
handleEdit () {
|
|
|
const row = this.detailData
|
|
|
- this.$router.push({ name: 'salesEdit', params: { id: row.id, sn: row.salesBillSn, priceType: row.priceType } })
|
|
|
+ this.$router.push({ name: 'salesEdit', params: { id: row.id, sn: row.salesBillSn } })
|
|
|
},
|
|
|
// 详情
|
|
|
getDetail () {
|