From d64fab95f492605885a110211235e2612c5433ba Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 7 Apr 2023 17:06:25 +0800
Subject: [PATCH] 219

---
 .../AppResidentIntegrating/components/Detail.vue    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/project/fengdu/app/AppResidentIntegrating/components/Detail.vue b/project/fengdu/app/AppResidentIntegrating/components/Detail.vue
index 685b797b..1975a4cc 100644
--- a/project/fengdu/app/AppResidentIntegrating/components/Detail.vue
+++ b/project/fengdu/app/AppResidentIntegrating/components/Detail.vue
@@ -37,14 +37,7 @@
                     @getList="getList" :col-configs="colConfigs" :dict="dict">
             <el-table-column slot="changeIntegral" label="变动积分" align="center">
               <template slot-scope="{ row }">
-                <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
-                <span v-if="row.integralType == 0 || row.integralType == 2">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column slot="integralType" label="类型" align="center">
-              <template slot-scope="{ row }">
-                <span v-if="row.integralType == 0">积分调整</span>
-                <span v-else>{{ row.eventType }}</span>
+                <span>{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
               </template>
             </el-table-column>
             <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
@@ -87,9 +80,9 @@
       colConfigs() {
         return [
           {prop: "doTime", label: '时间', align: "left", width: "200px"},
-          {slot: "integralType", label: '类型', align: "center", width: "240px", dict: "integralType"},
+          {prop: "integralType", label: '类型', align: "center", width: "240px", dict: "integralType"},
           {slot: "changeIntegral"},
-          {prop: "nowIntegral", label: '剩余积分', align: "center", width: "200px"},
+          {prop: "nowIntegral", label: '剩余积分', align: "center" },
           {slot: "eventDesc"},
         ]
       }