|
@@ -125,6 +125,8 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="在途数量" prop="inTransitQuantity" width="100" />
|
|
|
+ <el-table-column label="到货数量" prop="arrivalQuantity" width="100" />
|
|
|
<el-table-column label="含税小计" align="right" width="120">
|
|
|
<template #default="{ row }">
|
|
|
<div>{{ moneyFormat(Number(Math.round(row.unitPrice * row.purchaseQuantity * 1000) / 1000), 3) }}</div>
|
|
@@ -633,7 +635,7 @@ watch(
|
|
|
formData.data.totalAmountIncludingTaxCn = proxy.NumberToChinese(formData.data.totalAmountIncludingTax);
|
|
|
formData.data.totalAmountExcludingTaxCn = proxy.NumberToChinese(formData.data.totalAmountExcludingTax);
|
|
|
if (formData.data.applyBuyId) {
|
|
|
- proxy.post("/applyBuy/detail", { id: formData.data.applyBuyId }).then((res) => {
|
|
|
+ proxy.post("/applyBuy/detail", { id: formData.data.applyBuyId, purchaseId: formData.data.id }).then((res) => {
|
|
|
if (formData.data.purchaseBomList && formData.data.purchaseBomList.length > 0 && res.applyBuyBomList && res.applyBuyBomList.length > 0) {
|
|
|
for (let i = 0; i < formData.data.purchaseBomList.length; i++) {
|
|
|
formData.data.purchaseBomList[i].thisTimeQuantity = proxy.deepClone(formData.data.purchaseBomList[i].purchaseQuantity);
|
|
@@ -642,6 +644,8 @@ watch(
|
|
|
formData.data.purchaseBomList[i].quantity = res.applyBuyBomList[j].quantity;
|
|
|
formData.data.purchaseBomList[i].purchasedQuantity = res.applyBuyBomList[j].purchaseQuantity;
|
|
|
formData.data.purchaseBomList[i].frozenQuantity = res.applyBuyBomList[j].frozenQuantity;
|
|
|
+ formData.data.purchaseBomList[i].arrivalQuantity = res.applyBuyBomList[j].arrivalQuantity;
|
|
|
+ formData.data.purchaseBomList[i].inTransitQuantity = res.applyBuyBomList[j].inTransitQuantity;
|
|
|
}
|
|
|
}
|
|
|
}
|