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 dev

This commit is contained in:
woody 2025-10-27 17:00:26 +08:00
parent 0295fbb6a4 fa33642e5b
commit 8ab13178a8
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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