From bb2a7a0250e2f6f3d07ae9b35ae723b6e44c7e45 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Sun, 3 Nov 2024 10:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CostEntry/components/feeTable.vue  |  6 ++++--
 .../paidApply/detail/components/businessTable.vue | 15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/CostEntry/components/feeTable.vue b/src/components/CostEntry/components/feeTable.vue
index 49507536..a13833d2 100644
--- a/src/components/CostEntry/components/feeTable.vue
+++ b/src/components/CostEntry/components/feeTable.vue
@@ -102,8 +102,10 @@
         id,
         businessType,
         customerId
-      }],
-      queryCondition
+      }]
+    }
+    if (queryCondition != '{}') {
+      postData['queryCondition'] = queryCondition
     }
     loading.value = true
     await GetFees(postData).then(res => {
diff --git a/src/views/operation/paidApply/detail/components/businessTable.vue b/src/views/operation/paidApply/detail/components/businessTable.vue
index 78f09abd..0151fe56 100644
--- a/src/views/operation/paidApply/detail/components/businessTable.vue
+++ b/src/views/operation/paidApply/detail/components/businessTable.vue
@@ -441,6 +441,11 @@
     // 勾选前后同的id
     const diffIds = findDifferentElements(v, old)
     const rows = getSelectRows()
+    const params = []
+    if (feeParams.value.currency) params.push({FieldName:"currency",FieldValue:feeParams.value.currency,ConditionalType:1})
+    if (feeParams.value.feeType) params.push({FieldName:"feeType",FieldValue:feeParams.value.feeType,ConditionalType:1})
+    if (feeParams.value.feeName) params.push({FieldName:"feeName",FieldValue:feeParams.value.feeName,ConditionalType:1})
+    if (feeParams.value.customerId) params.push({FieldName:"customerId",FieldValue:feeParams.value.customerId,ConditionalType:1})
     if (v.length > old.length) {
       // 增加勾选
       diffIds.forEach(item => {
@@ -450,11 +455,7 @@
         })
         let customerId = btype[0]?.customerId
         btype = btype[0]?.businessType
-        const params = {}
-        if (feeParams.value.currency) params['currency'] = feeParams.value.currency
-        if (feeParams.value.currency) params['feeType'] = feeParams.value.feeType
-        if (feeParams.value.currency) params['feeName'] = feeParams.value.feeName
-        if (feeParams.value.currency) params['customerId'] = feeParams.value.customerId
+        console.log(feeParams.value)
         feeTabel.value.init([item], 'apply', btype, customerId, JSON.stringify(params)).then(res => {
           allFeeData[item] = res
         })
@@ -468,13 +469,13 @@
         // 获取业务类型传给下个子组件
         let btype = rows[0].businessType
         let customerId = rows[0].customerId
-        feeTabel.value.init([v[v.length - 1]], 'apply', btype, customerId)
+        feeTabel.value.init([v[v.length - 1]], 'apply', btype, customerId, JSON.stringify(params))
       }
     } else {
       // 点击单行平行切换
       let btype = rows[0].businessType
       let customerId = rows[0].customerId
-      feeTabel.value.init(v, 'apply', btype, customerId)
+      feeTabel.value.init(v, 'apply', btype, customerId, JSON.stringify(params))
     }
     rrmb.value = 0
     prmb.value = 0