From c61941e6bad264ce1f223a747e7231398f9626d6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 28 Dec 2022 14:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=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    |  4 ++--
 .../components/gridScoreStatistics.vue                 | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index 00e3f2c2..e2a74c0a 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -104,7 +104,7 @@
             prop: 'status',
             align: 'center',
             label: '状态',
-            formart: v => this.dict.getLabel('integralApplyStatus', v)
+            formart: v => this.dict.getLabel('integralDeclareStatus', v)
           }
         ],
         tableData: [],
@@ -119,7 +119,7 @@
     },
 
     created () {
-      this.dict.load('integralApplyStatus', 'integralApplyEventType').then(() => {
+      this.dict.load('integralDeclareStatus', 'integralApplyEventType').then(() => {
         this.getList()
       })
     },
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
index 882f1141..509b2847 100644
--- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -74,20 +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.integralRuleId">{{ row.integralRuleName }}</span>
-              <span v-else>{{ row.eventDesc }}</span>
+              <span v-if="row.integralRuleName">{{ row.integralRuleName || row.eventDesc}}</span>
             </template>
           </el-table-column>
           <el-table-column slot="integralType" label="类型" align="center">
             <template slot-scope="{ row }">
-              <span v-if="row.integralRuleId">{{ row.eventType }}</span>
-              <span v-else>{{ row.integralRuleName }}</span>
+              <span>{{ row.eventType || row.integralRuleName}}</span>
             </template>
           </el-table-column>
           <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.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 0 || row.integralType == 2">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="options" label="操作"  align="center">
@@ -140,6 +138,7 @@
 <script>
 import { mapState } from "vuex"
 import * as echarts from 'echarts';
+import dayjs from 'dayjs'
 export default {
   name: "gridScoreStatistics",
   label: "积分统计",
@@ -208,6 +207,7 @@ export default {
     }
   },
   created() {
+    this.time = [dayjs().subtract(1,'week').format('YYYY-MM-DD'),dayjs().format('YYYY-MM-DD')]
     this.$dict.load('epidemicDangerousAreaLevel','integralType','integralRuleEvent','integralRuleEventType').then(() => {
       this.getStatistics()
       this.getGridList()