shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2025-02-01 04:19:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:shawncai/ERP

Browse source
This commit is contained in:
beyond 2019-05-25 15:53:45 +08:00
commit b4e21153aa
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/views/StockArrival/AddStockArrival.vue
View file

@ -428,7 +428,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.arrivalQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.arrivalQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
return row.discountMoney
},

6
src/views/StockContract/AddStockContract.vue
View file

@ -489,8 +489,8 @@ export default {
// 通过折扣额计算折扣
getdiscountMoney(row) {
console.log(row)
if (row.price !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.price / row.plannedQuantity) * 100).toFixed(2)
if (row.includeTaxPrice !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.includeTaxPrice / row.plannedQuantity) * 100).toFixed(2)
}
},
// 通过折扣计算折扣额
@ -498,7 +498,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
},
// 通过税率计算含税价

6
src/views/StockContract/components/MyDialog.vue
View file

@ -483,8 +483,8 @@ export default {
// 通过折扣额计算折扣
getdiscountMoney(row) {
console.log(row)
if (row.price !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.price / row.plannedQuantity) * 100).toFixed(2)
if (row.includeTaxPrice !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.includeTaxPrice / row.plannedQuantity) * 100).toFixed(2)
}
},
// 通过折扣计算折扣额
@ -492,7 +492,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
},
// 通过税率计算含税价

6
src/views/StockInquiry/AddStockInquiry.vue
View file

@ -406,8 +406,8 @@ export default {
// 通过折扣额计算折扣
getdiscountMoney(row) {
console.log(row)
if (row.price !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.price / row.plannedQuantity) * 100).toFixed(2)
if (row.includeTaxPrice !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.includeTaxPrice / row.plannedQuantity) * 100).toFixed(2)
}
},
// 通过折扣计算折扣额
@ -415,7 +415,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
},
// 总计

6
src/views/StockInquiry/components/MyDialog.vue
View file

@ -427,8 +427,8 @@ export default {
// 通过折扣额计算折扣
getdiscountMoney(row) {
console.log(row)
if (row.price !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.price / row.plannedQuantity) * 100).toFixed(2)
if (row.includeTaxPrice !== 0 && row.plannedQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.includeTaxPrice / row.plannedQuantity) * 100).toFixed(2)
}
},
// 通过折扣计算折扣额
@ -436,7 +436,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.plannedQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
},
// 通过税率计算含税价

6
src/views/StockOrder/AddStockOrder.vue
View file

@ -542,8 +542,8 @@ export default {
// 通过折扣额计算折扣
getdiscountMoney(row) {
console.log(row)
if (row.price !== 0 && row.stockQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.price / row.stockQuantity) * 100).toFixed(2)
if (row.includeTaxPrice !== 0 && row.stockQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.includeTaxPrice / row.stockQuantity) * 100).toFixed(2)
}
},
// 通过折扣计算折扣额
@ -551,7 +551,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.stockQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.stockQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
},
// 通过税率计算含税价

6
src/views/StockOrder/components/MyDialog.vue
View file

@ -552,8 +552,8 @@ export default {
// 通过折扣额计算折扣
getdiscountMoney(row) {
console.log(row)
if (row.price !== 0 && row.stockQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.price / row.stockQuantity) * 100).toFixed(2)
if (row.includeTaxPrice !== 0 && row.stockQuantity !== 0 && row.discountMoney !== 0) {
row.discountRate = ((1 - row.discountMoney / row.includeTaxPrice / row.stockQuantity) * 100).toFixed(2)
}
},
// 通过折扣计算折扣额
@ -561,7 +561,7 @@ export default {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (row.price * row.stockQuantity * (1 - row.discountRate / 100)).toFixed(2)
row.discountMoney = (row.includeTaxPrice * row.stockQuantity * (1 - row.discountRate / 100)).toFixed(2)
}
},
// 通过税率计算含税价