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">
- {{ row.integralRuleName }}
- {{ row.eventDesc }}
+ {{ row.integralRuleName || row.eventDesc}}
- {{ row.eventType }}
- {{ row.integralRuleName }}
+ {{ row.eventType || row.integralRuleName}}
{{ row.changeIntegral | formatTime }}
- {{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}
+ {{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}
@@ -140,6 +138,7 @@