From f50f5bdcc00a974e598be984c33ea973d96c5281 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Fri, 16 May 2025 17:18:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(consumptionDetails):=20=20=E6=B6=88?=
 =?UTF-8?q?=E8=B4=B9=E6=98=8E=E7=BB=86=E9=A1=B5=E5=8E=BB=E6=8E=89=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/financial/consumptionDetails.vue | 62 +++++++---------------
 1 file changed, 18 insertions(+), 44 deletions(-)

diff --git a/src/pages/financial/consumptionDetails.vue b/src/pages/financial/consumptionDetails.vue
index 0f1a271..0862d63 100644
--- a/src/pages/financial/consumptionDetails.vue
+++ b/src/pages/financial/consumptionDetails.vue
@@ -7,75 +7,49 @@
     </view>
     <view class="kuang" v-for="(item, index) in tableData" :key="index">
       <table class="tftable" border="1">
-        <tr  v-if="dataList[0].key">
-          <td align="right">{{ '国家' }}</td>
-          <td align="left">
-            <view class="theflex">
-              <view style="margin-right: 8rpx">
-                <img
-                  style="width: 46rpx; height: 32rpx"
-                  :src="item.pkCountryIcon"
-                  alt=""
-              /></view>
-              <view>{{ item.pkCountryName }}</view>
-            </view>
-          </td>
-        </tr>
-        <tr  v-if="dataList[1].key">
+        <tr  v-if="getColumnVisible('memberCode')">
           <td align="right">{{ '会员编号' }}</td>
           <td align="left">{{ item.memberCode }}</td>
         </tr>
-        <tr  v-if="dataList[2].key">
+        <tr  v-if="getColumnVisible('memberName')">
           <td align="right">{{ '会员姓名' }}</td>
           <td align="left">{{ item.memberName }}</td>
         </tr>
-        <tr  v-if="dataList[3].key">
+        <tr  v-if="getColumnVisible('pkAccountVal')">
           <td align="right">{{ '钱包类型' }}</td>
           <td align="left">{{ item.pkAccountVal }}</td>
         </tr>
-        <tr  v-if="dataList[4].key">
+        <tr  v-if="getColumnVisible('tradeTypeVal')">
           <td align="right">{{ '交易类型' }}</td>
           <td align="left">{{ item.tradeTypeVal }}</td>
         </tr>
-        <tr v-if="dataList[5].key">
+        <tr v-if="getColumnVisible('tradeBeforeBalance')">
           <td align="right">{{ '历史余额' + `(${isLocalSymbol()})` }}</td>
           <td align="left">
             {{ item.tradeBeforeBalance | toThousandthAndKeepDecimal }}
           </td>
         </tr>
-        <tr v-if="dataList[6].key">
+        <tr v-if="getColumnVisible('tradeBalance')">
           <td align="right">{{ '当前余额' + `(${isLocalSymbol()})` }}</td>
           <td align="left">
             {{ item.tradeBalance | toThousandthAndKeepDecimal }}
           </td>
         </tr>
-        <tr v-if="dataList[7].key">
+        <tr v-if="getColumnVisible('tradeAmount')">
           <td align="right">{{ '交易金额' + `(${isLocalSymbol()})` }}</td>
           <td align="left">
             {{ item.tradeAmount | toThousandthAndKeepDecimal }}
           </td>
         </tr>
-        <tr v-if="dataList[8].key">
-          <td align="right">{{ '历史余额' + `(${isLocals()})` }}</td>
-          <td align="left">{{ item.settleTradeBeforeBalance }}</td>
-        </tr>
-        <tr v-if="dataList[9].key">
-          <td align="right">{{ '当前余额' + `(${isLocals()})` }}</td>
-          <td align="left">{{ item.settleTradeBalance }}</td>
-        </tr>
-        <tr v-if="dataList[10].key">
-          <td align="right">{{ '交易金额' + `(${isLocals()})` }}</td>
-          <td align="left">{{ item.settleTradeAmount }}</td>
-        </tr>
-        <tr v-if="dataList[11].key">
+        <tr v-if="getColumnVisible('exchangeRate')">
           <td align="right">{{ '汇率' }}</td>
           <td align="left">{{ item.exchangeRate }}</td>
         </tr>
-        <tr v-if="dataList[12].key">
+        <tr v-if="getColumnVisible('creationTime')">
           <td align="right">{{ '交易日期' }}</td>
           <td align="left">{{ item.creationTime }}</td>
         </tr>
-        <tr v-if="dataList[13].key">
+        <tr v-if="getColumnVisible('sourceCode')">
           <td align="right">{{ '单据编号' }}</td>
           <td align="left">{{ item.sourceCode }}</td>
         </tr>
@@ -305,16 +279,16 @@ export default {
   methods: {
     isLocalSymbol,
     isLocals,
+    getColumnVisible(columnName) {
+      return !!this.dataList.find(item => item.name === columnName);
+    },
     getUserRole() {
       getRoleMenu("ConsumptionDetails").then((res) => {
-        this.dataList.forEach((item) => {
-          res.data.forEach((items) => {
-            if (item.name == items) {
-              item.key = items;
-            }
-            // this.flag = true
-          });
-        });
+        if (res.data?.length > 0) {
+          this.dataList = this.dataList.filter(item => res.data.includes(item.name));
+        } else {
+          this.dataList = [];
+        }
       });
     },
     // 设置默认日期，最大值为今天，最小值为去年今天