product_platform/oms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善采购订单价格计算逻辑

Browse Source
This commit is contained in:
guoxing
2024-08-16 16:39:39 +08:00
parent d177139598
commit 4fff35567c
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
View File

@@ -572,6 +572,7 @@
for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
var item = this.formobj.purchaseBillDetailList[i]
if (row.sid != item.sid) {
// console.log("item.cost1》》》》", item.cost)
// console.log("item.shareAmount》》》》", item.shareAmount)
@@ -579,7 +580,8 @@
// 列表其他数据 先计算单价
if (Number(item.count) != 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate) * 100).toFixed(2)
}
// item.cost = Number(item.cost1)
@@ -598,13 +600,13 @@
// 修改的是单价
this.calculation2(item)
} else {
console.log("item.cost1》》》》", item)
// item.cost = Number(item.cost1)
if (Number(item.count) != 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate1) * 100).toFixed(2)
}
// console.log("item.cost》》》》", item.cost)
this.calculation2(item)
}
@@ -628,7 +630,7 @@
item.shareAmount = 0.00
item.cost1 = Number(item.cost)
item.count1 = Number(item.count)
item.discountRate1 = item.discountRate
}
},
@@ -660,7 +662,7 @@
for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
var item = this.formobj.purchaseBillDetailList[i]
totalAmount = (Number(totalAmount) + Number(Number(item.cost1) * Number(item.count1))).toFixed(2)
totalAmount = (Number(totalAmount) + Number(item.amount)).toFixed(2)
// totalAmount = (Number(totalAmount) + Number(Number(item.cost) * Number(item.count))).toFixed(2)
}
@@ -674,15 +676,18 @@
if (Number(item.count) != 0) {
if (Number(price) == 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate) * 100).toFixed(2)
item.shareAmount = 0.00
} else {
// 最后一条数据
item.cost1 = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost1 = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate) * 100).toFixed(2)
item.shareAmount = (Number(price) - Number(all)).toFixed(2)
// item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2)
item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate) * 100).toFixed(2)
}
}
@@ -690,7 +695,8 @@
if (Number(item.count) != 0) {
if (Number(price) == 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate) * 100).toFixed(2)
item.shareAmount = 0.00
} else {
// 分摊金额 = (采购运费+其他费用)*单价*数量/所有商品总价
@@ -699,7 +705,8 @@
.toFixed(2)
// item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2)
item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count)).toFixed(2)
item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count) / Number(item
.discountRate) * 100).toFixed(2)
all += Number(item.shareAmount)
}
@@ -826,6 +833,7 @@
"cost": value[i].cost != null ? value[i].cost : '0.00',
"cost1": value[i].cost != null ? value[i].cost1 : '0.00',
"discountRate": value[i].discountRate != null ? value[i].discountRate : '100',
"discountRate1": value[i].discountRate != null ? value[i].discountRate : '100',
"discountPrice": value[i].discountPrice != null ? value[i].discountPrice : '0.00',
"shareAmount": value[i].shareAmount != null ? value[i].shareAmount : '0.00',
"amount": value[i].amount != null ? value[i].amount : '0.00',
@@ -951,11 +959,11 @@
"discountAmount": "",
"payableAmount": "",
"freight": "",
"freightShareTypeKey": "",
"freightShareTypeValue": "",
"freightShareTypeKey": "002",
"freightShareTypeValue": "按金额分摊",
"otherAmount": "",
"otherShareTypeKey": "",
"otherShareTypeValue": "",
"otherShareTypeKey": "002",
"otherShareTypeValue": "按金额分摊",
"settleAccountKey": "",
"settleAccountValue": "",
"prepayment": "",