angelo
/
web-zk-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test

This commit is contained in:
woody 2025-10-27 17:14:34 +08:00
parent a5ddb8ed41 7954610c6f
commit 716d42f10f
5 changed files with 95 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/information/member/index.vue
View File

@ -45,6 +45,22 @@
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="会员等级" prop="pkSettleGrade">
<el-select
v-model="queryParams.pkSettleGrade"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in gradeRangList"
:key="item.pkId"
:label="item.gradeName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('荣誉奖衔')" prop="pkAwards">
<el-select
@ -319,6 +335,12 @@
:label="'会员姓名'"
width="180"
/>
<el-table-column
align="center"
prop="pkSettleGradeVal"
label="会员等级"
width="160"
/>
<el-table-column
v-if="allTxt.pkAwardsVal"
align="center"
@ -565,7 +587,8 @@ import {
} from '@/api/member'
import {
getAwardsListChiose,
getRegistration
getRegistration,
getgradeRanglist
} from '@/api/level'
import { teamList } from '@/api/business'
import { getRoleMenu } from '@/api/notice'
@ -744,7 +767,7 @@ export default {
created() {
// 查询会员信息
this.getMemberList()
this.getgradeRanglist()
this.getAwardsListChiose()
this.getvertexValue()
this.getmemberTeamList()
@ -876,6 +899,11 @@ export default {
})
}
},
getgradeRanglist() {
getgradeRanglist().then((res) => {
this.gradeRangList = res.data
})
},
// 查询会员信息
getMemberList() {

22
src/views/settlementCenter/bonusDetail/index.vue
View File

@ -181,12 +181,12 @@
width="130"
:label="'结算日期'"
/>
<el-table-column
align="center"
prop="directIncome"
:label="$t('直推收益')"
:formatter="stateFormat"
/>
<!-- <el-table-column-->
<!-- align="center"-->
<!-- prop="directIncome"-->
<!-- :label="$t('直推收益')"-->
<!-- :formatter="stateFormat"-->
<!-- />-->
<el-table-column
align="center"
prop="storeIncome"
@ -215,10 +215,18 @@
<el-table-column
align="center"
prop="realIncomeTotal"
width="130"
width="150"
:formatter="stateFormat"
:label="'实发收益总计'"
/>
<el-table-column
align="center"
prop="backPoints"
width="150"
:formatter="stateFormat"
:label="'赠品积分'"
/>
</el-table>
</div>
</div>

23
src/views/settlementCenter/performanceTotal/index.vue
View File

@ -172,14 +172,14 @@
prop="upgradeAmount"
:formatter="stateFormat"
width="160"
:label="'甄选金额'"
:label="'复购金额'"
/>
<el-table-column
align="center"
prop="upgradePv"
:formatter="stateFormat"
width="160"
:label="'甄选业绩'"
:label="'复购业绩'"
/>
<el-table-column
@ -187,7 +187,7 @@
prop="repurchaseAmount"
:formatter="stateFormat"
width="160"
:label="'商城金额'"
:label="'甄选金额'"
/>
<el-table-column
@ -195,7 +195,7 @@
prop="repurchasePv"
:formatter="stateFormat"
width="160"
:label="'商城业绩'"
:label="'甄选业绩'"
/>
<el-table-column
@ -213,6 +213,21 @@
width="150"
:label="'五折业绩'"
/>
<el-table-column
align="center"
prop="giftPointAmount"
:formatter="stateFormat"
width="160"
:label="'赠品金额'"
/>
<el-table-column
align="center"
prop="giftPointPv"
:formatter="stateFormat"
width="150"
:label="'赠品业绩'"
/>
<el-table-column
align="center"

32
src/views/settlementCenter/topPerformance/index.vue
View File

@ -243,14 +243,14 @@ export default {
},
{
id: 5,
text: `${'商城专区'}`,
text: `${'甄选专区'}`,
checked: true,
prop: 'mainRepurAmount',
total: 'mainRepurAmount'
},
{
id: 6,
text: `${'五折专区'}`,
text: '五折专区',
checked: true,
prop: 'retailConsumeAmount',
total: 'retailConsumeAmount'
@ -262,20 +262,20 @@ export default {
prop: 'totalAmount',
total: 'totalAmount'
},
{
id: 8,
text: `${'直推收益'}`,
checked: true,
prop: 'introduceBonus',
total: 'introduceBonus'
},
{
id: 9,
text: `${'直推收益拨比(%)'}`,
checked: true,
prop: 'introduceBonusRate',
total: 'introduceBonusRate'
},
// {
// id: 8,
// text: `${'直推收益'}`,
// checked: true,
// prop: 'introduceBonus',
// total: 'introduceBonus'
// },
// {
// id: 9,
// text: `${'直推收益拨比(%)'}`,
// checked: true,
// prop: 'introduceBonusRate',
// total: 'introduceBonusRate'
// },
{
id: 10,
text: `${'阶段收益'}`,

22
src/views/settlementCenter/totalBonus/index.vue
View File

@ -162,12 +162,12 @@
width="200"
:label="'结算时间'"
/>
<el-table-column
align="center"
prop="directIncome"
:label="$t('直推收益')"
:formatter="stateFormat"
/>
<!-- <el-table-column-->
<!-- align="center"-->
<!-- prop="directIncome"-->
<!-- :label="$t('直推收益')"-->
<!-- :formatter="stateFormat"-->
<!-- />-->
<el-table-column
align="center"
prop="storeIncome"
@ -196,10 +196,18 @@
v-if="allTxt.realIncomeTotal"
align="center"
prop="realIncomeTotal"
width="130"
width="150"
:label="'实发收益总计'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.backPoints"
align="center"
prop="backPoints"
width="150"
:label="'赠品积分'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="time"