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

Compare commits

base: angelo:ef0e08a9a0707ad7634984706e371c58e0e3f3bc
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:3f736a1e9e79e0a165417a8efd0acf96e091bb2b
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "ef0e08a9a0707ad7634984706e371c58e0e3f3bc" and "3f736a1e9e79e0a165417a8efd0acf96e091bb2b" have entirely different histories.
ef0e08a9a0 ... 3f736a1e9e

2 changed files with 17 additions and 35 deletions
Show Stats Expand all files Collapse all files

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

@ -185,44 +185,30 @@
align="center" align="center"
prop="directIncome" prop="directIncome"
width="130" width="130"
:label="$t('直推收益')" :label="$t('直推收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="storeIncome" prop="storeIncome"
width="130" width="130"
:label="$t('阶段收益')" :label="$t('阶段收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="globalPoints" prop="globalPoints"
width="130" width="130"
:label="$t('见点收益')" :label="$t('见点收益') + `(${isLocalSymbol()})`"
: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="realIncomeTotal" prop="realIncomeTotalOri"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'实发收益总计'" :label="'实发收益总计' + `(${isLocalSymbol()})`"
/> />
</el-table> </el-table>
</div> </div>
@ -626,6 +612,10 @@ 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,31 +165,19 @@
<el-table-column <el-table-column
align="center" align="center"
prop="directIncome" prop="directIncome"
:label="$t('直推收益')" :label="$t('直推收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="storeIncome" prop="storeIncome"
:label="$t('阶段收益')" :label="$t('阶段收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="globalPoints" prop="globalPoints"
:label="$t('见点收益')" :label="$t('见点收益') + `(${isLocalSymbol()})`"
: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
@ -197,7 +185,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
@ -510,6 +498,10 @@ export default {
name: 'makerRealSubtotalOri', name: 'makerRealSubtotalOri',
key: '' key: ''
}, },
{
name: 'realIncomeTotalOri',
key: ''
},
{ {
name: 'realIncomeTotal', name: 'realIncomeTotal',
key: '' key: ''