kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
aixianling
2023-01-17 11:05:44 +08:00
parent 15fa0bfd38 ce36a373eb
commit 28ec0d0ef9
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/fengdu/app/AppLearning/components/List.vue
View File

@@ -16,7 +16,7 @@
size="small"
placeholder="请输入问题/提问人员"
clearable
v-throttle="() => {search.current = 1, getList()}"
v-throttle="() => {getListInit()}"
@clear="search.content = '', getListInit()"
suffix-icon="iconfont iconSearch">
</el-input>
@@ -72,9 +72,7 @@ export default {
};
},
created() {
this.dict.load("twoNewOrgCompanyCategory", "twoNewOrgConcernDegree").then(() => {
this.getList()
})
this.getList()
},
methods: {
getListInit() {
@@ -84,7 +82,7 @@ export default {
getList() {
this.search.startTime = ''
this.search.endTime = ''
if(this.time.length) {
if(this.time && this.time.length) {
this.search.startTime = this.time[0]
this.search.endTime = this.time[1]
}

14
project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
View File

@@ -49,25 +49,23 @@
<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 }">
<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 == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 1">-{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 2">+{{ row.changeIntegral }}</span>
<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 v-if="row.integralType == 1">积分消费</span>
<span v-if="row.integralType == 2">积分申请</span>
<span v-if="row.integralType == 3">{{ row.eventType }}</span>
</template>
</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>{{ row.integralRuleName || row.eventDesc}}</span>
</template>
</el-table-column>

9
project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
View File

@@ -79,13 +79,18 @@
</el-table-column>
<el-table-column slot="integralType" label="类型" align="center">
<template slot-scope="{ row }">
<span>{{ row.eventType || row.integralRuleName}}</span>
<span v-if="row.integralType == 0">积分调整</span>
<span v-if="row.integralType == 1">积分消费</span>
<span v-if="row.integralType == 2">积分申请</span>
<span v-if="row.integralType == 3">{{ row.eventType }}</span>
</template>
</el-table-column>
<el-table-column slot="changeIntegral" label="积分变动" align="center">
<template slot-scope="{ row }">
<span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 1">-{{ row.changeIntegral }}</span>
<span v-if="row.integralType == 2">+{{ row.changeIntegral }}</span>
<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="options" label="操作" align="center">