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

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

This commit is contained in:
woody 2025-06-24 09:50:00 +08:00
parent ad581fc9aa 8b6ce2f8ce
commit bfd05019c5
2 changed files with 27 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,25 +199,38 @@
align="center"
prop="retailAreaIncomeOri"
width="130"
:label="$t('区域收益') + `(${isLocalSymbol()})`"
:label="$t('区域分红') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitRangeIncomeOri"
width="130"
:label="$t('福利极差收益') + `(${isLocalSymbol()})`"
:label="$t('福利级差收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailMonthRepurchaseIncomeOri"
width="130"
:label="$t('复购极差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitIncomeOri"
width="130"
:label="$t('福利分红收益') + `(${isLocalSymbol()})`"
prop="retailBenefitAvgIncomeOri"
width="160"
:label="$t('福利分红平均收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitIncomeOri"
width="160"
:label="$t('福利分红加权收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="backPointsOri"
@ -230,81 +243,17 @@
align="center"
prop="retailRealSubtotalOri"
width="130"
:label="$t('小计') + `(${isLocalSymbol()})`"
:label="$t('收益小计') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="repurCouponOri"
width="130"
:formatter="stateFormat"
:label="'复购券' + `(${isLocalSymbol()})`"
/>
<el-table-column
align="center"
prop="repurCouponShareOri"
width="130"
:formatter="stateFormat"
:label="'复购券均分'"
/>
<el-table-column
align="center"
prop="backPointsOri"
width="130"
:formatter="stateFormat"
:label="'商城重消' + `(${isLocalSymbol()})`"
/>
<el-table-column
align="center"
prop="serviceSpendOri"
width="130"
:formatter="stateFormat"
:label="'平台服务费' + `(${isLocalSymbol()})`"
/>
<el-table-column
<!-- <el-table-column
align="center"
prop="globalPointsOri"
width="130"
:label="$t('直推极差') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="purRealSubtotalOri"
width="130"
:formatter="stateFormat"
:label="'首购实发小计' + `(${isLocalSymbol()})`"
/>
<el-table-column
align="center"
prop="cloudRealSubtotalOri"
width="130"
:formatter="stateFormat"
:label="$t('极差小计') + '(¥)'"
/>
<el-table-column
align="center"
prop="repurRealSubtotalOri"
width="130"
:formatter="stateFormat"
:label="'复购实发小计' + `(${isLocalSymbol()})`"
/>
<el-table-column
align="center"
prop="repurCouponSubtotalOri"
width="160"
:formatter="stateFormat"
:label="'复购券实发小计' + `(${isLocalSymbol()})`"
/>
/> -->
<el-table-column
align="center"

141
src/views/settlementCenter/sourceBonus/index.vue
View File

@ -182,7 +182,7 @@
>
{{ '导出' }}</el-button>
</div>
<div>
<!-- <div>
<el-dropdown :hide-on-click="false">
<span class="el-dropdown-link kuang">
{{ '筛选字段'
@ -196,7 +196,7 @@
>{{ item.text }}</el-checkbox></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div> -->
</div>
<div class="maintable">
<div>
@ -312,79 +312,20 @@
<!-- :label="item.text"-->
<!-- />-->
<el-table-column
v-if="menuList[9].checked == true && dataList[16].key"
align="center"
prop="round"
width="130"
:label="'直推轮数'"
/>
<el-table-column
v-if="menuList[10].checked == true && dataList[17].key"
align="center"
prop="second"
width="130"
:label="'直推次数'"
/>
<el-table-column
v-if="menuList[11].checked == true && dataList[18].key"
align="center"
prop="currentTouch"
width="130"
:label="'当前碰次'"
/>
<el-table-column
v-if="menuList[12].checked == true && dataList[19].key"
align="center"
prop="expandTouch"
width="130"
:label="'拓展碰次'"
/>
<el-table-column
v-if="menuList[13].checked == true && dataList[20].key"
v-if="dataList[20].key"
align="center"
prop="currentGeneration"
width="130"
:label="'当前代数'"
/>
<el-table-column
v-if="menuList[14].checked == true && dataList[21].key"
v-if="dataList[21].key"
align="center"
prop="coachGeneration"
width="130"
:label="'辅导代数'"
/>
<el-table-column
v-if="menuList[1].checked == true && dataList[22].key"
align="center"
prop="expandNoCappingOri"
width="130"
:label="'拓展无封' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="menuList[2].checked == true && dataList[23].key"
align="center"
prop="expandCappingOri"
width="130"
:label="'拓展封顶' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="menuList[3].checked == true && dataList[24].key"
align="center"
prop="expandNormalHalfOri"
width="130"
:label="'拓展正常减半' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="menuList[4].checked == true && dataList[25].key"
align="center"
prop="expandNormalRealOri"
width="130"
:label="'拓展实际减半' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="dataList[26].key"
align="center"
@ -558,78 +499,6 @@ export default {
text: '全选',
checked: true
},
{
id: 1,
text: `${'拓展无封'}(${isLocalSymbol()})`,
checked: true,
prop: 'expandNoCappingOri'
},
{
id: 2,
text: `${'拓展封顶'}(${isLocalSymbol()})`,
checked: true,
prop: 'expandCapping'
},
{
id: 3,
text: `${'拓展正常减半'}(${isLocalSymbol()})`,
checked: true,
prop: 'expandNormalHalf'
},
{
id: 4,
text: `${'拓展实际减半'}(${isLocalSymbol()})`,
checked: true,
prop: 'expanndNormalReal'
},
{
id: 5,
text: '拓展无封' + '($)',
checked: true,
prop: 'expandNoCappingDollar'
},
{
id: 6,
text: '拓展封顶' + `(${isLocals()})`,
checked: true,
prop: 'expandCappingDollar'
},
{
id: 7,
text: '拓展正常减半' + '($)',
checked: true,
prop: 'expandNormalHalfDollar'
},
{
id: 8,
text: '拓展实际减半' + '($)',
checked: true,
prop: 'expanndNormalRealDollar'
},
{
id: 9,
text: '直推轮数',
checked: true,
prop: 'round'
},
{
id: 10,
text: '直推次数',
checked: true,
prop: 'second'
},
{
id: 11,
text: '当前碰次',
checked: true,
prop: 'currentTouch'
},
{
id: 12,
text: '拓展碰次',
checked: true,
prop: 'expandTouch'
},
{
id: 13,
text: '当前代数',