From 966942741b3c1d74765bc0bfb8fb772ca58862eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 20 Nov 2022 01:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=92=8C=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=9C=A8=E9=80=89=E6=8B=A9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=9C=AC=E6=AC=A1=E8=AF=A5=E9=80=80=E8=B4=A7=E7=9A=84=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 7 +++++++
 jshERP-web/src/views/bill/modules/SaleBackModal.vue     | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 48e7ba9b..2d5bd6d9 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -392,6 +392,13 @@
           let allTaxLastMoney = 0
           for(let j=0; j<selectBillDetailRows.length; j++) {
             let info = selectBillDetailRows[j];
+            if(info.finishNumber>0) {
+              info.operNumber = info.preNumber - info.finishNumber
+              info.allPrice = info.operNumber * info.unitPrice-0
+              let taxRate = info.taxRate-0
+              info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
+              info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
+            }
             info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
             listEx.push(info)
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 96cd7baa..4de5f016 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -403,6 +403,13 @@
           let allTaxLastMoney = 0
           for(let j=0; j<selectBillDetailRows.length; j++) {
             let info = selectBillDetailRows[j];
+            if(info.finishNumber>0) {
+              info.operNumber = info.preNumber - info.finishNumber
+              info.allPrice = info.operNumber * info.unitPrice-0
+              let taxRate = info.taxRate-0
+              info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
+              info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
+            }
             info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
             listEx.push(info)