feat(marketDynamics): 市场动态模块样式风格调整,移除奖金来源

This commit is contained in:
woody 2025-04-30 10:06:36 +08:00
parent f0e29d3909
commit 6913479b40
13 changed files with 786 additions and 861 deletions

View File

@ -281,12 +281,6 @@ export default {
path: "/marketDynamics",
name: "incomeDetail",
},
{
text: "奖金来源",
id: 3,
path: "/marketDynamics",
name: "bonusSource",
},
{
text: "考核明细",
id: 4,

View File

@ -47,8 +47,8 @@
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button class="btn2" @click="research">{{ "搜索" }}</el-button>
<el-button class="btn1" @click="chongzhi">{{ "重置" }}</el-button>
<el-button type="primary" @click="research">搜索</el-button>
<el-button @click="resetHandle">重置</el-button>
</div>
</el-col>
</el-row>
@ -178,54 +178,6 @@ export default {
return {
navIndex: 1,
changeTypeList: [],
navList: [
{ name: "直推列表", path: "/pushList?id=6" },
{ name: "三单循环", path: "/investment?id=6" },
{ name: "免费注册", path: "/fansList?id=6" },
],
marketList: [
{
text: "月度业绩",
id: 0,
path: "/marketDynamics",
},
{
text: "活动专区",
id: 7,
path: "/activeZone",
},
{
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
// {
// text: "",
// id: 2,
// path: "/",
// },
{
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: "招商列表",
id: 6,
path: "/investment",
},
],
specialArea: 0,
thetime: "",
tableData: [],
@ -269,7 +221,7 @@ export default {
path: href,
});
},
chongzhi() {
resetHandle() {
this.queryParams = {
pageNum: 1,
pageSize: 50,
@ -380,7 +332,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -394,16 +346,6 @@ export default {
display: flex;
align-items: center;
margin-left: 25px;
.btn1 {
background: #cccccc;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
}
.btn2 {
border-radius: 5px 5px 5px 5px;
background: rgba(214, 24, 32, 1);
color: #ffffff;
}
}
}
.tablebox {

View File

@ -3,8 +3,10 @@
<div class="rightbox" style="width: 100%">
<div class="mianbao" v-if="returnPath">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: returnPath }">{{'返回'}}</el-breadcrumb-item>
<el-breadcrumb-item>{{'奖金来源'}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: returnPath }">{{
"返回"
}}</el-breadcrumb-item>
<el-breadcrumb-item>{{ "奖金来源" }}</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="topbox">
@ -22,7 +24,10 @@
</el-col>
<el-col :span="6">
<el-form-item :label="'收益类型'" prop="pkBonusItems">
<el-select v-model="queryParams.pkBonusItems" :placeholder="'请选择'">
<el-select
v-model="queryParams.pkBonusItems"
:placeholder="'请选择'"
>
<el-option
v-for="(item, index) in incomeType"
:key="index"
@ -35,7 +40,11 @@
</el-row>
<el-row>
<el-col :span="7" v-if="userInfo.pkCountry != 1">
<el-form-item :label="'查询时间'" prop="teamCode" label-width="80px">
<el-form-item
:label="'查询时间'"
prop="teamCode"
label-width="80px"
>
<el-date-picker
@change="getChange"
v-model="thetime"
@ -49,9 +58,16 @@
</el-form-item>
</el-col>
<el-col :span="4">
<div class="searchbox" :style="userInfo.pkCountry==1?'margin-left:10px':''">
<el-button class="btn2" @click="research" >{{ '搜索' }}</el-button>
<el-button class="btn1" @click="resetAll()">{{ '重置' }}</el-button>
<div
class="searchbox"
:style="userInfo.pkCountry == 1 ? 'margin-left:10px' : ''"
>
<el-button type="primary" @click="research">{{
"搜索"
}}</el-button>
<el-button class="btn1" @click="resetAll()">{{
"重置"
}}</el-button>
</div>
</el-col>
</el-row>
@ -87,10 +103,7 @@
{{ scope.row.orderAmount | numFilter }}
</template>
</el-table-column>
<el-table-column
align="center"
:label="'订单业绩'+'(PV)'"
>
<el-table-column align="center" :label="'订单业绩' + '(PV)'">
<template slot-scope="scope">
{{ scope.row.orderAchieve | numFilter }}
</template>
@ -111,15 +124,11 @@
prop="second"
:label="'次数'"
></el-table-column>
<el-table-column
align="center"
:label="'预估收益'"
>
<el-table-column align="center" :label="'预估收益'">
<template slot-scope="scope">
{{ scope.row.realIncome | numFilter }}
</template>
</el-table-column>
</el-table>
<pagination
:total="total"
@ -150,28 +159,28 @@ export default {
pagination,
},
computed: {
...mapGetters(['userInfo']),
...mapGetters(["userInfo"]),
},
data() {
return {
marketList: [
{
text: '月度业绩',
text: "月度业绩",
id: 0,
path: "/marketDynamics",
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: '/activeZone',
path: "/activeZone",
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: '奖金来源',
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
@ -182,17 +191,17 @@ export default {
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/investment",
},
@ -200,7 +209,7 @@ export default {
specialArea: 0,
thetime: "",
tableData: [],
returnPath:'',
returnPath: "",
total: 0,
pageNum: 1,
pageSize: 50,
@ -220,67 +229,71 @@ export default {
},
},
created() {
this.getBdBonusitemsList()
this.getBdBonusitemsList();
},
mounted() {
this.specialArea = this.$route.query.id;
let allData = decodeURIComponent(window.location.href).split('=')
let allData = decodeURIComponent(window.location.href).split("=");
if (allData[2] != undefined) {
this.returnPath = '/marketDynamics?id=1&index='+allData[1].split('&')[0]
this.returnPath =
"/marketDynamics?id=1&index=" + allData[1].split("&")[0];
}
setTimeout(() => {
this.research();
},100)
}, 100);
},
filters: {
numFilter(value) {
//
let realVal = parseFloat(value).toFixed(2)
return realVal
}
let realVal = parseFloat(value).toFixed(2);
return realVal;
},
},
methods: {
isLocalSymbol,
getChange(value) {
if (value) {
this.queryParams.startDate = value[0]
this.queryParams.endDate = value[0]
this.queryParams.startDate = value[0];
this.queryParams.endDate = value[0];
}
},
resetAll() {
this.pageNum = 1
this.pageSize = 50
this.pageNum = 1;
this.pageSize = 50;
this.queryParams = {
pkBonusItems: "",
sourceMemberName: "",
sourceMemberCode: "",
startDate: "",
endDate: "",
}
this.thetime =''
this.research()
};
this.thetime = "";
this.research();
},
changeArea(item) {
this.specialArea = item.id;
this.$router.push({
path: item.path,
query: { id: item.id },
})
});
},
getBdBonusitemsList() {
getBdBonusitemsList().then(res=>{
this.incomeType = res.rows
})
getBdBonusitemsList().then((res) => {
this.incomeType = res.rows;
});
},
research() {
if (this.thetime) {
this.queryParams.startDate = this.thetime[0];
this.queryParams.endDate = this.thetime[1];
} else {
this.queryParams.startDate = '';
this.queryParams.endDate = '';
this.queryParams.startDate = "";
this.queryParams.endDate = "";
}
getBonusDetail(this.queryParams,`?pageNum=${this.pageNum}&pageSize=${this.pageSize}`).then((res) => {
getBonusDetail(
this.queryParams,
`?pageNum=${this.pageNum}&pageSize=${this.pageSize}`
).then((res) => {
this.tableData = res.rows;
this.total = res.total;
});
@ -336,7 +349,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -350,16 +363,11 @@ export default {
display: flex;
align-items: center;
margin-left: 30px;
.btn1 {
background: #cccccc;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
}
.btn2 {
border-radius: 5px 5px 5px 5px;
background: rgba(214, 24, 32, 1);
color: #ffffff;
}
// .btn1 {
// background: #cccccc;
// border-radius: 5px 5px 5px 5px;
// color: #ffffff;
// }
}
}
.tablebox {

View File

@ -131,7 +131,6 @@
<!-- />-->
</div>
</div>
</template>
<script>
@ -163,29 +162,29 @@ export default {
markerSpace,
topBanner,
pagination,
bonusTotal
bonusTotal,
},
data() {
return {
navIndex: 0,
marketList: [
{
text: '月度业绩',
text: "月度业绩",
id: 0,
path: "/marketDynamics",
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: '/activeZone',
path: "/activeZone",
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: '奖金来源',
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
@ -196,17 +195,17 @@ export default {
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/investment",
},
@ -215,7 +214,7 @@ export default {
thetime: "",
tableData: [],
total: 0,
money:0.00,
money: 0.0,
queryParams: {
pageNum: 1,
pageSize: 50,
@ -223,14 +222,19 @@ export default {
endDate: "",
},
navList: [
{ name: '首购收益',path:0,value:"firstPurchase",menuKey:'' },
{ name: "首购收益", path: 0, value: "firstPurchase", menuKey: "" },
// { name: '',path:1 ,value:"repurchaseEarnings",menuKey:''},
{ name: '海粉收益',path:2,value:"hignFans",menuKey:''},
{ name: "海粉收益", path: 2, value: "hignFans", menuKey: "" },
// { name: this.$t('ENU_MENU_534'),path:3,value:"seaFans",menuKey:''},
// { name: '',path:3,value:"sbyd",menuKey:''},
{ name: '复购券收益',path:4,value:"repurchaseTicket",menuKey:''},
{ name: '创客空间收益',path:5,value:"markerSpaceEarnings",menuKey:''},
{ name: '实时收益',path:6,value:"bonusTotal",menuKey:''},
{ name: "复购券收益", path: 4, value: "repurchaseTicket", menuKey: "" },
{
name: "创客空间收益",
path: 5,
value: "markerSpaceEarnings",
menuKey: "",
},
{ name: "实时收益", path: 6, value: "bonusTotal", menuKey: "" },
],
};
},
@ -242,7 +246,7 @@ export default {
created() {},
mounted() {
this.specialArea = this.$route.query.id;
this.getMenuLists()
this.getMenuLists();
// this.research();
// let allData = decodeURIComponent(window.location.href).split('=')
// this.navIndex =allData[2].split('&')[0]
@ -253,14 +257,14 @@ export default {
res.data.forEach((item) => {
this.navList.forEach((items) => {
if (item.menuKey == items.value) {
items.menuKey = item.menuKey
items.menuKey = item.menuKey;
}
})
})
})
});
});
});
},
clickHref(index) {
this.navIndex = index
this.navIndex = index;
},
dateHref(item) {
this.$router.push({
@ -271,7 +275,7 @@ export default {
goSource() {
this.$router.push({
path: "/bonusSource",
query: { id: 3, },
query: { id: 3 },
});
},
changeArea(item) {
@ -368,7 +372,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -383,7 +387,7 @@ export default {
align-items: center;
margin-left: 40px;
.btn1 {
border: 1px solid #CCCCCC;
border: 1px solid #cccccc;
border-radius: 5px 5px 5px 5px;
color: #666;
height: 34px;

View File

@ -49,28 +49,28 @@ export default {
return {
navIndex: 0,
navList: [
{ name: '直推列表',path:"0",menuKey:'' },
{ name: '三单循环',path:"0",menuKey:''},
{ name: '免费注册' ,path:"0",menuKey:'' },
{ name: "直推列表", path: "0", menuKey: "" },
{ name: "三单循环", path: "0", menuKey: "" },
{ name: "免费注册", path: "0", menuKey: "" },
],
marketList: [
{
text: '月度业绩',
text: "月度业绩",
id: 0,
path: "/marketDynamics",
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: '/activeZone',
path: "/activeZone",
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: '奖金来源',
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
@ -81,17 +81,17 @@ export default {
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/investment",
},
@ -118,25 +118,25 @@ export default {
},
created() {},
mounted() {
this.getMenuLists()
this.getMenuLists();
// this.specialArea = this.$route.query.id;
// this.research();
// this.getchangeTypeList();
},
methods: {
getMenuLists() {
let list = JSON.parse(localStorage.getItem('menuList'))
let list = JSON.parse(localStorage.getItem("menuList"));
list.forEach((item) => {
if(item.menuKey == 'directList'){
this.navList[0].menuKey = 'directList'
if (item.menuKey == "directList") {
this.navList[0].menuKey = "directList";
}
if(item.menuKey == 'attractDetailList'){
this.navList[1].menuKey = 'attractDetailList'
if (item.menuKey == "attractDetailList") {
this.navList[1].menuKey = "attractDetailList";
}
if(item.menuKey == 'haiList'){
this.navList[2].menuKey = 'haiList'
if (item.menuKey == "haiList") {
this.navList[2].menuKey = "haiList";
}
})
});
},
getchangeTypeList() {
getchangeTypeList().then((res) => {
@ -144,7 +144,7 @@ export default {
});
},
clickHref(index) {
this.navIndex = index
this.navIndex = index;
},
chongzhi() {
this.queryParams = {
@ -155,7 +155,7 @@ export default {
memberCode: "",
memberName: "",
};
this.research()
this.research();
},
changeArea(item) {
this.specialArea = item.id;
@ -169,8 +169,8 @@ export default {
this.queryParams.startCreateTime = this.thetime[0];
this.queryParams.endCreateTime = this.thetime[1];
} else {
this.queryParams.startCreateTime = ''
this.queryParams.endCreateTime = ''
this.queryParams.startCreateTime = "";
this.queryParams.endCreateTime = "";
}
parentList(this.queryParams).then((res) => {
this.tableData = res.rows;
@ -206,7 +206,7 @@ export default {
cursor: pointer;
}
.actMenu {
border-bottom: 5px solid #00417C;
border-bottom: 5px solid #00417c;
}
}
::v-deep .el-range-editor.el-input__inner {
@ -270,7 +270,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -285,7 +285,7 @@ export default {
align-items: center;
margin-left: 40px;
.btn1 {
border: 1px solid #CCCCCC;
border: 1px solid #cccccc;
border-radius: 5px 5px 5px 5px;
color: #666;
height: 34px;

View File

@ -72,7 +72,7 @@
<div class="flex-s">
<div class="content-div2">
<div class="title">
<div>{{ '最末节点' }}</div>
<div>{{ "最末节点" }}</div>
</div>
<div style="position: absolute">
<placement />
@ -97,8 +97,8 @@
<!-- 首购新增业绩 1个月!-->
<div class="content-div3">
<div class="title">
<div>{{ '新增业绩' }}</div>
<div>{{ '近30日' }}</div>
<div>{{ "新增业绩" }}</div>
<div>{{ "近30日" }}</div>
</div>
<div style="position: absolute">
<fistAddPv ref="fistAddPv" />
@ -107,14 +107,12 @@
<!-- 首购业绩分布!-->
<div class="content-div3">
<div class="title">
<div>{{ '业绩分布' }}</div>
<div>{{ "业绩分布" }}</div>
</div>
<div style="position: absolute">
<firstPv ref="firstPv"></firstPv>
</div>
</div>
</div>
<!-- 复购新增业绩!-->
<!-- 复购业绩分布!-->
@ -190,7 +188,7 @@
<!-- 月度新增业绩对比!-->
<div class="content-div3">
<div class="title">
<div>{{ '月度新增业绩对比' }}</div>
<div>{{ "月度新增业绩对比" }}</div>
<div>
<el-select v-model="whatMounth" :placeholder="'请选择'">
<el-option
@ -206,12 +204,11 @@
<div style="position: absolute">
<mounthPvCompare ref="mounthPvCompare" :time="whatMounth" />
</div>
</div>
<!-- 活跃会员对比!-->
<div class="content-div3">
<div class="title">
<div>{{ '活跃会员对比' }}</div>
<div>{{ "活跃会员对比" }}</div>
<div>
<el-select v-model="dateType" :placeholder="'请选择'">
<el-option
@ -265,7 +262,7 @@
>
<!-- 直推业绩!-->
<div class="title" style="width: auto; padding: 20px 20px 0px 20px">
<div>{{ '直推业绩' }}</div>
<div>{{ "直推业绩" }}</div>
<div class="right-flex-s">
<!-- <el-date-picker v-model="thetime"-->
<!-- :picker-options="pickerBeginOption"-->
@ -326,7 +323,7 @@
border-radius: 10px 10px 0 0;
"
>
{{ '推荐列表' }}
{{ "推荐列表" }}
</div>
<div>
<div class="tablebox">
@ -491,36 +488,36 @@ export default {
disabledDate: "",
navList: [
{
name: '月度业绩',
name: "月度业绩",
menuKey: "",
value: "ConsanguinityCheck",
},
// { name: '', menuKey: "", value: "placementChart" },
// { name: '', menuKey: "", value: "monthlyChart" },
{ name: '数据查询', menuKey: "", value: "monthlyPerformance" },
{ name: "数据查询", menuKey: "", value: "monthlyPerformance" },
// { name: '', menuKey: "", value: "recommendTime" },
{ name: '直推业绩', menuKey: "", value: "recommendPerformance" },
{ name: '推荐列表', menuKey: "", value: "recommendList" },
{ name: "直推业绩", menuKey: "", value: "recommendPerformance" },
{ name: "推荐列表", menuKey: "", value: "recommendList" },
],
marketList: [
{
text: '数据查询',
text: "数据查询",
id: 0,
path: "/marketDynamics",
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: "/activeZone",
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: '奖金来源',
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
@ -530,17 +527,17 @@ export default {
// path: "/generation",
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/investment",
},
@ -561,51 +558,51 @@ export default {
mounthList: [
{
value: 1,
label: 1 + '月',
label: 1 + "月",
},
{
value: 2,
label: 2 + '月',
label: 2 + "月",
},
{
value: 3,
label: 3 + '月',
label: 3 + "月",
},
{
value: 4,
label: 4 + '月',
label: 4 + "月",
},
{
value: 5,
label: 5 + '月',
label: 5 + "月",
},
{
value: 6,
label: 6 + '月',
label: 6 + "月",
},
{
value: 7,
label: 7 + '月',
label: 7 + "月",
},
{
value: 8,
label: 8 + '月',
label: 8 + "月",
},
{
value: 9,
label: 9 + '月',
label: 9 + "月",
},
{
value: 10,
label: 10 + '月',
label: 10 + "月",
},
{
value: 11,
label: 11 + '月',
label: 11 + "月",
},
{
value: 12,
label: 12 + '月',
label: 12 + "月",
},
],
fgkhDate: "",
@ -616,9 +613,12 @@ export default {
themonth: null,
pickerOptions: {
disabledDate(time) {
return time.getFullYear() < new Date().getFullYear() - 1 || time.getFullYear() > new Date().getFullYear();
}
}
return (
time.getFullYear() < new Date().getFullYear() - 1 ||
time.getFullYear() > new Date().getFullYear()
);
},
},
};
},
watch: {
@ -788,7 +788,6 @@ export default {
return days;
},
navTap(index) {
console.log("dianji", index);
this.navIndex = index;
if (index == 1) {
this.getDayType();
@ -1058,7 +1057,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {

View File

@ -6,17 +6,18 @@
<el-row>
<el-col :span="5">
<el-form-item :label="'会员编号'" prop="memberCode">
<el-input v-model="queryParams.memberCode"></el-input>
<el-input clearable v-model="queryParams.memberCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="'会员姓名'" prop="memberName">
<el-input v-model="queryParams.memberName"></el-input>
<el-input clearable v-model="queryParams.memberName"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="'注册等级'" prop="pkRegisterGrade">
<el-select
clearable
v-model="queryParams.pkRegisterGrade"
:placeholder="'请选择'"
>
@ -47,12 +48,10 @@
<el-row>
<el-col :span="4">
<div class="searchbox">
<el-button class="btn2" @click="research">{{
'搜索'
}}</el-button>
<el-button class="btn1" @click="chongzhi">{{
'重置'
<el-button type="primary" @click="research">{{
"搜索"
}}</el-button>
<el-button @click="chongzhi">{{ "重置" }}</el-button>
</div>
</el-col>
</el-row>
@ -171,22 +170,22 @@ export default {
return {
marketList: [
{
text: '月度业绩',
text: "月度业绩",
id: 0,
path: "/marketDynamics",
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: "/activeZone",
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: '奖金来源',
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
@ -197,17 +196,17 @@ export default {
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/investment",
},
@ -323,7 +322,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -336,16 +335,6 @@ export default {
.searchbox {
display: flex;
align-items: center;
.btn1 {
background: #cccccc;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
}
.btn2 {
border-radius: 5px 5px 5px 5px;
background: rgba(214, 24, 32, 1);
color: #ffffff;
}
}
}
.tablebox {

View File

@ -41,12 +41,8 @@
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button class="btn2" @click="research">{{
"搜索"
}}</el-button>
<el-button class="btn1" @click="chongzhi">{{
"重置"
}}</el-button>
<el-button type="primary" @click="research">搜索</el-button>
<el-button @click="resetHandle">重置</el-button>
</div>
</el-col>
</el-row>
@ -193,7 +189,7 @@ export default {
path: href,
});
},
chongzhi() {
resetHandle() {
this.queryParams = {
pageNum: 1,
pageSize: 50,
@ -307,7 +303,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -321,16 +317,6 @@ export default {
display: flex;
align-items: center;
margin-left: 40px;
.btn1 {
background: #cccccc;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
}
.btn2 {
border-radius: 5px 5px 5px 5px;
background: rgba(214, 24, 32, 1);
color: #ffffff;
}
}
}
.tablebox {

View File

@ -178,14 +178,14 @@ const routes = [
},
},
//奖金来源
{
path: "/bonusSource",
name: "BonusSource",
component: () => import("@/views/marketDynamics/bonusSource.vue"),
meta: {
keepAlive: true,
},
},
// {
// path: "/bonusSource",
// name: "BonusSource",
// component: () => import("@/views/marketDynamics/bonusSource.vue"),
// meta: {
// keepAlive: true,
// },
// },
//考核明细
{
path: "/appraisal",

View File

@ -2,7 +2,8 @@
--primary-color: #005BAC; /* 主题色 */
--highlight-color: #1E90FF; /* 替换 #b42b2a 的高亮/强调色 */
--price-color: #FF8C00; /* 商品价格颜色 */
--button-hover-color: #1A75C8; /* 按钮悬停颜色 */
--disabled-color: #B8CDE0; /* 禁用状态颜色 (基于主题色) */
--button-hover-color: #1A75C8; /* 按钮悬停背景颜色 */
--button-hover-text-color: #FFFFFF; /* 按钮悬停文字颜色 */
--button-active-border-color: #004C8C; /* 按钮激活边框颜色 */
}

View File

@ -6,26 +6,31 @@
<navBar :myId="2"></navBar>
<div class="mianbao" v-if="returnPath">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: returnPath }">{{'返回'}}</el-breadcrumb-item>
<el-breadcrumb-item>{{'奖金来源'}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: returnPath }"
>返回</el-breadcrumb-item
>
<el-breadcrumb-item>奖金来源</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="topbox">
<div class="topbox333">
<el-form ref="form" :model="queryParams" label-width="80px">
<el-row>
<el-col :span="6">
<el-form-item :label="'来源编号'" prop="sourceMemberCode">
<el-form-item label="来源编号" prop="sourceMemberCode">
<el-input v-model="queryParams.sourceMemberCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'来源姓名'" prop="sourceMemberName">
<el-form-item label="来源姓名" prop="sourceMemberName">
<el-input v-model="queryParams.sourceMemberName"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'收益类型'" prop="pkBonusItems">
<el-select v-model="queryParams.pkBonusItems" :placeholder="'请选择'">
<el-form-item label="收益类型" prop="pkBonusItems">
<el-select
v-model="queryParams.pkBonusItems"
placeholder="请选择"
>
<el-option
v-for="(item, index) in incomeType"
:key="index"
@ -38,22 +43,25 @@
</el-row>
<el-row>
<el-col :span="7" v-if="userInfo.pkCountry != 1">
<el-form-item :label="'查询时间'" prop="teamCode" label-width="80px">
<el-form-item label="查询时间" prop="teamCode" label-width="80px">
<el-date-picker
v-model="thetime"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="searchbox" :style="userInfo.pkCountry==1?'margin-left:20px':''">
<el-button class="btn2" @click="research" >{{ '搜索' }}</el-button>
<el-button class="btn1" @click="resetAll()">{{ '重置' }}</el-button>
<div
class="searchbox"
:style="userInfo.pkCountry == 1 ? 'margin-left:20px' : ''"
>
<el-button class="search-btn" @click="research">搜索</el-button>
<el-button class="btn1" @click="resetAll()">重置</el-button>
</div>
</el-col>
</el-row>
@ -69,22 +77,22 @@
<el-table-column
align="center"
prop="settleDate"
:label="'奖金日期'"
label="奖金日期"
></el-table-column>
<el-table-column
align="center"
prop="sourceMemberCode"
:label="'来源编号'"
label="来源编号"
></el-table-column>
<el-table-column
align="center"
prop="sourceMemberName"
:label="'来源姓名'"
label="来源姓名"
></el-table-column>
<el-table-column
align="center"
prop="orderAmount"
:label="'订单金额'+'(¥)'"
label="订单金额(¥)"
></el-table-column>
<el-table-column
align="center"
@ -94,25 +102,24 @@
<el-table-column
align="center"
prop="bonusName"
:label="'收益类型'"
label="收益类型"
width="200"
></el-table-column>
<el-table-column
align="center"
prop="round"
:label="'轮次'"
label="轮次"
></el-table-column>
<el-table-column
align="center"
prop="second"
:label="'次数'"
label="次数"
></el-table-column>
<el-table-column
align="center"
prop="realIncome"
:label="'预估收益'"
label="预估收益"
></el-table-column>
</el-table>
<pagination
:total="total"
@ -142,28 +149,28 @@ export default {
pagination,
},
computed: {
...mapGetters(['userInfo']),
...mapGetters(["userInfo"]),
},
data() {
return {
marketList: [
{
text: '月度业绩',
text: "月度业绩",
id: 0,
path: "/marketDynamics",
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: '/activeZone',
path: "/activeZone",
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/incomeDetail",
},
{
text: '奖金来源',
text: "奖金来源",
id: 3,
path: "/bonusSource",
},
@ -174,17 +181,17 @@ export default {
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/appraisal",
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/registration",
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/investment",
},
@ -192,7 +199,7 @@ export default {
specialArea: 0,
thetime: "",
tableData: [],
returnPath:'',
returnPath: "",
total: 0,
queryParams: {
pageNum: 1,
@ -212,19 +219,19 @@ export default {
},
},
created() {
this.getBdBonusitemsList()
this.getBdBonusitemsList();
},
mounted() {
this.specialArea = this.$route.query.id;
let allData = decodeURIComponent(window.location.href).split('=')
let allData = decodeURIComponent(window.location.href).split("=");
if (allData[2] != undefined) {
this.queryParams.startDate =allData[2].split('&')[0]
this.queryParams.endDate =allData[2].split('&')[0]
this.returnPath = '/incomeDetail?id=1&index='+allData[3].split('&')[0]
this.queryParams.startDate = allData[2].split("&")[0];
this.queryParams.endDate = allData[2].split("&")[0];
this.returnPath = "/incomeDetail?id=1&index=" + allData[3].split("&")[0];
}
setTimeout(() => {
this.research();
},100)
}, 100);
},
methods: {
resetAll() {
@ -236,20 +243,20 @@ export default {
sourceMemberCode: "",
startDate: "",
endDate: "",
}
this.research()
};
this.research();
},
changeArea(item) {
this.specialArea = item.id;
this.$router.push({
path: item.path,
query: { id: item.id },
})
});
},
getBdBonusitemsList() {
getBdBonusitemsList().then(res=>{
this.incomeType = res.rows
})
getBdBonusitemsList().then((res) => {
this.incomeType = res.rows;
});
},
research() {
if (this.thetime) {
@ -312,7 +319,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {
@ -331,9 +338,9 @@ export default {
border-radius: 5px 5px 5px 5px;
color: #ffffff;
}
.btn2 {
.search-btn {
border-radius: 5px 5px 5px 5px;
background: rgba(214, 24, 32, 1);
background: var(--primary-color);
color: #ffffff;
}
}

View File

@ -29,7 +29,7 @@
<marketDynamicss
@updateValue="updateParentValue"
:ifDetail="ifDetail"
:monthScoreType='monthScoreType'
:monthScoreType="monthScoreType"
v-if="this.specialArea == 0"
/>
</template>
@ -41,21 +41,21 @@
<!-- 奖金明细!-->
<incomeDetail v-if="this.specialArea == 1" />
</template>
<template>
<!-- 奖金来源!-->
<bonusSource v-if="this.specialArea == 3" />
</template>
<!-- <template v-if="this.specialArea == 3">
<bonusSource />
</template> -->
<template>
<!-- 考核明细!-->
<appraisal v-if="this.specialArea == 4" />
</template>
<template>
<template v-if="this.specialArea == 5">
<!-- 注册列表!-->
<registration v-if="this.specialArea == 5" />
<registration />
</template>
<template>
<template v-if="this.specialArea == 6">
<!-- 招商列表!-->
<investment v-if="this.specialArea == 6" />
<investment />
</template>
</div>
</div>
@ -63,31 +63,31 @@
<script>
import sidebarUserInfo from "@/views/index/components/sidebarUserInfo.vue";
import recommendTime from "@/components/recommendTime.vue";
import placement from "@/components/placement.vue";
import realPerformance from "@/components/realPerformance.vue";
import placementPerformance from "@/components/placementPerformance.vue";
import realPerformances from "@/components/realPerformances.vue";
import mounthPvCompare from "@/components/mounthPvCompare.vue";
import fistAddPv from "@/components/fistAddPv.vue";
import repAddPv from "@/components/repAddPv.vue";
// import recommendTime from "@/components/recommendTime.vue";
// import placement from "@/components/placement.vue";
// import realPerformance from "@/components/realPerformance.vue";
// import placementPerformance from "@/components/placementPerformance.vue";
// import realPerformances from "@/components/realPerformances.vue";
// import mounthPvCompare from "@/components/mounthPvCompare.vue";
// import fistAddPv from "@/components/fistAddPv.vue";
// import repAddPv from "@/components/repAddPv.vue";
import topBanner from "@/components/topBanner.vue";
import pagination from "@/components/pagination.vue";
import navBar from "@/components/navBar.vue";
import recommendedCommunity from "@/components/marketDynamics/recommendedCommunity.vue";
import activeMembers from "@/components/marketDynamics/activeMembers.vue";
import recommendPerformance from "@/components/recommendPerformance.vue";
import gradePerformance from "@/components/gradePerformance.vue";
import consanguinityPv from "@/components/marketDynamics/consanguinityPv.vue";
// import pagination from "@/components/pagination.vue";
// import navBar from "@/components/navBar.vue";
// import recommendedCommunity from "@/components/marketDynamics/recommendedCommunity.vue";
// import activeMembers from "@/components/marketDynamics/activeMembers.vue";
// import recommendPerformance from "@/components/recommendPerformance.vue";
// import gradePerformance from "@/components/gradePerformance.vue";
// import consanguinityPv from "@/components/marketDynamics/consanguinityPv.vue";
import marketDynamicss from "@/components/marketDynamics/marketDynamicss.vue";
import activeZone from "@/components/marketDynamics/activeZone.vue";
import incomeDetail from "@/components/marketDynamics/incomeDetail.vue";
import bonusSource from "@/components/marketDynamics/bonusSource.vue";
// import bonusSource from "@/components/marketDynamics/bonusSource.vue";
import appraisal from "@/components/marketDynamics/appraisal.vue";
import registration from "@/components/marketDynamics/registration.vue";
import investment from "@/components/marketDynamics/investment.vue";
import { getDayType } from "@/api/activity.js";
import { getWalletBalance, parentList } from "@/api/wallet";
import { parentList } from "@/api/wallet";
import * as api from "@/api/goods";
import noticePopup from "@/components/noticePopup.vue";
import { mapGetters } from "vuex";
@ -99,28 +99,28 @@ export default {
registration,
Registration,
appraisal,
bonusSource,
// bonusSource,
incomeDetail,
activeZone,
marketDynamicss,
noticePopup,
realPerformance,
placementPerformance,
realPerformances,
// realPerformance,
// placementPerformance,
// realPerformances,
sidebarUserInfo,
placement,
recommendTime,
mounthPvCompare,
fistAddPv,
repAddPv,
// placement,
// recommendTime,
// mounthPvCompare,
// fistAddPv,
// repAddPv,
topBanner,
pagination,
navBar,
recommendedCommunity,
activeMembers,
consanguinityPv,
recommendPerformance,
gradePerformance,
// pagination,
// navBar,
// recommendedCommunity,
// activeMembers,
// consanguinityPv,
// recommendPerformance,
// gradePerformance,
},
computed: {
...mapGetters(["userInfo"]),
@ -130,64 +130,60 @@ export default {
index: 50,
navIndex: 0,
navList: [
{ name: '数据查询', menuKey: "", value: "ConsanguinityCheck" },
{ name: '最末节点', menuKey: "", value: "placementChart" },
{ name: '月度新增统计', menuKey: "", value: "monthlyChart" },
{ name: '月度新增业绩', menuKey: "", value: "monthlyPerformance" },
{ name: '推荐平均用时', menuKey: "", value: "recommendTime" },
{ name: '直推业绩', menuKey: "", value: "recommendPerformance" },
{ name: '推荐列表', menuKey: "", value: "recommendList" },
{ name: "数据查询", menuKey: "", value: "ConsanguinityCheck" },
{ name: "最末节点", menuKey: "", value: "placementChart" },
{ name: "月度新增统计", menuKey: "", value: "monthlyChart" },
{ name: "月度新增业绩", menuKey: "", value: "monthlyPerformance" },
{ name: "推荐平均用时", menuKey: "", value: "recommendTime" },
{ name: "直推业绩", menuKey: "", value: "recommendPerformance" },
{ name: "推荐列表", menuKey: "", value: "recommendList" },
],
marketList: [
{
text: '数据查询',
text: "数据查询",
id: 0,
path: "/marketDynamics",
name: "marketDynamics",
isShow: false,
},
{
text: '活动专区',
text: "活动专区",
id: 7,
path: "/marketDynamics",
name: "activeZone",
isShow: false,
},
{
text: '奖金明细',
text: "奖金明细",
id: 1,
path: "/marketDynamics",
name: "incomeDetail",
isShow: false,
},
{
text: '奖金来源',
id: 3,
path: "/marketDynamics",
name: "bonusSource",
isShow: false,
},
// {
// text: "",
// text: "",
// id: 3,
// path: "/generation",
// path: "/marketDynamics",
// name: "bonusSource",
// isShow: false,
// },
{
text: '考核明细',
text: "考核明细",
id: 4,
path: "/marketDynamics",
name: "appraisal",
isShow: false,
},
{
text: '注册列表',
text: "注册列表",
id: 5,
path: "/marketDynamics",
name: "registration",
isShow: false,
},
{
text: '招商列表',
text: "招商列表",
id: 6,
path: "/marketDynamics",
name: "investment",
@ -210,63 +206,63 @@ export default {
mounthList: [
{
value: 1,
label: 1 + '月',
label: 1 + "月",
},
{
value: 2,
label: 2 + '月',
label: 2 + "月",
},
{
value: 3,
label: 3 + '月',
label: 3 + "月",
},
{
value: 4,
label: 4 + '月',
label: 4 + "月",
},
{
value: 5,
label: 5 + '月',
label: 5 + "月",
},
{
value: 6,
label: 6 + '月',
label: 6 + "月",
},
{
value: 7,
label: 7 + '月',
label: 7 + "月",
},
{
value: 8,
label: 8 + '月',
label: 8 + "月",
},
{
value: 9,
label: 9 + '月',
label: 9 + "月",
},
{
value: 10,
label: 10 + '月',
label: 10 + "月",
},
{
value: 11,
label: 11 + '月',
label: 11 + "月",
},
{
value: 12,
label: 12 + '月',
label: 12 + "月",
},
],
fgkhDate: "",
ifDetail: "0",
monthScoreType:""
monthScoreType: "",
};
},
watch: {
$route(n, o) {
this.specialArea = n.query.id;
this.ifDetail = n.query.ifDetail || "0";
this.monthScoreType = n.query.monthScoreType||""
this.monthScoreType = n.query.monthScoreType || "";
},
whatMounth(n) {
this.$refs.mounthPvCompare.upDateCover(n);
@ -304,7 +300,7 @@ export default {
methods: {
updateParentValue(newValue) {
this.ifDetail = newValue;
this.monthScoreType = ""
this.monthScoreType = "";
},
getStartTime() {
let date = new Date();
@ -359,7 +355,6 @@ export default {
});
});
});
},
//
getMounth() {
@ -432,7 +427,7 @@ export default {
cursor: pointer;
}
.actMenu {
border-bottom: 5px solid #00417C;
border-bottom: 5px solid #00417c;
}
}
.height-auto {
@ -592,7 +587,7 @@ export default {
cursor: pointer;
}
.actArea {
color: #00417C;
color: #00417c;
}
}
.topbox {

File diff suppressed because one or more lines are too long