From be4135d5b09e9d80b9cd46196e0b2bba7baa5cea Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Sat, 25 May 2019 15:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E9=A2=9D=E7=94=A8=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E4=BB=B7=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/StockArrival/AddStockArrival.vue | 2 +- src/views/StockContract/AddStockContract.vue | 6 +++--- src/views/StockContract/components/MyDialog.vue | 6 +++--- src/views/StockInquiry/AddStockInquiry.vue | 6 +++--- src/views/StockInquiry/components/MyDialog.vue | 6 +++--- src/views/StockOrder/AddStockOrder.vue | 6 +++--- src/views/StockOrder/components/MyDialog.vue | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/views/StockArrival/AddStockArrival.vue b/src/views/StockArrival/AddStockArrival.vue index b9fc8121..8a705491 100644 --- a/src/views/StockArrival/AddStockArrival.vue +++ b/src/views/StockArrival/AddStockArrival.vue @@ -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 }, diff --git a/src/views/StockContract/AddStockContract.vue b/src/views/StockContract/AddStockContract.vue index 8f7abbad..eb9daef3 100644 --- a/src/views/StockContract/AddStockContract.vue +++ b/src/views/StockContract/AddStockContract.vue @@ -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) } }, // 通过税率计算含税价 diff --git a/src/views/StockContract/components/MyDialog.vue b/src/views/StockContract/components/MyDialog.vue index 96df5389..f8274c16 100644 --- a/src/views/StockContract/components/MyDialog.vue +++ b/src/views/StockContract/components/MyDialog.vue @@ -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) } }, // 通过税率计算含税价 diff --git a/src/views/StockInquiry/AddStockInquiry.vue b/src/views/StockInquiry/AddStockInquiry.vue index 870fcbec..c928d152 100644 --- a/src/views/StockInquiry/AddStockInquiry.vue +++ b/src/views/StockInquiry/AddStockInquiry.vue @@ -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) } }, // 总计 diff --git a/src/views/StockInquiry/components/MyDialog.vue b/src/views/StockInquiry/components/MyDialog.vue index 29421be2..2adabcd6 100644 --- a/src/views/StockInquiry/components/MyDialog.vue +++ b/src/views/StockInquiry/components/MyDialog.vue @@ -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) } }, // 通过税率计算含税价 diff --git a/src/views/StockOrder/AddStockOrder.vue b/src/views/StockOrder/AddStockOrder.vue index 83cc2d34..69a59834 100644 --- a/src/views/StockOrder/AddStockOrder.vue +++ b/src/views/StockOrder/AddStockOrder.vue @@ -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) } }, // 通过税率计算含税价 diff --git a/src/views/StockOrder/components/MyDialog.vue b/src/views/StockOrder/components/MyDialog.vue index 24b62423..67bbc0dd 100644 --- a/src/views/StockOrder/components/MyDialog.vue +++ b/src/views/StockOrder/components/MyDialog.vue @@ -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) } }, // 通过税率计算含税价