From 0923766b1a367dd6bd3dfeb63cb0b5b7b272e52a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 10 Nov 2022 14:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A6=E5=BC=80=E7=A5=A8=E5=90=84=E9=98=B6=E6=AE=B5=20?=
 =?UTF-8?q?=E7=A8=8E=E7=8E=87=20=E7=A8=8E=E9=A2=9D=20=E6=9C=AA=E7=A8=8E?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ArriveStageModule.vue             | 28 ++++++++++--
 .../modules/ConfirmStageModule.vue            | 34 ++++++++++++--
 .../modules/InvoicingStageModule.vue          | 44 ++++++++++++++++++-
 3 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index d7d9d5e..0cefc55 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -26,7 +26,7 @@
           <a-col :span="12">
             <div class="stage">
               <div class="stage-title">税率：</div>
-              <div class="stage-content stage-content-money">{{ item.taxRate }}</div>
+              <div class="stage-content stage-content-money">{{initRateDictText(item.taxRate)}}</div>
             </div>
           </a-col>
           <a-col :span="12">
@@ -95,6 +95,7 @@ import ArriveModule from './ArriveModule'
 import {amountReceivedList, revokeIncome} from '../../../../api/incomePaymentsApi'
 import PreviewImgModal from '../../../../components/PreviewImgModal'
 import PreviewFile from '../../../../components/jero/PreviewFile.vue'
+import {ajaxGetDictItems} from '@api/api'
 
 export default {
   name: 'ArriveStageModule',
@@ -125,7 +126,8 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       // 阶段列表，用于循环展示阶段信息
-      stageList: []
+      stageList: [],
+      rateList:[],
     }
   },
   watch: {
@@ -135,12 +137,32 @@ export default {
       }
     }
   },
+  created() {
+    this.getRateList()
+  },
   methods: {
+    /**
+     * 获取税率 字典
+     * */
+    getRateList(){
+      ajaxGetDictItems('rate').then(res => {
+        if(res.success){
+          this.rateList = res.result
+        }
+      })
+    },
+    // 回显税率
+    initRateDictText(rate) {
+      let result
+      let resultArr =  this.rateList.filter(e => e.value === rate)
+      result =   resultArr.length > 0 ? resultArr[0].title :''
+      return result
+    },
+
     /**
      * 撤销
      * */
     handleRevoke(record) {
-      console.log('撤销')
       let that = this
       this.$confirm({
         title: '确认撤销',
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue
index 843c4a9..5da1a8e 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue
@@ -23,6 +23,12 @@
                 <div class="stage-content">{{ item.amountReceived }}</div>
               </div>
             </a-col>
+            <a-col :span="6">
+              <div class="stage">
+                <div class="stage-title">税率：</div>
+                <div class="stage-content">{{ initRateDictText(item.taxRate) }}</div>
+              </div>
+            </a-col>
             <a-col :span="6">
               <div class="stage">
                 <div class="stage-title">税额：</div>
@@ -69,7 +75,8 @@
 
 <script>
 import ConfirmModule from './ConfirmModule'
-import {getPayConfirmList, payBillList} from '../../../../api/incomePaymentsApi'
+import {getPayConfirmList} from '../../../../api/incomePaymentsApi'
+import {ajaxGetDictItems} from '@api/api'
 
 export default {
   name: 'InvoicingStageModule',
@@ -97,7 +104,8 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       // 阶段列表，用于循环展示阶段信息
-      stageList: []
+      stageList: [],
+      rateList:[],
     }
   },
   watch: {
@@ -110,7 +118,27 @@ export default {
       }
     }
   },
+  created() {
+    this.getRateList()
+  },
   methods: {
+    /**
+     * 获取税率 字典
+     * */
+    getRateList(){
+      ajaxGetDictItems('rate').then(res => {
+        if(res.success){
+          this.rateList = res.result
+        }
+      })
+    },
+    // 回显税率
+    initRateDictText(rate) {
+      let result
+      let resultArr =  this.rateList.filter(e => e.value === rate)
+      result =   resultArr.length > 0 ? resultArr[0].title :''
+      return result
+    },
     // 显示数据的相关方法
     show(record) {
       console.log(record)
@@ -130,7 +158,7 @@ export default {
     },
     open() {
       // this.visible = true
-      console.log(this.projectId, "________projectId________")
+      console.log(this.projectId, '________projectId________')
       this.loadData()
     },
     close() {
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
index 40867d2..fa69a5b 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
@@ -28,6 +28,26 @@
                 <div class="stage-content stage-content-money">{{ item.invoiceAmount }}</div>
               </div>
             </a-col>
+
+            <a-col :span="6">
+              <div class="stage">
+                <div class="stage-title">税率：</div>
+                <div class="stage-content stage-content-money">{{ initRateDictText(item.taxRate) }}</div>
+              </div>
+            </a-col>
+            <a-col :span="6">
+              <div class="stage">
+                <div class="stage-title">税额：</div>
+                <div class="stage-content stage-content-money">{{ item.tax }}</div>
+              </div>
+            </a-col>
+            <a-col :span="6">
+              <div class="stage">
+                <div class="stage-title">未税金额：</div>
+                <div class="stage-content stage-content-money">{{ item.noTaxAmount }}</div>
+              </div>
+            </a-col>
+
             <a-col :span="6">
               <div class="stage">
                 <div class="stage-title">开票号：</div>
@@ -69,6 +89,7 @@
 <script>
 import InvoicingModule from './InvoicingModule'
 import { payBillList } from '../../../../api/incomePaymentsApi'
+import {ajaxGetDictItems} from '@api/api'
 
 export default {
   name: 'InvoicingStageModule',
@@ -96,7 +117,8 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       // 阶段列表，用于循环展示阶段信息
-      stageList: []
+      stageList: [],
+      rateList:[],
     }
   },
   watch: {
@@ -109,7 +131,27 @@ export default {
       }
     }
   },
+  created() {
+    this.getRateList()
+  },
   methods: {
+    /**
+     * 获取税率 字典
+     * */
+    getRateList(){
+      ajaxGetDictItems('rate').then(res => {
+        if(res.success){
+          this.rateList = res.result
+        }
+      })
+    },
+    // 回显税率
+    initRateDictText(rate) {
+      let result
+      let resultArr =  this.rateList.filter(e => e.value === rate)
+      result =   resultArr.length > 0 ? resultArr[0].title :''
+      return result
+    },
     handleAdd() {
       this.$refs.invoicingModal.title = '添加阶段'
       this.$refs.invoicingModal.add()