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

This commit is contained in:
woody 2025-07-09 15:14:34 +08:00
commit fa80e61020
2 changed files with 16 additions and 2 deletions

View File

@ -211,11 +211,18 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="retailMonthRepurchaseIncomeOri" prop="repurRangeIncome"
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"

View File

@ -194,11 +194,18 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="retailMonthRepurchaseIncome" prop="repurRangeIncome"
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"