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

This commit is contained in:
woody 2025-10-11 17:57:07 +08:00
commit ed7f406c8a
2 changed files with 176 additions and 231 deletions

View File

@ -732,25 +732,25 @@ export const constantRoutes = [
meta: { title: '顶点奖金拨比汇总' }, meta: { title: '顶点奖金拨比汇总' },
hidden: true hidden: true
}, },
{ // {
path: 'topPerformancepv', // path: 'topPerformancepv',
name: 'TopPerformancepv', // name: 'TopPerformancepv',
component: () => import('@/views/settlementCenter/topPerformancepv/index'), // component: () => import('@/views/settlementCenter/topPerformancepv/index'),
meta: { title: '顶点奖金拨比业绩统计' }, // meta: { title: '顶点奖金拨比业绩统计' },
hidden: true // hidden: true
}, // },
{ // {
path: 'lenTopPerformance', // path: 'lenTopPerformance',
name: 'LenTopPerformance', // name: 'LenTopPerformance',
component: () => import('@/views/settlementCenter/lenTopPerformance/index'), // component: () => import('@/views/settlementCenter/lenTopPerformance/index'),
meta: { title: '乐享顶点奖金拨比列表' } // meta: { title: '乐享顶点奖金拨比列表' }
}, // },
{ // {
path: 'personalAllocation', // path: 'personalAllocation',
name: 'PersonalAllocation', // name: 'PersonalAllocation',
component: () => import('@/views/settlementCenter/performanceRatio/personalAllocation'), // component: () => import('@/views/settlementCenter/performanceRatio/personalAllocation'),
meta: { title: '个人伞下拨比查询' } // meta: { title: '个人伞下拨比查询' }
}, // },
{ {
path: 'sourceBonus', path: 'sourceBonus',
name: 'sourceBonus', name: 'sourceBonus',

View File

@ -210,26 +210,6 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
typeList: [
{
value: 0,
label: '前台'
},
{
value: 1,
label: '后台'
}
],
digList: [
{
value: 0,
label: '允许'
},
{
value: 1,
label: '禁止'
}
],
menuList: [ menuList: [
{ {
id: 0, id: 0,
@ -254,69 +234,147 @@ export default {
checked: false, checked: false,
prop: 'creationTime' prop: 'creationTime'
}, },
// {
// id: 2,
// text: '',
// checked: true,
// prop: "teamName",
// },
// {
// id: 28,
// text: "PV(%)",
// checked: true,
// prop: "mainBonusPvRate",
// total: "mainBonusPvRateSum",
// },
// {
// id: 29,
// text: "PV(%)",
// checked: true,
// prop: "repurBonusPvRate",
// total: "repurBonusPvRateSum",
// },
{ {
id: 4, id: 4,
text: `${'注册专区'}`, text: `${'精品专区'}`,
checked: true, checked: true,
prop: 'mainRegAmount', prop: 'mainRegAmount',
total: 'mainRegAmountSum' total: 'mainRegAmount'
}, },
{ {
id: 5, id: 5,
text: `${'升级专区'}`, text: `${'商城专区'}`,
checked: true, checked: true,
prop: 'mainUpAmount', prop: 'mainRepurAmount',
total: 'mainUpAmountSum' total: 'mainRepurAmount'
}, },
// {
// id: 5,
// text: `${''}()`,
// checked: true,
// prop: "agentRegAmount",
// total: "agentRegAmountSum",
// },
// {
// id: 6,
// text: `${''}()`,
// checked: true,
// prop: "agentUpAmount",
// total: "agentUpAmountSum",
// },
{ {
id: 6, id: 6,
text: `${'首购金额'}(¥)`, text: `${'五折专区'}`,
checked: true, checked: true,
prop: 'firstPurchaseAll', prop: 'retailConsumeAmount',
total: 'firstPurchaseAllSum' total: 'retailConsumeAmount'
},
{
id: 7,
text: `${'合计金额'}`,
checked: false,
prop: 'totalAmount',
total: 'totalAmount'
},
{
id: 8,
text: `${'直推收益'}`,
checked: true,
prop: 'introduceBonus',
total: 'introduceBonus'
},
{
id: 9,
text: `${'直推收益拨比(%)'}`,
checked: true,
prop: 'introduceBonusRate',
total: 'introduceBonusRate'
},
{
id: 10,
text: `${'阶段收益'}`,
checked: true,
prop: 'storeIncome',
total: 'storeIncome'
},
{
id: 11,
text: `${'阶段收益拨比(%)'}`,
checked: true,
prop: 'storeIncomeRate',
total: 'storeIncomeRate'
},
{
id: 12,
text: `${'精品级差收益'}`,
checked: true,
prop: 'rangeIncome41',
total: 'rangeIncome41'
},
{
id: 13,
text: `${'精品级差收益拨比(%)'}`,
checked: true,
prop: 'rangeIncome41Rate',
total: 'rangeIncome41Rate'
},
{
id: 14,
text: `${'精品平级收益'}`,
checked: true,
prop: 'sameLevelIncome41',
total: 'sameLevelIncome41'
},
{
id: 15,
text: `${'精品平级收益拨比(%)'}`,
checked: true,
prop: 'sameLevelIncome41Rate',
total: 'sameLevelIncome41Rate'
},
{
id: 16,
text: `${'见点收益'}`,
checked: true,
prop: 'globalPoints',
total: 'globalPoints'
},
{
id: 17,
text: `${'见点收益拨比(%)'}`,
checked: true,
prop: 'globalPointsRate',
total: 'globalPointsRate'
},
{
id: 18,
text: `${'商城级差收益'}`,
checked: true,
prop: 'rangeIncome43',
total: 'rangeIncome43'
},
{
id: 19,
text: `${'商城级差收益拨比(%)'}`,
checked: true,
prop: 'rangeIncome43Rate',
total: 'rangeIncome43Rate'
},
{
id: 20,
text: `${'商城平级收益'}`,
checked: true,
prop: 'sameLevelIncome43',
total: 'sameLevelIncome43'
},
{
id: 21,
text: `${'商城平级收益拨比(%)'}`,
checked: true,
prop: 'sameLevelIncome43Rate',
total: 'sameLevelIncome43Rate'
},
{
id: 22,
text: `${'五折级差收益'}`,
checked: true,
prop: 'rangeIncome47',
total: 'rangeIncome47'
},
{
id: 23,
text: `${'五折级差收益拨比(%)'}`,
checked: true,
prop: 'rangeIncome47Rate',
total: 'rangeIncome47Rate'
}, },
// {
// id: 8,
// text: `${''}()`,
// checked: true,
// prop: "introduceBonus",
// total: "introduceBonusSum",
// },
// { // {
// id: 9, // id: 9,
// text: `${''}()`, // text: `${''}()`,
@ -387,41 +445,34 @@ export default {
// checked: false, // checked: false,
// prop: 'agentRepurAmount', // prop: 'agentRepurAmount',
// }, // },
{ // {
id: 7, // id: 7,
text: `${'复购金额'}(¥)`, // text: `${''}()`,
checked: false, // checked: false,
prop: 'mainRepurAmount', // prop: 'mainRepurAmount',
total: 'mainRepurAmountSum' // total: 'mainRepurAmountSum'
}, // },
{ // {
id: 8, // id: 8,
text: `${this.$t('重消金额')}(¥)`, // text: `${this.$t('')}()`,
checked: false, // checked: false,
prop: 'retailConsumeAmount', // prop: 'retailConsumeAmount',
total: 'retailConsumeAmountSum' // total: 'retailConsumeAmountSum'
}, // },
{ // {
id: 9, // id: 10,
text: `${this.$t('合计金额')}(¥)`, // text: `${this.$t('')}()`,
checked: false, // checked: false,
prop: 'totalAmount', // prop: 'retailRangeIncome',
total: 'totalAmountSum' // total: 'retailRangeIncomeSum'
}, // },
{ // {
id: 10, // id: 11,
text: `${this.$t('极差收益')}(¥)`, // text: '(%)',
checked: false, // checked: false,
prop: 'retailRangeIncome', // prop: 'retailRangeIncomeRate',
total: 'retailRangeIncomeSum' // total: 'retailRangeIncomeRateSum'
}, // },
{
id: 11,
text: '极差收益拨比(%)',
checked: false,
prop: 'retailRangeIncomeRate',
total: 'retailRangeIncomeRateSum'
},
// { // {
// id: 12, // id: 12,
// text: `${this.$t("")}()`, // text: `${this.$t("")}()`,
@ -429,105 +480,6 @@ export default {
// prop: "retailSameLevelIncome", // prop: "retailSameLevelIncome",
// total: "retailSameLevelIncomeSum", // total: "retailSameLevelIncomeSum",
// }, // },
{
id: 12,
text: `${this.$t('平级收益V1-V4')}(¥)`,
checked: false,
prop: 'retailSameLevelIncomeV1V4',
total: 'retailSameLevelIncomeV1V4Sum'
},
{
id: 13,
text: `${this.$t('平级收益V1-V4拨比')}(%)`,
checked: false,
prop: 'retailSameLevelIncomeV1V4Rate',
total: 'sameLevelIncomeV1V4RateSum'
},
{
id: 14,
text: `${this.$t('平级收益V5')}(¥)`,
checked: false,
prop: 'retailSameLevelIncomeV5',
total: 'retailSameLevelIncomeV5Sum'
},
{
id: 15,
text: `${this.$t('平级收益V5拨比')}(%)`,
checked: false,
prop: 'retailSameLevelIncomeV5Rate',
total: 'sameLevelIncomeV5RateSum'
},
{
id: 16,
text: `${this.$t('区域收益')}(¥)`,
checked: false,
prop: 'retailAreaIncome',
total: 'retailAreaIncomeSum'
},
{
id: 17,
text: `${this.$t('区域收益拨比')}(%)`,
checked: false,
prop: 'retailAreaIncomeRate',
total: 'retailAreaIncomeRateSum'
},
{
id: 18,
text: `${this.$t('福利平均收益')}(¥)`,
checked: false,
prop: 'retailBenefitAvgIncome',
total: 'retailBenefitAvgIncomeSum'
},
{
id: 19,
text: `${this.$t('福利平均收益拨比')}(%)`,
checked: false,
prop: 'retailBenefitAvgIncomeRate',
total: 'retailBenefitAvgIncomeRateSum'
},
{
id: 20,
text: `${this.$t('福利加权收益')}(¥)`,
checked: false,
prop: 'retailBenefitIncome',
total: 'retailBenefitIncomeSum'
},
{
id: 21,
text: `${this.$t('福利加权收益拨比')}(%)`,
checked: false,
prop: 'retailBenefitIncomeRate',
total: 'retailBenefitIncomeRateSum'
},
{
id: 22,
text: `${this.$t('福利极差收益')}(¥)`,
checked: false,
prop: 'retailBenefitRangeIncome',
total: 'retailBenefitRangeIncomeSum'
},
{
id: 23,
text: `${this.$t('福利极差收益拨比')}(%)`,
checked: false,
prop: 'retailBenefitRangeIncomeRate',
total: 'benefitRangeIncomeRateSum'
},
{
id: 24,
text: `${this.$t('商城重消')}(¥)`,
checked: false,
prop: 'backPoints',
total: 'backPointsSum'
},
{
id: 25,
text: `${this.$t('商城重消拨比')}(%)`,
checked: false,
prop: 'backPointsRate',
total: 'backPointsRateSum'
},
// { // {
// id: 19, // id: 19,
// text: `${''}()`, // text: `${''}()`,
@ -575,22 +527,15 @@ export default {
text: `${'总拨出金额'}(¥)`, text: `${'总拨出金额'}(¥)`,
checked: false, checked: false,
prop: 'totalBonus', prop: 'totalBonus',
total: 'totalBonusSum' total: 'totalBonus'
}, },
{ {
id: 27, id: 27,
text: '总拨出比例' + '(%)', text: '总拨出比例' + '(%)',
checked: false, checked: false,
prop: 'totalBonusRate', prop: 'totalBonusRate',
total: 'totalBonusRateSum' total: 'totalBonusRate'
} }
// {
// id: 28,
// text: '',
// checked: false,
// prop: 'endDate',
// },
], ],
creationTime: [], creationTime: [],
creationTime1: [], creationTime1: [],