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

feat(bonus): 奖金明细，奖金汇总列表字段调整

This commit is contained in:
woody 2025-07-25 13:37:56 +08:00
parent 7e8badfa8f
commit 8e20e8cc4b
3 changed files with 61 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,54 +145,54 @@
:label="'结算日期'" :label="'结算日期'"
/> />
<el-table-column <el-table-column
v-if="allTxt.directIncomeOri" v-if="allTxt.directIncome"
align="center" align="center"
prop="directIncomeOri" prop="directIncome"
width="130" width="130"
:label="'直推收益'" :label="'直推收益'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.expandIncomeOri" v-if="allTxt.expandIncome"
align="center" align="center"
prop="expandIncomeOri" prop="expandIncome"
width="130" width="130"
:label="'拓展收益'" :label="'拓展收益'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.coachIncomeOri" v-if="allTxt.coachIncome"
align="center" align="center"
prop="coachIncomeOri" prop="coachIncome"
width="130" width="130"
:label="'辅导收益'" :label="'辅导收益'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<!-- <el-table-column <!-- <el-table-column
v-if="allTxt.shareIncomeOri" v-if="allTxt.shareIncome"
align="center" align="center"
prop="shareIncomeOri" prop="shareIncome"
width="130" width="130"
:label="'分红收益' + `(${isLocalSymbol()})`" :label="'分红收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> --> /> -->
<el-table-column <el-table-column
v-if="allTxt.serviceIncomeOri" v-if="allTxt.serviceIncome"
align="center" align="center"
prop="serviceIncomeOri" prop="serviceIncome"
width="130" width="130"
:label="'服务补贴'" :label="'服务补贴'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.repurExpandIncomeOri" v-if="allTxt.repurExpandIncome"
align="center" align="center"
prop="repurExpandIncomeOri" prop="repurExpandIncome"
width="130" width="130"
:label="'复购拓展收益'" :label="'复购拓展收益'"
/> />
@ -212,47 +212,55 @@
:label="'见点收益'" :label="'见点收益'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
v-if="allTxt.storeIncome"
align="center"
prop="storeIncome"
width="130"
:label="'区域收益'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
v-if="allTxt.backPointsOri" v-if="allTxt.backPoints"
align="center" align="center"
prop="backPointsOri" prop="backPoints"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'重复消费'" :label="'重复消费'"
/> />
<el-table-column <el-table-column
v-if="allTxt.serviceSpendOri" v-if="allTxt.serviceSpend"
align="center" align="center"
prop="serviceSpendOri" prop="serviceSpend"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'平台服务费'" :label="'平台服务费'"
/> />
<el-table-column <el-table-column
v-if="allTxt.purRealSubtotalOri" v-if="allTxt.purRealSubtotal"
align="center" align="center"
prop="purRealSubtotalOri" prop="purRealSubtotal"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'首购实发小计'" :label="'首购实发小计'"
/> />
<el-table-column <el-table-column
v-if="allTxt.repurRealSubtotalOri" v-if="allTxt.repurRealSubtotal"
align="center" align="center"
prop="repurRealSubtotalOri" prop="repurRealSubtotal"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'复购实发小计'" :label="'复购实发小计'"
/> />
<el-table-column <el-table-column
v-if="allTxt.realIncomeTotalOri" v-if="allTxt.realIncomeTotal"
align="center" align="center"
prop="realIncomeTotalOri" prop="realIncomeTotal"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'实发收益总计'" :label="'实发收益总计'"

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

