From 60e56295fa4f937df69361a1732ed9a1df3e731f Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 25 Jul 2025 16:22:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(settle):=20=E6=8B=A8=E6=AF=94=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=A7=81=E7=82=B9=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E5=92=8C=E5=8C=BA=E5=9F=9F=E6=94=B6=E7=9B=8A=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settlementCenter/bonusDetail/index.vue | 4 +- .../performanceRatio/performanceList.vue | 44 ++++++++++++------- .../settlementCenter/topPerformance/index.vue | 44 ++++++++++++------- .../topPerformanceTotal/index.vue | 10 +++++ 4 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue index 0a3f5d0..bb2f830 100644 --- a/src/views/settlementCenter/bonusDetail/index.vue +++ b/src/views/settlementCenter/bonusDetail/index.vue @@ -209,7 +209,7 @@ align="center" prop="globalPoints" width="130" - :label="'见点收益'" + :label="'复购见点收益'" :formatter="stateFormat" /> diff --git a/src/views/settlementCenter/performanceRatio/performanceList.vue b/src/views/settlementCenter/performanceRatio/performanceList.vue index 5f44b9e..8ad2ea2 100644 --- a/src/views/settlementCenter/performanceRatio/performanceList.vue +++ b/src/views/settlementCenter/performanceRatio/performanceList.vue @@ -265,49 +265,49 @@ export default { }, { id: 3, - text: `${'注册专区'}(￥)`, + text: `${'注册专区'}`, checked: true, prop: 'mainRegAmount', total: 'mainRegAmountSum' }, { id: 4, - text: `${'升级专区'}(￥)`, + text: `${'升级专区'}`, checked: true, prop: 'mainUpAmount', total: 'mainUpAmountSum' }, { id: 7, - text: `${'首购金额'}(￥)`, + text: `${'首购金额'}`, checked: true, prop: 'firstPurchaseAll', total: 'firstPurchaseAllSum' }, { id: 8, - text: `${'直推收益'}(￥)`, + text: `${'直推收益'}`, checked: true, prop: 'introduceBonus', total: 'introduceBonusSum' }, { id: 9, - text: `${'拓展收益'}(￥)`, + text: `${'拓展收益'}`, checked: true, prop: 'orgBonus', total: 'orgBonusSum' }, { id: 10, - text: `${'辅导收益'}(￥)`, + text: `${'辅导收益'}`, checked: true, prop: 'leaderBonus', total: 'leaderBonusSum' }, { id: 12, - text: `${'服务补贴'}(￥)`, + text: `${'服务补贴'}`, checked: true, prop: 'serviceBonus', total: 'serviceBonusSum' @@ -315,42 +315,56 @@ export default { { id: 16, - text: `${'复购专区'}(￥)`, + text: `${'复购专区'}`, checked: true, prop: 'mainRepurAmount', total: 'mainRepurAmountSum' }, { id: 18, - text: `${'复购金额'}(￥)`, + text: `${'复购金额'}`, checked: false, prop: 'repurchaseAllAmount', total: 'repurchaseAllAmountSum' }, { id: 19, - text: `${'复购级差收益'}(￥)`, + text: `${'复购级差收益'}`, checked: false, prop: 'repurRangeBonus', total: 'repurRangeBonusSum' }, { id: 20, - text: `${'复购拓展收益'}(￥)`, + text: `${'复购拓展收益'}`, checked: false, prop: 'repurOrgBonus', total: 'repurOrgBonusSum' }, { id: 20, - text: `${'复购辅导收益'}(￥)`, + text: `${'复购辅导收益'}`, checked: false, prop: 'repurLeaderBonus', total: 'repurLeaderBonusSum' }, + { + id: 20, + text: `${'复购见点收益'}`, + checked: false, + prop: 'globalPointsBonus', + total: 'globalPointsBonusSum' + }, + { + id: 20, + text: `${'复购区域收益'}`, + checked: false, + prop: 'storeIncomeBonus', + total: 'storeIncomeBonusSum' + }, { id: 21, - text: `${'首购拨出金额'}(￥)`, + text: `${'首购拨出金额'}`, checked: false, prop: 'mainBonus', total: 'mainBonusSum' @@ -364,7 +378,7 @@ export default { }, { id: 23, - text: `${'复购拨出金额'}(￥)`, + text: `${'复购拨出金额'}`, checked: false, prop: 'repurBonus', total: 'repurBonusSum' @@ -378,7 +392,7 @@ export default { }, { id: 25, - text: `${'总拨出金额'}(￥)`, + text: `${'总拨出金额'}`, checked: false, prop: 'totalBonus', total: 'totalBonusSum' diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue index df4a776..489abcc 100644 --- a/src/views/settlementCenter/topPerformance/index.vue +++ b/src/views/settlementCenter/topPerformance/index.vue @@ -224,91 +224,105 @@ export default { }, { id: 3, - text: `${'注册专区'}(￥)`, + text: `${'注册专区'}`, checked: true, prop: 'mainRegAmount', total: 'mainRegAmountSum' }, { id: 4, - text: `${'升级专区'}(￥)`, + text: `${'升级专区'}`, checked: true, prop: 'mainUpAmount', total: 'mainUpAmountSum' }, { id: 7, - text: `${'首购金额'}(￥)`, + text: `${'首购金额'}`, checked: true, prop: 'firstPurchaseAll', total: 'firstPurchaseAllSum' }, { id: 8, - text: `${'直推收益'}(￥)`, + text: `${'直推收益'}`, checked: true, prop: 'introduceBonus', total: 'introduceBonusSum' }, { id: 9, - text: `${'拓展收益'}(￥)`, + text: `${'拓展收益'}`, checked: true, prop: 'orgBonus', total: 'orgBonusSum' }, { id: 10, - text: `${'辅导收益'}(￥)`, + text: `${'辅导收益'}`, checked: true, prop: 'leaderBonus', total: 'leaderBonusSum' }, { id: 12, - text: `${'服务补贴'}(￥)`, + text: `${'服务补贴'}`, checked: true, prop: 'serviceBonus', total: 'serviceBonusSum' }, { id: 16, - text: `${'复购专区'}(￥)`, + text: `${'复购专区'}`, checked: true, prop: 'mainRepurAmount', total: 'mainRepurAmountSum' }, { id: 18, - text: `${'复购金额'}(￥)`, + text: `${'复购金额'}`, checked: false, prop: 'repurchaseAllAmount', total: 'repurchaseAllAmountSum' }, { id: 19, - text: `${'复购级差收益'}(￥)`, + text: `${'复购级差收益'}`, checked: false, prop: 'repurRangeBonus', total: 'repurRangeBonusSum' }, { id: 20, - text: `${'复购拓展收益'}(￥)`, + text: `${'复购拓展收益'}`, checked: false, prop: 'repurOrgBonus', total: 'repurOrgBonusSum' }, { id: 'repurLeaderBonus', - text: `${'复购辅导收益'}(￥)`, + text: `${'复购辅导收益'}`, checked: false, prop: 'repurLeaderBonus', total: 'repurLeaderBonusSum' }, + { + id: 20, + text: `${'复购见点收益'}`, + checked: false, + prop: 'globalPointsBonus', + total: 'globalPointsBonusSum' + }, + { + id: 20, + text: `${'复购区域收益'}`, + checked: false, + prop: 'storeIncomeBonus', + total: 'storeIncomeBonusSum' + }, { id: 21, - text: `${'首购拨出金额'}(￥)`, + text: `${'首购拨出金额'}`, checked: false, prop: 'mainBonus', total: 'mainBonusSum' @@ -322,7 +336,7 @@ export default { }, { id: 23, - text: `${'复购拨出金额'}(￥)`, + text: `${'复购拨出金额'}`, checked: false, prop: 'repurBonus', total: 'repurBonusSum' @@ -336,7 +350,7 @@ export default { }, { id: 25, - text: `${'总拨出金额'}(￥)`, + text: `${'总拨出金额'}`, checked: false, prop: 'totalBonus', total: 'totalBonusSum' diff --git a/src/views/settlementCenter/topPerformanceTotal/index.vue b/src/views/settlementCenter/topPerformanceTotal/index.vue index c967387..25db43f 100644 --- a/src/views/settlementCenter/topPerformanceTotal/index.vue +++ b/src/views/settlementCenter/topPerformanceTotal/index.vue @@ -299,6 +299,16 @@ export default { text: '复购辅导拨比(%)', prop: 'repurLeaderBonusRate' }, + { + + text: `${'复购见点收益'}`, + prop: 'globalPointsBonus' + }, + { + + text: `${'复购区域收益'}`, + prop: 'storeIncomeBonus' + }, { text: `拓展平均碰次`, prop: 'orgAvTouch'