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

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

This commit is contained in:
woody 2025-09-29 14:35:26 +08:00
parent 2f316b91e7 ef0e08a9a0
commit c614b21aef
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,30 +185,44 @@
align="center" align="center"
prop="directIncome" prop="directIncome"
width="130" width="130"
:label="$t('直推收益') + `(${isLocalSymbol()})`" :label="$t('直推收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="storeIncome" prop="storeIncome"
width="130" width="130"
:label="$t('阶段收益') + `(${isLocalSymbol()})`" :label="$t('阶段收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="globalPoints" prop="globalPoints"
width="130" width="130"
:label="$t('见点收益') + `(${isLocalSymbol()})`" :label="$t('见点收益')"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailRangeIncome"
width="130"
:label="$t('领导奖')"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailSameLevelIncome"
width="130"
:label="$t('平级奖')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="realIncomeTotalOri" prop="realIncomeTotal"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'实发收益总计' + `(${isLocalSymbol()})`" :label="'实发收益总计'"
/> />
</el-table> </el-table>
</div> </div>
@ -612,10 +626,6 @@ export default {
name: 'makerRealSubtotalOri', name: 'makerRealSubtotalOri',
key: '' key: ''
}, },
{
name: 'realIncomeTotalOri',
key: ''
},
{ {
name: 'realIncomeTotal', name: 'realIncomeTotal',
key: '' key: ''

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

@ -165,19 +165,31 @@
<el-table-column <el-table-column
align="center" align="center"
prop="directIncome" prop="directIncome"
:label="$t('直推收益') + `(${isLocalSymbol()})`" :label="$t('直推收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="storeIncome" prop="storeIncome"
:label="$t('阶段收益') + `(${isLocalSymbol()})`" :label="$t('阶段收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="globalPoints" prop="globalPoints"
:label="$t('见点收益') + `(${isLocalSymbol()})`" :label="$t('见点收益')"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailRangeIncome"
:label="$t('领导奖')"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailSameLevelIncome"
:label="$t('平级奖')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
@ -185,7 +197,7 @@
align="center" align="center"
prop="realIncomeTotal" prop="realIncomeTotal"
width="130" width="130"
:label="'实发收益总计' + '(¥)'" :label="'实发收益总计'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
@ -498,10 +510,6 @@ export default {
name: 'makerRealSubtotalOri', name: 'makerRealSubtotalOri',
key: '' key: ''
}, },
{
name: 'realIncomeTotalOri',
key: ''
},
{ {
name: 'realIncomeTotal', name: 'realIncomeTotal',
key: '' key: ''