@ -165,9 +165,9 @@
:label="'结算日期'" :label="'结算日期'"
/> />
<el-table-column <el-table-column
v-if="allTxt.directIncomeOri" v-if="allTxt.directIncome"
align="center" align="center"
prop="directIncomeOri" prop="directIncome"
width="130" width="130"
:label="'直推收益'" :label="'直推收益'"
:formatter="stateFormat" :formatter="stateFormat"
@ -181,9 +181,9 @@
:formatter="stateFormat" :formatter="stateFormat"
/> --> /> -->
<el-table-column <el-table-column
v-if="allTxt.expandIncomeOri" v-if="allTxt.expandIncome"
align="center" align="center"
prop="expandIncomeOri" prop="expandIncome"
width="130" width="130"
:label="'拓展收益'" :label="'拓展收益'"
:formatter="stateFormat" :formatter="stateFormat"
@ -197,27 +197,27 @@
:formatter="stateFormat" :formatter="stateFormat"
/> --> /> -->
<el-table-column <el-table-column
v-if="allTxt.coachIncomeOri" v-if="allTxt.coachIncome"
align="center" align="center"
prop="coachIncomeOri" prop="coachIncome"
width="130" width="130"
:label="'辅导收益'" :label="'辅导收益'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.serviceIncomeOri" v-if="allTxt.serviceIncome"
align="center" align="center"
prop="serviceIncomeOri" prop="serviceIncome"
width="130" width="130"
:label="'服务补贴'" :label="'服务补贴'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.repurExpandIncomeOri" v-if="allTxt.repurExpandIncome"
align="center" align="center"
prop="repurExpandIncomeOri" prop="repurExpandIncome"
width="130" width="130"
:label="'复购拓展收益'" :label="'复购拓展收益'"
:formatter="stateFormat" :formatter="stateFormat"
@ -238,38 +238,46 @@
:label="'见点收益'" :label="'见点收益'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
v-if="allTxt.storeIncome"
align="center"
prop="storeIncome"
width="130"
:label="'区域收益'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
v-if="allTxt.backPointsOri" v-if="allTxt.backPoints"
align="center" align="center"
prop="backPointsOri" prop="backPoints"
width="130" width="130"
:label="'重复消费'" :label="'重复消费'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.serviceSpendOri" v-if="allTxt.serviceSpend"
align="center" align="center"
prop="serviceSpendOri" prop="serviceSpend"
width="130" width="130"
:label="'平台服务费'" :label="'平台服务费'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.purRealSubtotalOri" v-if="allTxt.purRealSubtotal"
align="center" align="center"
prop="purRealSubtotalOri" prop="purRealSubtotal"
width="130" width="130"
:label="'首购实发小计'" :label="'首购实发小计'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
v-if="allTxt.repurRealSubtotalOri" v-if="allTxt.repurRealSubtotal"
align="center" align="center"
prop="repurRealSubtotalOri" prop="repurRealSubtotal"
width="130" width="130"
:label="'复购实发小计'" :label="'复购实发小计'"
:formatter="stateFormat" :formatter="stateFormat"
@ -284,9 +292,9 @@
/> --> /> -->
<el-table-column <el-table-column
v-if="allTxt.realIncomeTotalOri" v-if="allTxt.realIncomeTotal"
align="center" align="center"
prop="realIncomeTotalOri" prop="realIncomeTotal"
width="130" width="130"
:label="'实发收益总计'" :label="'实发收益总计'"
:formatter="stateFormat" :formatter="stateFormat"
@ -392,116 +400,6 @@ export default {
label: '禁止' label: '禁止'
} }
], ],
menuList: [
{
id: 0,
text: '全选',
checked: true
},
{
id: 21,
text: '直推收益' + '($)',
checked: true,
prop: 'firstBuyAmountDollar'
},
{
id: 22,
text: '拓展收益' + '($)',
checked: true,
prop: 'expandIncome'
},
{
id: 23,
text: '辅导收益' + '($)',
checked: true,
prop: 'coachIncome'
},
{
id: 24,
text: '分红收益' + '($)',
checked: true,
prop: 'shareIncome'
},
{
id: 25,
text: '报单收益' + '($)',
checked: true,
prop: 'serviceIncome'
},
{
id: 26,
text: '云代直推收益' + '($)',
checked: true,
prop: 'cloudDirectIncome'
},
{
id: 27,
text: '云代首购收益' + '($)',
checked: true,
prop: 'cloudPurIncome'
},
{
id: 28,
text: '云代复购收益' + '($)',
checked: true,
prop: 'cloudRepurIncome'
},
{
id: 39,
text: '复购级差收益' + '($)',
checked: true,
prop: 'repurRangeIncome'
},
{
id: 30,
text: '复购拓展收益' + '($)',
checked: true,
prop: 'repurExpandIncome'
},
{
id: 31,
text: '复购券',
checked: true,
prop: 'repurCoupon',
flag: 1
},
{
id: 32,
text: '商城重消' + '($)',
checked: true,
prop: 'backPoints'
},
{
id: 35,
text: '平台服务费' + '($)',
checked: true,
prop: 'backPoints'
},
{
id: 44,
text: '首购实发小计' + '($)',
checked: true,
prop: 'purRealSubtotal'
},
{
id: 45,
text: '云代实发小计' + '($)',
checked: true,
prop: 'cloudRealSubtotal'
},
{
id: 46,
text: '复购实发小计' + '($)',
checked: true,
prop: 'repurRealSubtotal'
},
{
id: 47,
text: '实发收益总计' + '($)',
checked: true,
prop: 'realIncomeTotal'
}
],
creationTime: [], creationTime: [],
creationTime1: [], creationTime1: [],
select: { select: {
@ -542,192 +440,6 @@ export default {
pkVertex: [], pkVertex: [],
pkTeamId: '', // 隶属团队id pkTeamId: '', // 隶属团队id
pkVertId: '', // 隶属体系id pkVertId: '', // 隶属体系id
dataList: [
{
name: 'period',
key: ''
},
{
name: 'directIncomeOri',
key: ''
},
{
name: 'directIncome',
key: ''
},
{
name: 'expandIncomeOri',
key: ''
},
{
name: 'expandIncome',
key: ''
},
{
name: 'coachIncomeOri',
key: ''
},
{
name: 'coachIncome',
key: ''
},
{
name: 'shareIncomeOri',
key: ''
},
{
name: 'shareIncome',
key: ''
},
{
name: 'serviceIncomeOri',
key: ''
},
// 10
{
name: 'serviceIncome',
key: ''
},
{
name: 'cloudDirectIncomeOri',
key: ''
},
{
name: 'cloudDirectIncome',
key: ''
},
{
name: 'cloudPurIncomeOri',
key: ''
},
{
name: 'cloudPurIncome',
key: ''
},
{
name: 'cloudRepurIncomeOri',
key: ''
},
{
name: 'cloudRepurIncome',
key: ''
},
{
name: 'repurRangeIncomeOri',
key: ''
},
{
name: 'repurRangeIncome',
key: ''
},
{
name: 'repurExpandIncomeOri',
key: ''
},
// 20
{
name: 'repurExpandIncome',
key: ''
},
{
name: 'repurCoupon',
key: ''
},
{
name: 'repurCouponShareOri',
key: ''
},
{
name: 'backPointsOri',
key: ''
},
{
name: 'backPoints',
key: ''
},
{
name: 'serviceSpendOri',
key: ''
},
{
name: 'serviceSpend',
key: ''
},
{
name: 'globalPoints',
key: ''
},
{
name: 'carAwardPoints',
key: ''
},
{
name: 'storeIncome',
key: ''
},
// 30
{
name: 'hiFunIncomeOri',
key: ''
},
{
name: 'makerDirectIncomeOri',
key: ''
},
{
name: 'makerShareIncomeOri',
key: ''
},
{
name: 'purRealSubtotalOri',
key: ''
},
{
name: 'purRealSubtotal',
key: ''
},
{
name: 'cloudRealSubtotalOri',
key: ''
},
{
name: 'cloudRealSubtotal',
key: ''
},
{
name: 'repurRealSubtotalOri',
key: ''
},
{
name: 'repurRealSubtotal',
key: ''
},
{
name: 'repurCouponSubtotalOri',
key: ''
},
// 40
{
name: 'makerRealSubtotalOri',
key: ''
},
{
name: 'realIncomeTotalOri',
key: ''
},
{
name: 'realIncomeTotal',
key: ''
},
{
name: 'settleDate',
key: ''
},
{
name: 'hiFunIncome',
key: ''
}
],
flag: false, flag: false,
allTxt: {}, allTxt: {},
props: { props: {

8
vue.config.js
View File

@ -44,11 +44,9 @@ module.exports = {
}, },
proxy: { proxy: {
'/prod-api': { '/prod-api': {
target: 'http://192.168.0.86:8080/', target: 'https://t-mana.beida666.com/',
changeOrigin: true, changeOrigin: true
pathRewrite: {
'^/prod-api': ''
}
} }
} }
// proxy: { // proxy: {