From 7e974c8de3f51d1dc0e08e4a495ddd9944c20aa4 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 17 Aug 2022 20:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/gridScoreRules.vue                  | 14 ++++++--------
 .../components/gridScoreStatistics.vue             |  9 ++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
index 16863bbd..be711748 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
@@ -422,14 +422,12 @@ export default {
       });
     },
     handleTreeChecked(data) {
-      if(!this.isEdit) {
-        this.list.forEach(v=>{
-          return {
-            ...v,
-            checked: false
-          }
-        })
-      }
+      this.list.forEach(v=>{
+        return {
+          ...v,
+          checked: false
+        }
+      })
       data.checked = !data.checked
       if (data.checked) {
         this.treeSelected[data.id] = data
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
index cd875ed6..43f6e364 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -74,19 +74,18 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <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.integralRuleId.length">{{ row.integralRuleName }}</span>
+              <span v-else>{{ row.eventDesc }}</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 v-if="row.integralRuleId.length">{{ row.eventType }}</span>
+              <span v-else>{{ row.integralRuleName }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="changeIntegral" label="积分变动" align="center">
             <template slot-scope="{ row }">
-              <!-- <span></span> -->
               <span v-if="row.integralType == 3">{{ row.changeIntegral | format }}</span>
               <span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
             </template>