Skip to content

S
SuperMan
Commit 0fe6cbdc authored by zhengke's avatar zhengke
Browse files
Options

增加IM提成预览

parent baf283a5
Hide whitespace changes
Inline Side-by-side
Showing with 777 additions and 130 deletions
src/assets/css/Semibold.css
View file @ 0fe6cbdc
......@@ -50,4 +50,10 @@
@font-face{
font-family:'PingFang SC Regular';
src:url('../webfont/pingfang.ttf') format('truetype')
}
\ No newline at end of file
}
@font-face {
font-family: fangzheng;
src:url("../webfont/fangzheng.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
font-style: normal;
font-weight: normal;
}
src/components/commonPage/commissionDetail.vue 0 → 100644
View file @ 0fe6cbdc
<style>
.cd_content{
width:100%;
min-height:600px;
font-family: "fangzheng";
background:url(../../assets/img/imbg/bg.png);
}
.cd_content .cd_tableContent{
padding:3rem 3rem 0 3rem;
width:89.9%;
margin:auto;
min-height: 10rem;
border-left:2px solid #BDAC94;
border-right:2px solid #BDAC94;
background-color: #fff;
}
.cd_content .cd_table{
width:100%;
text-align: center;
font-family: "fangzheng";
}
.cd_content .cd_table th{
border-top:1px dashed #121212;
border-bottom:1px dashed #121212;
height:4rem;
font-size:1.5rem;
font-family: "fangzheng"!important;
}
.cd_content .cd_table td{
height:1.5rem;
font-size:1.2rem;
color:#121212;
padding:0 1rem 1rem 1rem;
}
.cd_table tr:nth-child(2) td{
padding:1rem;
}
.cd_table tr:last-child td{
border-bottom:1px dashed #121212;
}
.cd_content .cd_Zonge{
display: flex;
justify-content: space-between;
padding: 25px;
font-size:1.5rem;
border-bottom:1px dashed #121212;
}
.cd_content .cd_GoBackDiv{
width:100%;
height:3rem;
text-align: center;
background:url(../../assets/img/imbg/detail.png) no-repeat;
background-size:cover;
background-position: 0 0;
}
.cd_GoBackDiv img{
cursor: pointer;
transform: rotate(180deg);
position: relative;
top:2.5rem;
}
.cd_content .cd_Top{
width:100%;
background:url(../../assets/img/imbg/detail.png) no-repeat;
height:83px;
background-size:cover;
background-position: 0 10px;
}
.cd_content .cd_Bottom{
width:100%;
background:url(../../assets/img/imbg/detail.png) no-repeat;
height:80px;
background-size:cover;
background-position: 0 -1030px;
}
</style>
<template>
<div class="cd_content">
<div class="cd_GoBackDiv">
<img @click="changeBill" src="../../assets/img/imbg/arrowDown.png" alt=""/>
</div>
<div class="cd_tableContent">
<table class="cd_table">
<tr>
<th style="width:40%;text-align:left;padding-left:2rem;">订单号</th>
<th style="width:20%">人数</th>
<th style="width:40%;text-align:right;padding-right:2rem;">金额</th>
</tr>
<tr v-for="item in dataList.list">
<td style="text-align:left;">{{item.OrderId}}</td>
<td>{{item.PeopleCount}}</td>
<td style="text-align:right;">{{item.CommissionMoney|priceFormat(item.CommissionMoney)}}元</td>
</tr>
</table>
<div class="cd_Zonge">
<div class="cd_item">本月提成</div>
<div class="cd_item">{{dataList.totalCommissionMoney|priceFormat(dataList.totalCommissionMoney)}}元</div>
</div>
<div class="cd_Zonge" style="border-bottom:none;padding:25px 25px 0 25px">
<div class="cd_item">
<img style='vertical-align:middle;margin-right:10px;' src="../../assets/img/imbg/ewai.png"/>额外奖励</div>
<div class="cd_item" style="color:#4DB220">{{dataList.totalOtherMoney|priceFormat(dataList.totalOtherMoney)}}元</div>
</div>
<div class="cd_Zonge">
<div class="cd_item">
<img style='vertical-align:middle;margin-right:10px;' src="../../assets/img/imbg/jl.png"/>额外扣除</div>
<div class="cd_item" style="color:#B22020">-{{dataList.totalBackMoney|priceFormat(dataList.totalBackMoney)}}元</div>
</div>
<div class="cd_Zonge" style="border-bottom:none;color:#000;">
<div class="cd_item">总提成</div>
<div class="cd_item">{{totalMoney|priceFormat(totalMoney)}}元</div>
</div>
</div>
<div class="cd_Bottom"></div>
</div>
</template>
<script>
export default {
props:['userId'],
data() {
return {
dataList:{},
//计算总提成
totalMoney:0
};
},
components: {
},
methods: {
getData(PeriodsId){
let msg = {
id:PeriodsId,
userId:this.userId
}
this.apipost("customerIndex_post_GetSellComissionDetails",msg,res => {
if (res.data.resultCode == 1) {
this.dataList=res.data.data;
this.totalMoney = parseFloat(this.dataList.totalCommissionMoney)+parseFloat(this.dataList.totalOtherMoney)-parseFloat(this.dataList.totalBackMoney)
}else{
this.Error(res.data.message);
}
}
);
},
changeBill(){
this.$emit('changeDiv');
}
},
filters: {
priceFormat (value) {
if (value == null) {
return 0.0
}
let nStr = value.toFixed(2)
nStr += ''
let x = nStr.split('.')
let x1 = x[0]
let x2 = x.length > 1 ? '.' + x[1] : ''
var rgx = /(\d+)(\d{3})/
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2')
}
return x1 + x2
}
},
mounted() {
}
};
</script>
src/components/commonPage/commissonBill.vue 0 → 100644
View file @ 0fe6cbdc
<style>
.cbContent{
width:100%;
height:1000px;
background:url(../../assets/img/imbg/tcbg.png) no-repeat;
background-size:100% 100%;
position: relative;
}
.cb_Title{
position: absolute;
top:4.5rem;
width:100%;
text-align: center;
}
.cb_year{
color:#4E4E4C;
font-size:2.5rem;
font-weight: bold;
position: relative;
top:-5px;
margin-right:1rem;
font-family: "PingFangSC-Fine";
}
.cb_month{
font-size:2.5rem;
color:#257BF1;
margin:0 1rem;
position: relative;
top:-5px;
font-weight: bold;
font-family: "PingFangSC-Fine";
}
.cb_PeoInfo{
position: absolute;
top:11rem;
width:100%;
}
.cb_Name{
width:100%;
text-align: center;
color:#FBA838;
font-size:3.5rem;
}
.cb_PeoInfo table{
width:100%;
text-align: center;
padding:0 5rem;
margin-top:2rem;
}
.cb_PeoInfo table td{
height:4rem;
}
.cb_benyue{
color:#257BF1;
font-size:2.5rem;
font-weight: bold;
font-family: "PingFangSC-Fine";
}
.cb_benyue span:first-child{
font-size:1.5rem;
}
.cb_Tleft{
width:40%;
text-align: left;
}
.cb_Tright{
width:60%;
text-align: right;
}
.cb_geren{
position: absolute;
top:25rem;
padding:0 5rem;
width:100%;
}
.cb_geren div{
margin-top:1rem;
color:#010101;
font-size:1.7rem;
padding:0 30px;
line-height: 3rem;
font-family: "PingFangSC-Fine";
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
}
.cb_Arrow{
position: absolute;
bottom:4rem;
width:100%;
cursor: pointer;
text-align: center;
}
.cb_Arrow div:last-child{
color:#C4A873;
font-size:1.5rem;
font-family: "PingFangSC-Fine";
}
</style>
<template>
<div class="cbContent" v-if="isShow">
<div class="cb_Title">
<span class="cb_year">{{dataList.SellGeneralContent.Year}}</span>
<span><img src="../../assets/img/imbg/nian.png"/></span>
<span class="cb_month">{{dataList.SellGeneralContent.Month}}</span>
<span><img src="../../assets/img/imbg/yue.png" alt=""/></span>
</div>
<div class="cb_PeoInfo">
<div class="cb_Name">{{dataList.UserName}}</div>
<table>
<tr>
<td class="cb_Tleft">
<img src="../../assets/img/imbg/bytc.png" alt=""/>
</td>
<td class="cb_Tright">
<span class="cb_benyue"><span>¥</span>{{dataList.SellGeneralContent.totalCommission}}</span>
</td>
</tr>
<tr style="display:none;">
<td class="cb_Tleft">
<img src="../../assets/img/imbg/byxse.png" alt=""/>
</td>
<td class="cb_Tright">
<span class="cb_benyue"><span>¥</span>12523268.00</span>
</td>
</tr>
</table>
</div>
<div class="cb_geren">
<span>
<img src="../../assets/img/imbg/grxy.png" alt=""/>
</span>
<div>
{{dataList.SellGeneralContent.ShareContent}}
</div>
</div>
<div class="cb_Arrow" @click="changeBill">
<div><img src="../../assets/img/imbg/arrowDown.png" alt=""/></div>
<div>查看明细</div>
</div>
</div>
</template>
<script>
export default {
props:['articleId','userId'],
data() {
return {
dataList:{},
isShow:false
};
},
components: {
},
methods: {
//获取数据
getDateInfo(){
let msg = {
articleId:this.articleId,
userId:this.userId
}
this.apipost("customerIndex_post_GetSellComissionGeneralSure",msg,res => {
if (res.data.resultCode == 1) {
this.dataList=res.data.data;
this.isShow=true;
}else{
this.Error(res.data.message);
}
}
);
},
changeBill(){
this.$emit('Close',this.dataList.PeriodsId);
}
},
mounted() {
}
};
</script>
src/components/index.vue
View file @ 0fe6cbdc
<style>
.tichengContent{
width:100%;
height:180px;
background:url(../assets/img/imbg/ticheng.png) no-repeat;
background-size:100% 100%;
position: relative;
cursor: pointer;
}
.Ticheng_Date{
position: absolute;
color:#CB504D;
top:75px;
width:100%;
text-align: center;
font-size:20px;
}
.Ticheng_Money{
margin-left:20px;
}
.Ticheng_Money span:first-child{
font-size:14px;
margin-right:5px;
}
.Ticheng_Text{
width:100%;
position: absolute;
padding:0 40px;
top:110px;
text-align: left;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
color:#4E4E4C;
font-size:14px;
}
.Ticheng_Address{
padding:15px 0 25px 0!important;
}
.myIndexStyle .el-dialog--center .el-dialog__body{
padding:0;
}
</style>
<template>
<div style="position: relative;" ref="firstParent">
<div style="position: relative;" class="myIndexStyle" ref="firstParent">
<div class="nav">
<div class="nav-left">
<img class="GroupPic" v-if="userInfo.GroupPic!='' " :src="userInfo.GroupPic" :onerror='defaultHeadImg' />
......@@ -454,133 +503,255 @@
</ul>
</div>
<div class="IM_cont" id='allDynamic' v-show="dynamicType==1">
<div class="IM_cont_item" v-for="(item,index) in dynamicList">
<p class="userAndTime">
<img v-if="!item.crearteEmPhoto" src="../assets/img/litheader.png" alt="">
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
<span class="fr" style="font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</span>
</p>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_300'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4' style="margin-right: 5px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,w_148,h_150,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5' style="margin: 1px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,h_100,w_100,color_333333'"/>
</p>
<p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;">
your browser does not support the video tag
</video>
</p>
<p class="artcleAddress">
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<!--{{item.hasLike}}-->
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticle(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticle(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
</span>
</p>
<div class="praiseAndReview">
<div class="praise" v-if='item.likeList.length>0'>
<i class="iconfont icon-zan_" style="color: #FF6868; vertical-align:initial;font-size: 14px;"></i>
<span v-for="i in item.likeList">{{i.empName}}、</span>
</div>
<div class="review" v-if="item.commentList.length>0">
<span class="reviewIcon">
<span class="sjx"></span>
</span>
<ul>
<li v-for="(i,index) in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
</div>
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
<template v-for="(item,index) in dynamicList">
<div class="IM_cont_item" v-if="item.fileType==3">
<p class="userAndTime">
<img v-if="!item.crearteEmPhoto" src="../assets/img/litheader.png" alt="">
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
<span class="fr" style="font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</span>
</p>
<p class="artcleCont" style="font-weight:bold;letter-spacing:2px;">
{{getResetTime(item.createTime)}}
</p>
<div class="tichengContent" @click="getTichengInfo(item)">
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}月</span><span class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
<div class="Ticheng_Text">
{{item.SellGeneralContent.ShareContent}}
</div>
</div>
<p class="artcleAddress Ticheng_Address">
<span v-if="item.address!==''&&item.address!==null"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticle(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticle(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
</span>
</p>
<div class="praiseAndReview">
<div class="praise" v-if='item.likeList.length>0'>
<i class="iconfont icon-zan_" style="color: #FF6868; vertical-align:initial;font-size: 14px;"></i>
<span v-for="i in item.likeList">{{i.empName}}、</span>
</div>
<div class="review" v-if="item.commentList.length>0">
<span class="reviewIcon">
<span class="sjx"></span>
</span>
<ul>
<li v-for="(i,index) in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
</div>
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
<div v-if="item.fileType==0" class="IM_cont_item">
<p class="userAndTime">
<img v-if="!item.crearteEmPhoto" src="../assets/img/litheader.png" alt="">
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
<span class="fr" style="font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</span>
</p>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_300'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4' style="margin-right: 5px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,w_148,h_150,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5' style="margin: 1px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,h_100,w_100,color_333333'"/>
</p>
<p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;">
your browser does not support the video tag
</video>
</p>
<p class="artcleAddress">
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<!--{{item.hasLike}}-->
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticle(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticle(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
</span>
</p>
<div class="praiseAndReview">
<div class="praise" v-if='item.likeList.length>0'>
<i class="iconfont icon-zan_" style="color: #FF6868; vertical-align:initial;font-size: 14px;"></i>
<span v-for="i in item.likeList">{{i.empName}}、</span>
</div>
<div class="review" v-if="item.commentList.length>0">
<span class="reviewIcon">
<span class="sjx"></span>
</span>
<ul>
<li v-for="(i,index) in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
</div>
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
</template>
</div>
<div class="IM_cont" id='myDynamic' v-show="dynamicType==2">
<div class="myDynamicTop"></div>
<div class='myDynamicItem' v-for="(item,index) in myDynamicList">
<div class="iconOut">
<div class="iconIn"></div>
</div>
<div style="position: absolute; font-size: 14px; left: -60px; top:3px; width: 50px; height: 24px; text-align: right;">{{item.createTime|diaplayTime(item.createTime)}}</div>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_273'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4' style="margin-right: 5px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,w_130,h_120,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5' style="margin: 1px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,h_80,w_90,color_333333'"/>
</p>
<p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;">
your browser does not support the video tag
</video>
</p>
<p class="artcleAddress">
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticleOne(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticleOne(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
<i class="iconfont icon-img_delete_small" style="cursor: pointer;" @click="deleteArticle(item.id)"></i>
</span>
</p>
<template v-for="(item,index) in myDynamicList">
<div class="myDynamicItem" v-if="item.fileType==3">
<div class="iconOut">
<div class="iconIn"></div>
</div>
<div style="position: absolute; font-size: 12px; left: -60px; top:3px; width: 56px; height: 24px; text-align: right;">{{item.createTime|diaplayTime(item.createTime)}}</div>
<p class="artcleCont">
<div class="IM_cont_item" style="background:transparent">
<p class="userAndTime">
<img v-if="!item.crearteEmPhoto" src="../assets/img/litheader.png" alt="">
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
</p>
<p class="artcleCont" style="font-weight:bold;letter-spacing:2px;">
{{getResetTime(item.createTime)}}
</p>
<div class="tichengContent" @click="getTichengInfo(item)">
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}月</span><span class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
<div class="Ticheng_Text">
{{item.SellGeneralContent.ShareContent}}
</div>
</div>
<p class="artcleAddress Ticheng_Address">
<span v-if="item.address!==''&&item.address!==null"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticle(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticle(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
</span>
</p>
<div class="praiseAndReview">
<div class="praise" v-if='item.likeList.length>0'>
<i class="iconfont icon-zan_" style="color: #FF6868; vertical-align:initial;font-size: 14px;"></i>
<span v-for="i in item.likeList">{{i.empName}}、</span>
</div>
<div class="review" v-if="item.commentList.length>0">
<span class="reviewIcon">
<span class="sjx"></span>
</span>
<ul>
<li v-for="(i,index) in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
</div>
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
</p>
</div>
<div v-if="item.fileType==1" class='myDynamicItem'>
<div class="iconOut">
<div class="iconIn"></div>
</div>
<div style="position: absolute; font-size: 12px; left: -60px; top:3px; width: 56px; height: 24px; text-align: right;">{{item.createTime|diaplayTime(item.createTime)}}</div>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_273'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4' style="margin-right: 5px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,w_130,h_120,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5' style="margin: 1px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,h_80,w_90,color_333333'"/>
</p>
<p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;">
your browser does not support the video tag
</video>
</p>
<p class="artcleAddress">
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticleOne(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticleOne(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
<i class="iconfont icon-img_delete_small" style="cursor: pointer;" @click="deleteArticle(item.id)"></i>
</span>
</p>
<div class="praiseAndReview">
<div class="praiseAndReview">
<div class="praise" v-if='item.likeList.length>0'>
<i class="iconfont icon-zan_" style="color: #FF6868; vertical-align:initial;font-size: 14px;"></i>
<span v-for="i in item.likeList">{{i.empName}}、</span>
</div>
<div class="praise" v-if='item.likeList.length>0'>
<i class="iconfont icon-zan_" style="color: #FF6868; vertical-align:initial;font-size: 14px;"></i>
<span v-for="i in item.likeList">{{i.empName}}、</span>
</div>
<div class="review" v-if="item.commentList.length>0">
<span class="reviewIcon">
<span class="sjx"></span>
</span>
<ul>
<li v-for="i in item.commentList" >
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
</div>
</div>
<div class="review" v-if="item.commentList.length>0">
<span class="reviewIcon">
<span class="sjx"></span>
</span>
<ul>
<li v-for="i in item.commentList" >
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
</div>
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticleOne(item.id,index)'>确定</el-button>
</el-input>
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticleOne(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
</template>
</div>
</div>
......@@ -879,6 +1050,15 @@
<el-dialog custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow" center :before-close="closeChangeMachie">
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie"/>
</el-dialog>
<!-- 提成账单 -->
<el-dialog custom-class='w700' title="提成账单" :visible.sync="commissionDialog" center :before-close="resetClose">
<commissonBill v-if="isShowBill" @Close="changeComponent" :articleId='articleId' :userId='createEmpId' ref="myBill"></commissonBill>
<commissionDetail v-else @changeDiv="changeDis" :userId='createEmpId' ref="myBillDetail"></commissionDetail>
</el-dialog>
<div v-show="mazip==0" id="downzip">
<div>
<div>
......@@ -923,16 +1103,27 @@ import loading from "./commonPage/loading";
import VueDraggableResizable from "vue-draggable-resizable";
import { setInterval, clearInterval } from 'timers';
import saleRnk from "./SalesModule/saleRnk";
import commissonBill from './commonPage/commissonBill';
import commissionDetail from "./commonPage/commissionDetail.vue";
export default {
components: {
ChatList,
ChatEditor,
loading,
VueDraggableResizable,
saleRnk
saleRnk,
commissonBill,
commissionDetail
},
data() {
return {
//提成账单弹窗
commissionDialog:false,
//判断显示哪个组件
isShowBill:true,
//传递子组件参数
articleId:0,
createEmpId:0,
tsState:false,
tsNumber:6,
saleRnkShow: false,
......@@ -3584,6 +3775,43 @@ export default {
}
},null)
},
//切换组件
changeComponent(PeriodsId){
this.isShowBill=false;
this.$nextTick(()=>{
this.$refs.myBillDetail.getData(PeriodsId);
})
},
//切换
changeDis(){
this.isShowBill=true;
this.$nextTick(()=>{
this.$refs.myBill.getDateInfo();
})
},
//初始化
resetClose(){
this.commissionDialog=false;
this.isShowBill=true;
},
//格式化日期
getResetTime(Time){
if(Time!=''&&Time!=null){
let newTime = Time.split(' ')[0];
let endDate = newTime.split('-');
return endDate[0]+'年'+endDate[1]+'月'+endDate[2]+'日'
}
},
//打开详情
getTichengInfo(item){
this.commissionDialog=true;
this.isShowBill=true;
this.articleId = item.id;
this.createEmpId=item.createEmpId;
this.$nextTick(()=>{
this.$refs.myBill.getDateInfo();
})
}
}
};
......
src/components/sale/sale.vue
View file @ 0fe6cbdc
......@@ -5,8 +5,12 @@
.saleChartCont{width: 100%; height: 95%; box-sizing: border-box;}
.personal{width: 100%;height: 100%;}
.l_title{width: 100%;height: 30px}
.Sale_Share{
color:#83ACFF;
cursor: pointer;
font-size:12px;
margin-left:10px;
}
</style>
<template>
......@@ -40,7 +44,13 @@
<span>{{data.totalCommission}}</span>
</div>
<!-- <span>￥<p class="tc">{{data.totalCommission}}</p></span>-->
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;" >本月提成</div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;" >
<span>本月提成</span>
<template v-if="data.comissionGeneralId>0">
<span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span>
<span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share">分享并确认</span>
</template>
</div>
</div>
</div>
......@@ -486,13 +496,21 @@
</div>
</el-col>
</el-row>
</div>
</div>
</div>
<!-- 分享业绩 -->
<el-dialog custom-class='w500' title="分享提成" :visible.sync="tichengDialog" center :before-close="resetCommission">
<el-form :model="shareMsg" :rules="rules" ref="shareMsg" label-width="80px">
<el-form-item label="个人宣言" style="margin-bottom:0;">
<el-input type="textarea" rows="6" resize="none" maxlength="100" v-model="shareMsg.ShareContent" placeholder=""></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="tichengDialog=false">取消</button>
<button class="normalBtn" @click="shareCommission">确定</button>
</div>
</el-dialog>
</div>
</template>
......@@ -515,6 +533,19 @@
NotDealCount:0, //
zoom:1,
OrderList:[],
tichengDialog:false,
shareMsg:{
ShareContent:'',
PeriodsId:0,
totalCommission:0
},
rules: {
ShareContent: [{
required: true,
message: '请填写个人宣言',
trigger: 'blur'
}]
},
}
},
components:{
......@@ -526,7 +557,6 @@
this.screenWidth = val;
let Width = val - 350
this.zoom = ((Width/(1920-350))*100).toFixed(0)+'%';
console.log(this.zoom)
}
},
methods:{
......@@ -635,7 +665,6 @@
},err=>{})
},
drawLine(OrderList) {
console.log(OrderList)
// 基于准备好的dom，初始化echarts实例
let myChart = this.$echarts.init(document.getElementById('myChart'))
let dataname = [];
......@@ -745,6 +774,29 @@
this.$router.push({
path: path
})
},
//确定分享业绩
shareCommission(){
if(this.shareMsg.ShareContent==''){
this.Error('请填写个人宣言');
return;
}
this.shareMsg.PeriodsId=this.data.comissionGeneralId;
this.shareMsg.totalCommission=this.data.totalCommission;
this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.iWorkbench();
this.resetCommission();
}else{
this.Error(res.data.message);
}
},err=>{})
},
//关闭重置输入框
resetCommission(){
this.tichengDialog=false;
this.shareMsg.ShareContent=''
}
},
mounted(){
......
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