From b75076a5d4ddc9c0208f9b1f7971bc3ac38db78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 25 Apr 2022 23:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E8=B0=83=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bill/modules/PurchaseInModal.vue    | 20 +++++++++++--------
 .../src/views/bill/modules/SaleOutModal.vue   | 20 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 0bef0360..85cef745 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -392,8 +392,7 @@
               'organId': record.organId,
               'linkNumber': record.number,
               'remark': record.remark,
-              'discountLastMoney': record.totalPrice,
-              'changeAmount': record.totalPrice
+              'discount': record.discount
             })
           });
           // 加载子表数据
@@ -411,24 +410,29 @@
           if(res && res.code === 200){
             let list = res.data.rows
             let listEx = []
-            let discountLastMoney = 0
+            let allTaxLastMoney = 0
             for(let j=0; j<list.length; j++){
               let info = list[j];
               if(info.preNumber) {
                 info.operNumber = info.preNumber - info.finishNumber
-                info.allPrice = info.operNumber * info.unitPrice-0;
-                discountLastMoney += info.allPrice
+                info.allPrice = info.operNumber * info.unitPrice-0
               }
-              info.taxMoney = 0
-              info.taxLastMoney = info.allPrice
+              let taxRate = info.taxRate-0
+              info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
+              info.taxLastMoney = info.allPrice + info.taxMoney
+              allTaxLastMoney += info.taxLastMoney
               listEx.push(info)
               this.changeColumnShow(info)
             }
             tab.dataSource = listEx
             //给优惠后金额重新赋值
-            if(discountLastMoney) {
+            if(allTaxLastMoney) {
+              let discount = this.form.getFieldValue('discount')-0
+              let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+              let discountLastMoney = allTaxLastMoney - discountMoney
               this.$nextTick(() => {
                 this.form.setFieldsValue({
+                  'discountMoney': discountMoney,
                   'discountLastMoney': discountLastMoney,
                   'changeAmount': discountLastMoney
                 })
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 0850a1ce..1c90128e 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -398,8 +398,7 @@
               'organId': record.organId,
               'linkNumber': record.number,
               'remark': record.remark,
-              'discountLastMoney': record.totalPrice,
-              'changeAmount': record.totalPrice
+              'discount': record.discount
             })
           });
           // 加载子表数据
@@ -417,24 +416,29 @@
           if(res && res.code === 200){
             let list = res.data.rows
             let listEx = []
-            let discountLastMoney = 0
+            let allTaxLastMoney = 0
             for(let j=0; j<list.length; j++){
               let info = list[j];
               if(info.preNumber) {
                 info.operNumber = info.preNumber - info.finishNumber
-                info.allPrice = info.operNumber * info.unitPrice-0;
-                discountLastMoney += info.allPrice
+                info.allPrice = info.operNumber * info.unitPrice-0
               }
-              info.taxMoney = 0
-              info.taxLastMoney = info.allPrice
+              let taxRate = info.taxRate-0
+              info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
+              info.taxLastMoney = info.allPrice + info.taxMoney
+              allTaxLastMoney += info.taxLastMoney
               listEx.push(info)
               this.changeColumnShow(info)
             }
             tab.dataSource = listEx
             //给优惠后金额重新赋值
-            if(discountLastMoney) {
+            if(allTaxLastMoney) {
+              let discount = this.form.getFieldValue('discount')-0
+              let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+              let discountLastMoney = allTaxLastMoney - discountMoney
               this.$nextTick(() => {
                 this.form.setFieldsValue({
+                  'discountMoney': discountMoney,
                   'discountLastMoney': discountLastMoney,
                   'changeAmount': discountLastMoney
                 })