From 8f40c543ca5cd2a832f7d37ad90a2f7f7149ba3a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 9 Nov 2022 16:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ArriveModule.vue                   |  1 +
 .../modules/ArriveStageModule.vue              | 18 ++++++++++++++++++
 .../modules/ConfirmModule.vue                  |  1 +
 .../modules/InvoicingModule.vue                |  1 +
 4 files changed, 21 insertions(+)

diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
index f680842..ef2e219 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
@@ -157,6 +157,7 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'amountReceived', 'tax', 'taxRate','noTaxAmount', 'paymentDate', 'remark'))
+        this.taxRate = this.form.getFieldValue('taxRate')
       })
     },
     handleOk() {
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index 65ca524..d7d9d5e 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -23,6 +23,24 @@
               <div class="stage-content stage-content-money">{{ item.amountReceived }}</div>
             </div>
           </a-col>
+          <a-col :span="12">
+            <div class="stage">
+              <div class="stage-title">税率：</div>
+              <div class="stage-content stage-content-money">{{ item.taxRate }}</div>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="stage">
+              <div class="stage-title">税额：</div>
+              <div class="stage-content stage-content-money">{{ item.tax }}</div>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="stage">
+              <div class="stage-title">未税金额：</div>
+              <div class="stage-content stage-content-money">{{ item.noTaxAmount }}</div>
+            </div>
+          </a-col>
           <a-col :span="12">
             <div class="stage">
               <div class="stage-title">来款日期：</div>
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue
index 6dbe22e..a823029 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue
@@ -179,6 +179,7 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'amountReceived', 'tax','taxRate', 'noTaxAmount','paymentDate', 'remark'))
+        this.taxRate = this.form.getFieldValue('taxRate')
       })
     },
     getInfoById(id) {
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
index 41027cc..0991291 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
@@ -179,6 +179,7 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'tax','taxRate', 'noTaxAmount', 'billNo', 'billDate', 'remark'))
+        this.taxRate = this.form.getFieldValue('taxRate')
       })
     },
     getMailContactPostalCode() {