Skip to content

C
CRM
Commit 21026ff5 authored by youjie's avatar youjie
Browse files
Options

no message

parent 04723473
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 231 deletions
src/components/customerManage/orderList.vue
View file @ 21026ff5
......@@ -277,6 +277,7 @@
</el-drawer>
<!-- 提成详情 -->
<commissionPopUp v-if="commissionPopUpVisible" :parameters="parameters"></commissionPopUp>
</div>
</template>
......@@ -284,6 +285,7 @@
import customerInfoBox from "../guestManagement/customerInfoBox";
import orderDetailsDrawer from "./orderDetailsDrawer";
import commissionPopUp from "../dialogModel/commissionPopUp";
export default {
components: {
customerInfoBox,
......@@ -1271,6 +1273,10 @@ li {
color: #f2c037;
}
.tatusText.cancel {
color: #c1c1c1;
}
.tatusText.Black {
color: Black;
}
......
src/components/dev/payroll.vue
View file @ 21026ff5
......@@ -44,7 +44,7 @@
</el-table-column>
<el-table-column label="工资规则">
<template slot-scope="scope">
<span :class="scope.row.WageType!=1?'cursor-p':''" @click="scope.row.WageType!=1?GenerateScale(scope.row):''">{{scope.row.WageType!=1?'上季度定档':'新员工比例'}}</span>
<span :class="scope.row.WageType?'cursor-p':''" @click="scope.row.WageType?GenerateScale(scope.row):''">{{scope.row.WageType!=1?'上季度定档':'新员工比例'}}</span>
</template>
</el-table-column>
<el-table-column label="基本工资">
......@@ -93,107 +93,7 @@
</div>
<!-- 查看生成比例 -->
<el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center>
<template>
<div
class="cm_content"
style="width: 100%;margin-bottom: 35px;margin-top: 30px;"
>
<div class="ITUDWageMoney-box" style="margin-bottom: 20px;">
<span>姓名：{{EmName}}</span>
</div>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading">
<tr>
<th>期数</th>
<th>类型</th>
<th>利润</th>
<th>引流数量</th>
<th>成交订单</th>
</tr>
<tr v-for="(item,index) in commissionratioList.List"
:key="index">
<td>{{item.Month}}</td>
<td>{{item.EmpType!=1?'引流':'销售'}}</td>
<td>{{item.ProfitMoney}}</td>
<td>{{item.EmpType!=1?item.LureNum:'-'}}</td>
<td>{{item.EmpType!=1?item.OrderNum:'-'}}</td>
</tr>
<tr>
<td>平均</td>
<td>-</td>
<td>{{commissionratioList.AvgProfit}}</td>
<td>{{commissionratioList.AvgLureNum}}</td>
<td>{{commissionratioList.AvfOrderNum}}</td>
</tr>
</table>
<div class="ITUDschedule-Box-box">
<div class="ITUDschedule-box">
<div class="ITUDWageMoney-box">
<span>工资：{{commissionratioList.WageMoney}}</span>
</div>
<div class="progress-box">
<div v-for="(item,index) in commissionratioList.WageRateList" :key="index"
class="relative-position">
<el-progress :text-inside="true" :stroke-width="20"
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
:format="setItemTextW(item)"
:color="commissionratioList.WageMoney>=item.Rate?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
</el-progress>
<div class="rate-box">
<div class="sanjiao" :style="{'border-bottom-color':commissionratioList.WageMoney>=item.Rate?'#FF7262':'#CACACA'}"></div>
<div class="rate full-width" :class="{'active-rate':commissionratioList.WageMoney>=item.Rate}">
<i class="el-icon-check" style="font-size:8px"></i> {{item.Rate}}
</div>
</div>
</div>
</div>
</div>
<div class="ITUDschedule-box" style="margin-left: 20px;">
<div class="ITUDWageMoney-box">
<span>提成比例：{{commissionratioList.CommissionRate}}%</span>
</div>
<div class="progress-box">
<div v-for="(item,index) in commissionratioList.CommissionRateList" :key="index"
class="relative-position">
<el-progress :text-inside="true" :stroke-width="20"
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
:format="setItemText(item)"
:color="commissionratioList.CommissionRate>=item.Rate?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
</el-progress>
<div class="rate-box">
<div class="sanjiao" :style="{'border-bottom-color':commissionratioList.CommissionRate>=item.Rate?'#FF7262':'#CACACA'}"></div>
<div class="rate full-width" :class="{'active-rate':commissionratioList.CommissionRate>=item.Rate}">
<i class="el-icon-check" style="font-size:8px"></i> {{item.Rate}}%
</div>
<!-- <div class="sanjiao" :style="{'border-bottom-color':commissionratioList.AvgLureNum>item.StartValue&&
commissionratioList.AvfOrderNum>item.EndValue?'#FF7262':'#CACACA'}"></div>
<div class="rate full-width" :class="{'active-rate':commissionratioList.AvgLureNum>item.StartValue&&
commissionratioList.AvfOrderNum>item.EndValue}">
<i class="el-icon-check" style="font-size:8px"></i> {{item.Rate}}%
</div> -->
</div>
</div>
</div>
</div>
</div>
</div>
<div v-if="!commissionratioList"
style="width: 100%;border:1px solid #fff;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>暂无数据</div>
</template>
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer">
<el-button @click="outerVisible = false">取消</el-button>
<el-button type="primary" @click="outerVisible = false">确定</el-button>
......@@ -204,9 +104,13 @@
</template>
<script>
import inAccordanceWith from "../dialogModel/inAccordanceWithDialog"
export default {
components:{inAccordanceWith},
data() {
return {
outerVisible:false,
objNew:{},
commissionratioList:[],
EmName:'',
EmpType:'',
......@@ -317,26 +221,14 @@
data.EndValue = '∞'
}
},
// 获取员工生成比例
GenerateScale(item){
if(!item.WageReId){
return
}
this.EmName = item.EmName
this.EmpType = item.EmpType
let msg = {
WageReId:item.WageReId
}
this.apipost(
"/api/Commission/GetCommissionSource",msg,res => {
if (res.data.resultCode == 1) {
this.outerVisible = true
this.commissionratioList = res.data.data
} else {
this.Error(res.data.message);
}
}
);
this.objNew = item
this.outerVisible = true
},
GetCommissionPeroidsList() { //期数下拉
this.apipost(
......@@ -379,106 +271,6 @@
</script>
<style scoped>
.singeRowTable{
width: 100%;
}
.singeRowTable tr th {
background: #E6E6E6;
height: 40px;
font-size: 14px;
color: #333;
}
.singeRowTable tr td{
padding: 8px 5px !important;
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
.ITUDWageMoney-box{
margin-top: 20px;
margin-bottom: 10px;
}
.ITUDschedule-Box-box{
display: flex;
flex-direction: row;
justify-content: space-between;
}
.ITUDschedule-box{
flex: 1;
display: flex;
flex-direction: column;
}
.ITUD-title{
margin-top: 10px;
margin-bottom: 10px;
}
.progress-box{
flex: 1;
display: flex;
flex-direction: row;
}
.relative-position{
flex: 1;
margin-right: 0;
position: relative;
}
/deep/.relative-position .el-progress-bar__outer{
border-radius: 0 !important;
}
/deep/.relative-position .el-progress-bar__inner{
border-radius: 0 !important;
}
.ITUD-text-box{
position: relative;
}
.ITUD-text{
position: absolute;
z-index: 999;
color: red;
}
.rate-box {
position: absolute;
top: 30px;
left: 50%;
transform: translateX(-50%);
color: #000;
z-index: 9;
display: flex;
flex-wrap: wrap;
justify-content: center;
}
.sanjiao {
width: 0;
height: 0;
margin-left: 5%;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
border-bottom: 3px solid #CACACA;
}
.rate {
min-width: 20px;
padding: 2px 6px;
background-color: #CACACA !important;
display: flex;
justify-content: center;
align-items: center;
color: #666666;
font-size: 0.62vw;
font-family: PingFang SC;
border-radius: 7px;
line-height:12px;
white-space:nowrap;
}
.active-rate{
background-color: #FF7262 !important;
color: #FFFFFF !important;
}
/deep/.el-table tr:first-child th:nth-child(6){
background: #FFE082 !important;
}
......@@ -515,4 +307,10 @@
/deep/.el-table tr td:nth-child(11){
background: #E1BEE7;
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
</style>
\ No newline at end of file
src/components/dialogModel/commissionPopUp.vue
View file @ 21026ff5
......@@ -31,10 +31,21 @@
}
.addContacts .el-dialog__footer {
padding: 0;
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
</style>
<template>
<el-dialog @closed="closedDialog" :modal="false" :visible.sync="dialogTableVisible" :close-on-click-modal="false" class="addContacts">
<div>
<el-dialog @closed="closedDialog"
width="70%"
:modal="false"
:visible.sync="dialogTableVisible"
:close-on-click-modal="false" class="addContacts">
<div class="add-tit" slot="title">
<p><span></span>提成列表</p>
<span icon="el-icon-close"></span>
......@@ -65,13 +76,13 @@
label="部门"
show-overflow-tooltip>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="岗位"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.PostName?scope.row.PostName:'-'}}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
prop="EmName"
label="姓名"
......@@ -87,6 +98,11 @@
label="订单利润"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="YCommission"
label="应发"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="Commission"
label="提成"
......@@ -99,16 +115,28 @@
{{scope.row.CommissionRate}}%
</template>
</el-table-column>
<el-table-column
label="依据类型"
show-overflow-tooltip min-width="90">
<template slot-scope="scope">
<span
:class="scope.row.WageReId?'cursor-p':''"
@click="scope.row.WageType?GenerateScale(scope.row):''">{{scope.row.WageType==1?'新员工比例':scope.row.WageType==2?'上季度定档':'-'}}</span>
</template>
</el-table-column>
<el-table-column
prop="BonusMoney"
label="年终"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.BranchName!='微途科技'?scope.row.BonusMoney:'-'}}
</template>
</el-table-column>
<el-table-column
label="年终比例"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.BonusRate}}%
{{scope.row.BranchName!='微途科技'?scope.row.BonusRate+'%':'-'}}
</template>
</el-table-column>
<el-table-column
......@@ -118,7 +146,7 @@
</el-table-column>
<el-table-column
label="备注"
show-overflow-tooltip>
show-overflow-tooltip min-width="200px">
<template slot-scope="scope">
{{scope.row.Remark?scope.row.Remark:'-'}}
</template>
......@@ -144,8 +172,19 @@
</el-button>
</div>
</el-dialog>
<!-- 查看生成比例 -->
<el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center>
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer">
<el-button type="primary" class="add-box-btn" @click="outerVisible = false">确 定</el-button>
<el-button class="add-box-btn add-box-cancel" @click="outerVisible = false">取 消
</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import inAccordanceWith from "./inAccordanceWithDialog"
export default {
props: {
parameters:{
......@@ -153,8 +192,11 @@
default: true
}
},
components:{inAccordanceWith},
data() {
return {
outerVisible:false,
objNew:{},
total:0,
dataList:[],
msg: {
......@@ -179,6 +221,13 @@
this.getList()
},
methods: {
GenerateScale(item){
if(!item.WageReId){
return
}
this.objNew = item
this.outerVisible = true
},
//获取数据
getList() {
this.loading = true;
......
src/components/guestManagement/Agreement.vue
View file @ 21026ff5
......@@ -38,6 +38,10 @@
color: #F2C037;
}
.tatusText.cancel {
color: #c1c1c1;
}
.tatusText.Black {
color: Black;
}
......@@ -285,7 +289,7 @@
<template slot-scope="scope">
<div class="agreement-IncomeMoney-box">
{{scope.row.IncomeMoney}}
<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
@click="makeAdocument(scope.row,scope.$index,1)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
......@@ -309,14 +313,14 @@
</el-table-column>
<el-table-column label="退款" :width="120">
<template slot-scope="scope">
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
@click="makeAdocument(scope.row,scope.$index,2)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column label="成本" :width="120">
<template slot-scope="scope">
<div class="agreement-IncomeMoney-box">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
@click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
......@@ -330,11 +334,7 @@
<span @click.stop="popClick(scope.row,scope.$index,3)">确定</span>
</div>
</div>
</i>
</div>
</template>
</el-table-column>
......@@ -349,10 +349,12 @@
</el-table-column>
<el-table-column label="出票状态" :width="90">
<template slot-scope="scope">
<span @click="modifyStatus(scope.row)" class="cp tatusText" :class="scope.row.TicketStatus==1?'grey':
<span @click="modifyStatus(scope.row)" class="cp tatusText"
:class="scope.row.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success':
(scope.row.TicketStatus==3?'error':
(scope.row.TicketStatus==4?'Black':'')))">
(scope.row.TicketStatus==4?'cancel':
(scope.row.TicketStatus==5?'Black':''))))">
{{scope.row.TicketStatusName}}
</span>
<i v-if="scope.row.TicketStatus!=1&&
......
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