From 0c0a275e0d1dfb0512fe4380508642274e099b46 Mon Sep 17 00:00:00 2001
From: yujinlong <yjl09601@163.com>
Date: Tue, 5 Nov 2024 16:06:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=B4=A2=E7=A8=8E=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=8A=A5=E9=94=80=E5=8D=95=20=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expenseAccount/detail/components/SearchTable.vue       | 2 +-
 src/views/financialTax/expenseAccount/detail/index.vue     | 7 +++++--
 src/views/financialTax/expenseAccount/index.vue            | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
index 32c80678..c0fed4bd 100644
--- a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
+++ b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
@@ -139,7 +139,7 @@
   const calcSelectedAmount = computed(() => {
     let totalAmount = 0
     totalAmount = [...props.hasSelectedRows, ...getSelectRows()].reduce((pre, cur) => {
-      return plus(pre + Number(cur?.totalAmount || 0))
+      return plus(pre + Number(cur?.totalWithTax || 0))
     }, 0)
     return numberThousandFormat(totalAmount)
   })
diff --git a/src/views/financialTax/expenseAccount/detail/index.vue b/src/views/financialTax/expenseAccount/detail/index.vue
index f269369c..ed1a1fad 100644
--- a/src/views/financialTax/expenseAccount/detail/index.vue
+++ b/src/views/financialTax/expenseAccount/detail/index.vue
@@ -154,7 +154,7 @@
 
   const calcSumAmount = computed(() => {
     return billTableData.value?.reduce((acc, cur) => {
-      return plus(acc, cur?.amount || 0)
+      return plus(acc, cur?.totalWithTax || 0)
     }, 0)
   })
 
@@ -218,9 +218,12 @@
   // 获取额外Query参数
   const getActionExtraQuery = (index) => {
     const obj = appStore.getIdsData
+    console.log('expenseAccount', obj['expenseAccount'])
+    console.log('index', index)
+
     if (obj && obj['expenseAccount']) {
       const preData = obj['expenseAccount'][index]
-      const pageType = [0, 2, 4].includes(preData.reimbursementType) ? 'EDIT' : 'VIEW'
+      const pageType = [0, 4].includes(preData.reimbursementType) ? 'EDIT' : 'VIEW'
 
       return {
         type: pageType,
diff --git a/src/views/financialTax/expenseAccount/index.vue b/src/views/financialTax/expenseAccount/index.vue
index 0ccae8cb..bf96eb46 100644
--- a/src/views/financialTax/expenseAccount/index.vue
+++ b/src/views/financialTax/expenseAccount/index.vue
@@ -119,7 +119,7 @@
   }
 
   const getActionOptList = (record: BillItem): ActionItem[] => {
-    const canEditable = [0, 2, 4].includes(record.reimbursementType)
+    const canEditable = [0, 4].includes(record.reimbursementType)
     return [
       {
         customIcon: h('i', {
@@ -173,7 +173,7 @@
     })
   }
   function GoDetailed(row: BillItem) {
-    const pageType = [0, 2, 4].includes(row.reimbursementType) ? 'EDIT' : 'VIEW'
+    const pageType = [0, 4].includes(row.reimbursementType) ? 'EDIT' : 'VIEW'
     go({
       path: '/expenseAccountDetail',
       query: {