From 3aa20736a5d17349ce77f510cdbf7119717f82b4 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 28 Dec 2022 14:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=AB=E9=83=BD=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppGridMemberScore/components/ApplyList.vue   |  2 +-
 .../AppGridMemberScore/components/gridScoreDetail.vue | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index e2a74c0a..28e253f1 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -7,7 +7,7 @@
             v-model="search.status"
             clearable
             placeholder="请选择审核状态"
-            :selectList="dict.getDict('integralApplyStatus')"
+            :selectList="dict.getDict('integralDeclareStatus')"
             @change="search.current = 1, getList()">
           </ai-select>
         </template>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
index f47ca071..6e9f23d3 100644
--- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
@@ -49,9 +49,13 @@
         <ai-table :tableData="tableData" :total="total" :current.sync="search.current" :size.sync="search.size"
                   @getList="getIntegralChange" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="changeIntegral" label="变动积分" align="center">
-            <template slot-scope="{ row }">
+            <!-- <template slot-scope="{ row }">
               <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
               <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
+            </template> -->
+            <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">
@@ -62,8 +66,9 @@
           </el-table-column>
           <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
             <template slot-scope="{ row }">
-              <span v-if="row.integralType == 0">{{ row.eventDesc }}</span>
-              <span v-else>{{ row.eventName }}</span>
+              <!-- <span v-if="row.integralType == 0">{{ row.eventDesc }}</span>
+              <span v-else>{{ row.eventName }}</span> -->
+              <span>{{ row.integralRuleName || row.eventDesc}}</span>
             </template>
           </el-table-column>
         </ai-table>