Skip to content

S
SuperMan
Commit 65b8d7f0 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent b0827e00
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 19 deletions
src/components/SalesModule/CustomerAnalysis.vue
View file @ 65b8d7f0
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<el-row :gutter="23" justify="space-between"> <el-row :gutter="23" justify="space-between">
<el-col :span="16"><div id="chartsMap" class="bgDiv" style="height:400px;width:100%;padding:20px 10px"></div> </el-col> <el-col :span="16"><div id="chartsMap" class="bgDiv" style="height:400px;width:100%;padding:20px 10px"></div> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="bgDiv" style="padding:20px 30px;height:400px;"> <div class="bgDiv" style="padding:20px 30px;height:400px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">价格区间占比</p> <p style="color:#2C3343;margin-bottom:30px">价格区间占比</p>
<div v-for="(item,index) in datainfo.priceList" :key="index" class="perceItem"> <div v-for="(item,index) in datainfo.priceList" :key="index" class="perceItem">
<el-row :gutter="22"> <el-row :gutter="22">
...@@ -85,10 +85,10 @@ ...@@ -85,10 +85,10 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="third" style="padding:0 10px;margin-top:20px"> <div class="third" style="padding:0 10px;margin:20px 0 40px 0">
<el-row :gutter="23" justify="space-between"> <el-row :gutter="23" justify="space-between">
<el-col :span="8"> <el-col :span="8">
<div class="bgDiv" style="padding:20px 30px;height:320px;"> <div class="bgDiv" style="padding:20px 30px;height:320px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">返利红包预期收益</p> <p style="color:#2C3343;margin-bottom:30px">返利红包预期收益</p>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -108,13 +108,14 @@ ...@@ -108,13 +108,14 @@
<el-col :span="18"> <el-col :span="18">
<div style="margin-bottom:20px" v-for="(item,index) in datainfo.list" :key="index+500"> <div style="margin-bottom:20px" v-for="(item,index) in datainfo.list" :key="index+500">
<div> <div>
<p style="color:#7F8593;font-size:12px">月交易额达<span style="color:#7F8593">￥{{item.Money}}</span> 返{{item.Ratio}}%</p> <p style="color:#7F8593;font-size:12px">月交易额达<span style="color:#7F8593">￥{{item.Money}}</span> 返{{item.Ratio}}‰</p>
</div> </div>
<div> <div>
<el-row :gutter="23" justify="space-between"> <el-row :gutter="23" justify="space-between">
<el-col :span="18"> <el-col :span="18">
<p style="margin-top:6px"> <p style="margin-top:6px">
<el-progress :color="colorMethod(item)" :show-text="false" :stroke-width="12" :percentage="datainfo.totalYearPrice"></el-progress> <!-- 数据是：{{datainfo.totalYearPrice/item.Money>1?100:(datainfo.totalYearPrice/item.Money)*100}} -->
<el-progress :color="colorMethod(item)" :show-text="false" :stroke-width="12" :percentage="datainfo.totalYearPrice/item.Money>1?100:(datainfo.totalYearPrice/item.Money)*100"></el-progress>
</p> </p>
</el-col> </el-col>
...@@ -130,12 +131,12 @@ ...@@ -130,12 +131,12 @@
</div> </div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="bgDiv" style="padding:20px 30px;height:320px;"> <div class="bgDiv" style="padding:20px 30px;height:320px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">交客线路占比</p> <p style="color:#2C3343;margin-bottom:30px">交客线路占比</p>
<div v-for="(item,index) in datainfo.LineIdList" :key="index+100" class="circleItem"> <div v-for="(item,index) in datainfo.LineIdList" :key="index+100" class="circleItem">
<div style="height:126px;position:relative"> <div style="height:126px;position:relative">
<div class="Linetext"> <div class="Linetext">
<p style="font-size:34px">{{Number(item.Total)}}<span style="font-size:14px">%</span></p> <p style="font-size:34px">{{Number(item.Total)}}<span style="font-size:14px">‰</span></p>
<p style="font-size:14px">{{item.TypeName}}</p> <p style="font-size:14px">{{item.TypeName}}</p>
</div> </div>
<el-progress :color="item.color" :show-text="false" type="circle" :stroke-width="16" :percentage="Number(item.Total)"></el-progress> <el-progress :color="item.color" :show-text="false" type="circle" :stroke-width="16" :percentage="Number(item.Total)"></el-progress>
...@@ -193,7 +194,6 @@ export default { ...@@ -193,7 +194,6 @@ export default {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
res.data.data.LineIdList.forEach(item => { res.data.data.LineIdList.forEach(item => {
this.colorList.forEach(color=>{ this.colorList.forEach(color=>{
item.color=color; item.color=color;
......
src/components/SalesModule/HappyPassbook.vue
View file @ 65b8d7f0
...@@ -132,25 +132,28 @@ ...@@ -132,25 +132,28 @@
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
<th>金额</th> <th>门店名称</th>
<th>类型</th> <th>类型</th>
<th>金额</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间</th>
<th>历史余额</th> <th>历史余额</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index+500"> <tr v-for="(item,index) in DataList" :key="index+500">
<td>{{item.Money}}</td> <td>{{item.CustomerName}}({{item.Contact}})</td>
<td> <td>
<span>{{item.Type==1?"收入":"折扣"}}</span> <span>{{item.Type==1?"收入":"折扣"}}</span>
</td> </td>
<td>{{item.Money}}</td>
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
<td>{{item.UpdateTime}}</td> <td>{{item.UpdateTime}}</td>
<td>{{item.AccountMoney}}</td> <td>{{item.AccountMoney}}</td>
</tr> </tr>
<tr v-if='DataList.length==0'> <tr v-if='DataList.length==0'>
<td colspan="5" align="center">暂无数据</td> <td colspan="6" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
......
src/components/SalesModule/MyCustomer.vue
View file @ 65b8d7f0
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
.page_MyCustomerSearch ._class_b{ .page_MyCustomerSearch ._class_b{
color: #257BF1 !important color: #257BF1 !important
} }
.xqBtn{
background: #09D49D;
padding:2px 6px;
color:#fff!important;
}
</style> </style>
<template> <template>
<div class="page_MyCustomer"> <div class="page_MyCustomer">
...@@ -105,7 +110,7 @@ ...@@ -105,7 +110,7 @@
<div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''"> <div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''">
<ul class="clearfix"> <ul class="clearfix">
<li v-for="(item,index) in dataList" @click="goUrl(type,item.customerId)"> <li v-for="(item,index) in dataList" @click="goUrl(type,item.customerId)">
<i class="iconDelete2 iconfont icon-zongbiao" @click.stop="goUrC('CustomerAnalysis',item.customerId)"></i>
<i class="iconDelete1 iconfont icon-kehuguanxi_kehu" @click.stop="goUrlT('empBankAccount',item.customerId)"></i> <i class="iconDelete1 iconfont icon-kehuguanxi_kehu" @click.stop="goUrlT('empBankAccount',item.customerId)"></i>
<i class="iconDelete iconfont icon-kehuguanxi_delete1" @click.stop="deleteCustomer(item)"></i> <i class="iconDelete iconfont icon-kehuguanxi_delete1" @click.stop="deleteCustomer(item)"></i>
<img src="../../assets/img/vip.png" style="left: 134px; top: 50px;" v-show="item.isMember==1&&type==2"/> <img src="../../assets/img/vip.png" style="left: 134px; top: 50px;" v-show="item.isMember==1&&type==2"/>
...@@ -133,7 +138,9 @@ ...@@ -133,7 +138,9 @@
<p class="_other_n" v-else>最近拜访：暂无</p> <p class="_other_n" v-else>最近拜访：暂无</p>
</div> </div>
<div class="_bt"> <div class="_bt">
<p>累计交易额度 <span> {{item.tradeTotal}}</span></p> <p>累计交易额度 <span> {{item.tradeTotal}}</span>
<span class="xqBtn" @click.stop="goUrC('CustomerAnalysis',item.customerId)">详情</span>
</p>
<p>询价与需求 <span> {{item.inquireCount}}</span></p> <p>询价与需求 <span> {{item.inquireCount}}</span></p>
</div> </div>
</li> </li>
......
src/components/SalesModule/enrollTotal.vue
View file @ 65b8d7f0
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
<th>金额</th> <th>金额</th>
<th>类型</th> <th>类型</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
</tr> </tr>
<tr v-for="(item2,index2) in redBagList" <tr v-for="(item2,index2) in redBagList"
:key="index2"> :key="index2">
...@@ -435,6 +435,7 @@ ...@@ -435,6 +435,7 @@
return obj; return obj;
}, },
redBagList:[], redBagList:[],
happy:false,
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"', defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -516,6 +517,7 @@ ...@@ -516,6 +517,7 @@
}, },
methods: { methods: {
goUrlHappy(item){ goUrlHappy(item){
this.happy=false;
this.$router.push({ this.$router.push({
name: "HappyPassbook", name: "HappyPassbook",
query: { query: {
...@@ -791,6 +793,47 @@ ...@@ -791,6 +793,47 @@
text-indent: 15px; text-indent: 15px;
} }
*/ */
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
.personNolayer p>span {
font-size: 12px;
color: #333;
margin-right: 15px;
}
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.personNolayer table th{ .personNolayer table th{
background-color: #ededed; background-color: #ededed;
......
src/components/SalesModule/groupTourOrder.vue
View file @ 65b8d7f0
...@@ -1657,14 +1657,14 @@ ...@@ -1657,14 +1657,14 @@
</el-popover> </el-popover>
</td> </td>
<td> <td>
<el-popover v-if="item.customerId || item.customerId==0" style='padding: 0;' width="600" trigger="click"> <el-popover v-model="happy" v-if="item.customerId || item.customerId==0" style='padding: 0;' width="600" trigger="click">
<div class="personNolayer"> <div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
<th>金额</th> <th>金额</th>
<th>类型</th> <th>类型</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
</tr> </tr>
<tr v-for="(item2,index2) in redBagList" <tr v-for="(item2,index2) in redBagList"
:key="index2"> :key="index2">
...@@ -1678,9 +1678,6 @@ ...@@ -1678,9 +1678,6 @@
<tr v-if='redBagList.length==0'> <tr v-if='redBagList.length==0'>
<td colspan="4" align="center">暂无数据</td> <td colspan="4" align="center">暂无数据</td>
</tr> </tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr>
</table> </table>
</div> </div>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;" slot="reference">{{item.redEnvelopeMoney}}</span> <span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;" slot="reference">{{item.redEnvelopeMoney}}</span>
...@@ -1939,6 +1936,7 @@ ...@@ -1939,6 +1936,7 @@
export default { export default {
data() { data() {
return { return {
happy:false,
redBagList:[], redBagList:[],
// 修改应收总额 // 修改应收总额
Ysze: false, Ysze: false,
...@@ -2242,6 +2240,7 @@ ...@@ -2242,6 +2240,7 @@
}, },
methods: { methods: {
goUrlHappy(item){ goUrlHappy(item){
this.happy=false;
this.$router.push({ this.$router.push({
name: "HappyPassbook", name: "HappyPassbook",
query: { query: {
...@@ -2251,6 +2250,7 @@ ...@@ -2251,6 +2250,7 @@
}); });
}, },
getRedBag(item){ getRedBag(item){
console.log("111")
let msg={ let msg={
CustomerId:item.customerId, CustomerId:item.customerId,
pageIndex: 1, pageIndex: 1,
...@@ -2258,6 +2258,7 @@ ...@@ -2258,6 +2258,7 @@
}; };
if(item.customerId){ if(item.customerId){
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => { this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => {
this.happy=true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData; this.redBagList = res.data.data.pageData;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment