Skip to content

S
SuperMan
Commit 72260c57 authored by wuchun's avatar wuchun
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 61f64a15 fc98dd5d
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 62 deletions
src/components/FinancialModule/OpCommission/OPCommissionDetail.vue
View file @ 72260c57
......@@ -58,7 +58,7 @@
flex: 1;
display: flex;
flex-direction: row;
}
.relative-position{
flex: 1;
......@@ -89,7 +89,7 @@
display: flex;
flex-wrap: wrap;
justify-content: center;
}
.sanjiao {
width: 0;
......@@ -128,13 +128,13 @@
<ul class="opUl">
<li>
<em>出团公司</em>
<el-select filterable size="mini" v-model='msg.OutBranchId'
<el-select filterable size="mini" v-model='msg.OutBranchId'
@change='handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
......@@ -149,24 +149,24 @@
</li>
<li>
<em>所属公司</em>
<el-select filterable size="mini" v-model='msg.RB_Branch_Id'
<el-select filterable size="mini" v-model='msg.RB_Branch_Id'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>部门</em>
<el-select filterable size="mini" v-model='msg.RB_Department_Id'
<el-select filterable size="mini" v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
......@@ -175,7 +175,7 @@
</li>
<li>
<em>人员</em>
<el-select v-model="msg.EmployeeId" size="mini"
<el-select v-model="msg.EmployeeId" size="mini"
@change="handleCurrentChange(1)" :disabled="disabled" filterable>
<el-option label="不限" :value="-1"></el-option>
<el-option label="微途" :value="-2"></el-option>
......@@ -183,12 +183,12 @@
:value="item.empId"></el-option>
</el-select>
</li>
<li style="position: fixed;right: 0;top: 51px;">
<input type="button" class="normalBtn" value="导出" @click="exportExcel">
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
......@@ -238,7 +238,7 @@
import moment from "moment"
export default {
components:{
},
data() {
return {
......@@ -254,7 +254,7 @@
RB_Branch_Id: -1,//公司ID
OutBranchId: -1,//出团公司ID
},
loading: false,
//数据源
dataList: [],
......@@ -289,18 +289,15 @@
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.GetCommissionPeroidsList()//期数
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
......@@ -308,12 +305,16 @@
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
// this.msg.RB_Department_Id = -1
this.msg.EmployeeId = -1
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{
this.disabled = true;
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
}
this.GetCommissionPeroidsList()//期数
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
},
methods: {
getDepartment() {
......@@ -323,7 +324,7 @@
this.departmentList = res.data.data;
}
}, err => {})
},
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
......@@ -338,7 +339,7 @@
if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){
this.msg.PeriodsId = this.PeroidsList[0].Id
this.msg.PeriodsId = this.PeroidsList[0].ID
}
this.getList()
} else {
......@@ -376,7 +377,7 @@
query: {
PeriodId: this.$route.query.PeriodId,
// OutBranchId: item.RB_Branch_Id,
UserId: item.EmployeeId,
UserId: item.EmployeeId,
blank: 'y',
tab: '同业提现详情'
}
......@@ -410,4 +411,4 @@
}
}
</script>
\ No newline at end of file
</script>
src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue
View file @ 72260c57
......@@ -157,13 +157,9 @@
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{
this.disabled = true;
// this.msg.UserId = Number(userInfo.EmployeeId)
if(!this.$route.query.UserId){
this.msg.UserId = Number(userInfo.EmployeeId)
}else{
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
}
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
}
this.msg.Type = this.$route.query.Type?this.$route.query.Type:''
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.getqishilist()
this.getCompanyList()//获取公司
......
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @ 72260c57
......@@ -136,9 +136,10 @@
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
this.disabled = false;
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{
this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId)
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
}
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.getList();
......
src/components/temp/components/progressComm.vue
View file @ 72260c57
......@@ -119,7 +119,7 @@
methods: {
// 设置进度
setItemProgress(data) {
if(this.Profit&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
if(this.Profit>0&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
return data.EndValue<999999?this.Profit/data.StartValue:this.Profit/data.EndValue
}else{
return 0
......
src/components/temp/operation.vue
View file @ 72260c57
......@@ -172,7 +172,8 @@
flex-wrap: nowrap;
}
.ladder-form-box{
height: 92px;
/* height: 72px; */
padding: 0 0 10px 0;
overflow: auto;
display: flex;
flex-wrap: nowrap;
......@@ -271,8 +272,9 @@
</div>
<div style="display: flex;align-items: center; justify-content: space-between;padding: 20px 20px 0 20px;">
<div class="headerTitle">
<p><span>总订单数：</span> <span></span></p>
<p><span>总人头数：</span><span></span></p>
<!-- <p><span>总团队数：</span> <span>{{groupNum}}</span></p> -->
<p><span>总订单数：</span> <span>{{OrderNum}}</span></p>
<p><span>总人头数：</span><span>{{EopleNum}}</span></p>
<p><span>总预期奖金：</span><span>{{CommissionJJ}}</span></p>
<p><span>总预期提成：</span><span>{{CommissionTC}}</span></p>
</div>
......@@ -296,6 +298,9 @@
<span>
当月团数：<span>{{s.TravelNum}}</span>
</span>
<span>
单项订单数：<span>{{s.SingleOrderNum}}</span>
</span>
<span>
预期利润：<span>{{s.Profit}}</span>
</span>
......@@ -339,7 +344,7 @@
<span class="ProjectTitle">单项签证</span>
</div>
<div class="groupTourOrder">
<span>报名单数：<span>{{item.SingleVisa.OrderNum}}</span></span>
<span>订单数：<span>{{item.SingleVisa.OrderNum}}</span></span>
<span>预期利润：<span>{{item.SingleVisa.Profit}}</span></span>
<span>提成比例：<span>{{item.SingleVisa.Rate}}{{item.SingleVisa.Way==1?'元/人':'%'}}</span></span>
<span>预期提成：<span>{{item.SingleVisa.Commission}}</span></span>
......@@ -361,13 +366,13 @@
<span>公司所有国内出发线路(单团.散拚)</span></span>
</div>
<div class="groupTourOrder">
<span>订单数：<span>{{item.PeopleAward.TravelNum}}</span></span>
<span>团队数：<span>{{item.PeopleAward.TravelNum}}</span></span>
<span>人头数：<span>{{item.PeopleAward.PeopelNum}}</span></span>
<span>提成方式：<span>{{item.PeopleAward.Rate}}{{item.PeopleAward.Way==1?'元/人':'%'}}</span></span>
<span>预期提成：<span>{{item.PeopleAward.Commission}}</span></span>
</div>
</div>
<div>
<div v-if="!index">
<div style="display: flex;">
<div>
<div class="commissionProjectZL">
......@@ -526,6 +531,11 @@
export default {
data (){
return{
jianjin: 0,
yuqiticheng: 0,
groupNum: 0,
OrderNum:0,
EopleNum:0,
defaultHeadImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
data:{},
loading: true,
......@@ -602,18 +612,14 @@
}else if(type==3){//历史单项
name = 'ServiceCommissionUser'
}
if(type!=5&&name){
this.$router.push({
this.$router.push({
name: name,
query: {
UserId: Number(userInfo.EmployeeId),
Type: 2,
isSale: 1,
blank: 'y'
}
});
}
},
goMore(){
......@@ -621,9 +627,6 @@
name: 'TravelControlList',
query: {
blank: 'y',
// Q_IsCollect: "2",
// DepartSTime: this.commissionMsg.DepartSTime,
// DepartETime: this.commissionMsg.DepartETime
}
});
},
......@@ -635,16 +638,41 @@
this.msg.Month = this.Year+'-'+(this.LastMonthTime>10?this.LastMonthTime:'0'+this.LastMonthTime)
}
this.getList()
this.GetGNSaleExpectCommission()
},
// 获取规则列表数据
getList() {
this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
if (res.data.resultCode == 1) {
this.OrderNum = 0
this.groupNum = 0
this.EopleNum = 0
this.jianjin = 0
this.yuqiticheng = 0
this.dataRlueList = res.data.data.RlueList
this.dataRlueList.forEach(item=>{
this.groupNum += item.TravelAward.TravelNum
this.groupNum += item.PeopleAward.TravelNum
this.OrderNum += item.SingleVisa.OrderNum
this.jianjin += (item.TravelAward.AwardMoney*100)
this.yuqiticheng += (item.SingleVisa.Commission*100)
this.yuqiticheng += (item.TravelVisa.Commission*100)
this.yuqiticheng += (item.PeopleAward.Commission*100)
item.BranchList.forEach(s=>{
this.groupNum += s.TravelNum
this.OrderNum += s.SingleOrderNum
this.yuqiticheng += (s.Commission*100)
})
this.EopleNum += item.PeopleAward.PeopelNum
})
this.ZLOPAward = res.data.data.ZLOPAward
// console.log(res.data.data,'---')
this.OrderNum += this.ZLOPAward.SinglePeopleNum
this.yuqiticheng += (this.ZLOPAward.TravelCommission*100)
this.yuqiticheng += (this.ZLOPAward.SingleCommission*10)
this.yuqiticheng = this.yuqiticheng/100
this.jianjin = this.jianjin/100
this.GetGNSaleExpectCommission()
}else{
this.Error(res.data.message)
}
......@@ -657,12 +685,12 @@
res => {
if (res.data.resultCode == 1) {
this.DomesticLine = res.data.data
this.GNOrderNum = 0
this.GNEopleNum = 0
// this.GNOrderNum = 0
// this.GNEopleNum = 0
this.GNCommission = 0
this.DomesticLine.Rlist.forEach(item=>{
this.GNOrderNum+=Number(item.OrderNum)
this.GNEopleNum+=Number(item.PeopleNum)
// this.GNOrderNum+=Number(item.OrderNum)
// this.GNEopleNum+=Number(item.PeopleNum)
this.GNCommission+=Number(item.Commission)
})
......@@ -673,8 +701,8 @@
this.DomesticLine.Rlist[0],
this.DomesticLine.Rlist[1]]
this.newRlist = [this.DomesticLine.Rlist[2]]
let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
let arr1 =[this.jianjin]
let arr2 =[this.GNCommission,this.yuqiticheng]
this.CommissionJJ = this.CalculatePrice(arr1,0)
this.CommissionTC = this.CalculatePrice(arr2,2)
}
......@@ -685,7 +713,7 @@
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
if(data.length>5){
if(data&&data.length>5){
for(let i=0;i<5;i++){
this.OrderList.push(data[i])
}
......@@ -776,7 +804,6 @@
this.iWorkbench()
this.GetOrderPageList()
this.getList()
this.GetGNSaleExpectCommission()
},
}
......
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