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

Compare commits

base: angelo:fa80e61020724384f2e0c5ad788331182a6cb607
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:base-online
angelo:feat/bonusTotal
angelo:feat/goods-sort-config
angelo:feat/summaryDashboard
angelo:feat/goods/goodsAreaIncome
angelo:feat/goodsEdit-boxNum
angelo:feat/vertex-group
..
compare: angelo:12fade3092929509fcf5d38d14aa30e15af7158a
Branches Tags
angelo:test
angelo:dev
angelo:base-online
angelo:feat/bonusTotal
angelo:feat/goods-sort-config
angelo:feat/summaryDashboard
angelo:feat/goods/goodsAreaIncome
angelo:feat/goodsEdit-boxNum
angelo:feat/vertex-group
angelo:master

No commits in common. "fa80e61020724384f2e0c5ad788331182a6cb607" and "12fade3092929509fcf5d38d14aa30e15af7158a" have entirely different histories.
fa80e61020 ... 12fade3092

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

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

@ -211,18 +211,11 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="repurRangeIncome" prop="retailMonthRepurchaseIncomeOri"
width="130" width="130"
:label="$t('复购级差收益') + '(￥)'" :label="$t('复购级差收益') + '(￥)'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailMonthRepurchaseIncomeOri"
width="160"
:label="$t('月复购级差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="coachIncomeOri" prop="coachIncomeOri"

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

@ -194,18 +194,11 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="repurRangeIncome" prop="retailMonthRepurchaseIncome"
width="130" width="130"
:label="$t('复购级差收益') + '(￥)'" :label="$t('复购级差收益') + '(￥)'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailMonthRepurchaseIncome"
width="160"
:label="$t('月复购级差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="coachIncome" prop="coachIncome"