|
@@ -28,15 +28,15 @@
|
|
|
<a-collapse-panel key="1" header="基础信息">
|
|
|
<a-descriptions :column="3">
|
|
|
<a-descriptions-item label="供应商">{{ (detail&&detail.purchaseTargetName) || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="支付方式">{{ (detail&&detail.settleStyleEntity&&detail.settleStyleEntity.name) || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="采购员工" v-if="detail&&detail.purchaseBillSource=='PURCHASE'">{{ detail&&detail.operatorName || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收货人">{{ detail&&detail.consigneeName || '--' }}<span v-if="detail&&detail.consigneeTel">({{ detail&&detail.consigneeTel }})</span></a-descriptions-item>
|
|
|
+ <a-descriptions-item label="支付方式">{{ (detail&&detail.purchaseBill&&detail.purchaseBill.settleStyleEntity&&detail.purchaseBill.settleStyleEntity.name) || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="采购员工" v-if="detail&&detail.purchaseBill&&detail.purchaseBill.purchaseBillSource=='PURCHASE'">{{ detail&&detail.purchaseBill&&detail.purchaseBill.operatorName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货人">{{ detail&&detail.purchaseBill&&detail.purchaseBill.consigneeName || '--' }}<span v-if="detail&&detail.purchaseBill&&detail.purchaseBill.consigneeTel">({{ detail&&detail.purchaseBill&&detail.purchaseBill.consigneeTel }})</span></a-descriptions-item>
|
|
|
<a-descriptions-item label="收货地址">
|
|
|
- <div v-if="detail&&(detail.shippingAddressProvinceName || detail.shippingAddressCityName || detail.shippingAddressCountyName || detail.shippingAddress)">
|
|
|
- {{ detail&&detail.shippingAddressProvinceName || '' }}
|
|
|
- {{ detail&&detail.shippingAddressCityName || '' }}
|
|
|
- {{ detail&&detail.shippingAddressCountyName || '' }}
|
|
|
- {{ detail&&detail.shippingAddress || '' }}
|
|
|
+ <div v-if="detail&&detail.purchaseBill&&(detail.purchaseBill.shippingAddressProvinceName || detail.purchaseBill.shippingAddressCityName || detail.purchaseBill.shippingAddressCountyName || detail.purchaseBill.shippingAddress)">
|
|
|
+ {{ detail&&detail.purchaseBill&&detail.purchaseBill.shippingAddressProvinceName || '' }}
|
|
|
+ {{ detail&&detail.purchaseBill&&detail.purchaseBill.shippingAddressCityName || '' }}
|
|
|
+ {{ detail&&detail.purchaseBill&&detail.purchaseBill.shippingAddressCountyName || '' }}
|
|
|
+ {{ detail&&detail.purchaseBill&&detail.purchaseBill.shippingAddress || '' }}
|
|
|
</div>
|
|
|
<span v-else>--</span>
|
|
|
</a-descriptions-item>
|
|
@@ -48,9 +48,9 @@
|
|
|
<!-- 总计 -->
|
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
|
<div slot="message">
|
|
|
- 产品款数:<strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong>,
|
|
|
- 本次发货数量合计:<strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong>,
|
|
|
- 本次发货金额合计:<strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? '¥'+detail.discountedAmount : '--' }}</strong>,
|
|
|
+ 产品款数:<strong>{{ detail && (detail.totalPutCategory || detail.totalPutCategory==0) ? detail.totalPutCategory : '--' }}</strong>,
|
|
|
+ 本次发货数量合计:<strong>{{ detail && (detail.totalPutQty || detail.totalPutQty==0) ? detail.totalPutQty : '--' }}</strong>,
|
|
|
+ 本次发货金额合计:<strong>{{ detail && (detail.totalPutAmount || detail.totalPutAmount==0) ? '¥'+detail.totalPutAmount : '--' }}</strong>,
|
|
|
</div>
|
|
|
</a-alert>
|
|
|
<!-- 列表 -->
|
|
@@ -64,9 +64,9 @@
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
<!-- 采购数量 -->
|
|
|
- <template slot="origqty" slot-scope="text, record">
|
|
|
- <div>{{ text }}</div>
|
|
|
- <div v-if="record.origqty">原采购数量:{{ record.origqty }}</div>
|
|
|
+ <template slot="qty" slot-scope="text, record">
|
|
|
+ <div>{{ record.qty }}</div>
|
|
|
+ <!-- <div v-if="record.qty">原采购数量:{{ record.qty }}</div> -->
|
|
|
</template>
|
|
|
<!-- 缺货数量 -->
|
|
|
<template slot="outOfStockNum" slot-scope="text, record">
|
|
@@ -97,8 +97,8 @@ export default {
|
|
|
{ title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '采购单价', dataIndex: 'discountedPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '采购数量', dataIndex: 'qty', width: '6%', align: 'center', scopedSlots: { customRender: 'origqty' } },
|
|
|
- { title: '本次发货数量', dataIndex: 'shippedQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '采购数量', width: '6%', align: 'center', scopedSlots: { customRender: 'qty' } },
|
|
|
+ { title: '本次发货数量', dataIndex: 'receivingQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '本次发货金额', dataIndex: 'discountedAmount', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '本次入库数量', dataIndex: 'putQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
@@ -111,6 +111,7 @@ 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].receivingQty = data.list[i].putQty
|
|
|
}
|
|
|
this.localDataSource = data.list
|
|
|
this.disabled = false
|
|
@@ -157,7 +158,7 @@ export default {
|
|
|
const _this = this
|
|
|
_this.spinning = true
|
|
|
// 打印或导出
|
|
|
- hdPrint('', 'export', receivingExport, { sn: this.$route.params.sn }, '备货单', function () {
|
|
|
+ hdPrint('', 'export', receivingExport, { receivingBillSn: this.$route.params.sn }, '备货单', function () {
|
|
|
_this.spinning = false
|
|
|
})
|
|
|
}
|