Skip to content

S
SuperMan
Commit 7f8226ff authored by youjie's avatar youjie
Browse files
Options

no message

parent 727ffaae
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 103 deletions
src/App.vue
View file @ 7f8226ff
...@@ -322,4 +322,11 @@ ...@@ -322,4 +322,11 @@
.cursor-p.active{ .cursor-p.active{
color: #409EFF; color: #409EFF;
} }
.float-l{
float: left;
}
.width100-float-l{
width: 100%;
float: left;
}
</style> </style>
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @ 7f8226ff
...@@ -212,7 +212,8 @@ ...@@ -212,7 +212,8 @@
EmployeeId: -1, EmployeeId: -1,
PeriodsId: -1, PeriodsId: -1,
OrderType: -1, OrderType: -1,
Way: -1, Way: '-1',
TCID: '',
TCNUM: '', TCNUM: '',
RB_Department_Id: -1,//部门ID RB_Department_Id: -1,//部门ID
EmBranchId: -1,//公司ID EmBranchId: -1,//公司ID
...@@ -267,7 +268,6 @@ ...@@ -267,7 +268,6 @@
this.getDepartment() this.getDepartment()
this.getCompany() this.getCompany()
this.GetOrderTypeEnumList() this.GetOrderTypeEnumList()
this.GetCommissionPeroidsList()//期数
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -285,7 +285,6 @@ ...@@ -285,7 +285,6 @@
} }
} }
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:'' this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1 this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id) this.msg.EmBranchId = this.$route.query.RB_Branch_Id?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)
...@@ -482,9 +481,7 @@ ...@@ -482,9 +481,7 @@
"opcommission_GetNewOPCommissionPeroidsList",{},res => { "opcommission_GetNewOPCommissionPeroidsList",{},res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data; this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){ this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):this.PeroidsList[0].ID
this.msg.PeriodsId = this.PeroidsList[0].Id
}
this.getList() this.getList()
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
src/components/FinancialModule/TradeCommission/commissionDialog.vue
View file @ 7f8226ff
...@@ -21,13 +21,18 @@ ...@@ -21,13 +21,18 @@
<template> <template>
<div style="float: left;"> <div style="float: left;">
<span class="cF1416C" <span class="cF1416C"
:class="{'cursor-pointer':!type||(type=='跟团游订单'&&objNew.startDate&&objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))}" :class="{'cursor-pointer':!type||(type=='跟团游订单'&&
@click="!type||(type=='跟团游订单'&&objNew.startDate&&objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd')) objNew.startDate&&
objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))}"
@click="!type||(type=='跟团游订单'&&
objNew.startDate&&
objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||objNew.createDate ||objNew.createDate
||objNew.CreateTime?DetailsOfRoyalty():''"> ||objNew.CreateTime?DetailsOfRoyalty():''">
<span class="fz15 fbold"> <span class="fz15 fbold">
<!-- {{objNew.commissionCurrency?objNew.commissionCurrency:objNew.CurrencyName!='人民币'?objNew.CurrencyName:'￥'}} --> <!-- {{objNew.commissionCurrency?objNew.commissionCurrency:objNew.CurrencyName!='人民币'?objNew.CurrencyName:'￥'}} -->
{{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }} <template v-if="OP">{{ moneyFormat(objNew.OPCommission) }} </template>
<template v-else>{{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }}</template>
</span> </span>
</span> </span>
<el-dialog width="1000px" title="提成详情" :visible.sync="outerVisible" center> <el-dialog width="1000px" title="提成详情" :visible.sync="outerVisible" center>
...@@ -54,19 +59,19 @@ ...@@ -54,19 +59,19 @@
<tr> <tr>
<th style="width: 100px;">出团公司</th> <th style="width: 100px;">出团公司</th>
<th style="width: 80px;">类型</th> <th style="width: 80px;">类型</th>
<th style="width: 80px;">订单号</th> <th style="width: 80px;">{{OP?'团/订单':'订单号'}}</th>
<th style="width: 150px;">团号</th> <th style="width: 150px;">团号</th>
<!-- <th style="width: 100px;">所属公司</th> --> <!-- <th style="width: 100px;">所属公司</th> -->
<!-- <th style="width: 100px;">部门</th> --> <!-- <th style="width: 100px;">部门</th> -->
<th style="width: 100px;">姓名</th> <th style="width: 100px;">姓名</th>
<!-- <th style="width: 100px;">线路</th> --> <!-- <th style="width: 100px;">线路</th> -->
<!-- <th style="width: 100px;">是否欧洲订单</th> --> <!-- <th style="width: 100px;">是否欧洲订单</th> -->
<th style="width: 100px;">订单人数</th> <th style="width: 100px;">{{OP?'':'订单'}}人数</th>
<!-- <th style="width: 100px;">团队总人数</th> --> <!-- <th style="width: 100px;">团队总人数</th> -->
<th style="width: 100px;">提成方式</th> <th style="width: 100px;">提成方式</th>
<th style="width: 100px;">提成比例</th> <th style="width: 100px;">提成比例</th>
<th style="width: 100px;">当月利润</th> <th style="width: 100px;" v-if="!OP">当月利润</th>
<th style="width: 100px;">团队利润</th> <th style="width: 100px;">{{OP?'':'团队'}}利润</th>
<th style="width: 100px;">提成金额</th> <th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th> <th style="width: 100px;">期数</th>
<th width='200'>备注</th> <th width='200'>备注</th>
...@@ -76,30 +81,32 @@ ...@@ -76,30 +81,32 @@
:key="index"> :key="index">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td> <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
<td>{{item.OrderTypeName}}</td> <td>{{item.OrderTypeName}}</td>
<td>{{item.OrderId}}</td> <td>{{OP?item.TCID:item.OrderId}}</td>
<td><span v-if="item.TCNUM">{{item.TCNUM}}({{item.TCID}})</span></td> <td><span v-if="item.TCNUM">{{item.TCNUM}}<template v-if="!OP">({{item.TCID}})</template> </span></td>
<!-- <td>{{item.BranchName?item.BranchName:'-'}}</td> -->
<!-- <td>{{item.DeptName?item.DeptName:'-'}}</td> -->
<td>{{item.UserName}}</td> <td>{{item.UserName}}</td>
<!-- <td>{{item.LineName}}</td> --> <td>{{OP?item.PeopleCount:item.PeopleNum}}</td>
<!-- <td>{{item.IsEurope==1?'是':'否'}}</td> --> <td>
<td>{{item.PeopleNum}}</td> <template v-if="OP">{{item.Way==1?'人头奖励':'利润比例'}}</template>
<!-- <td>{{item.TCGuestNum}}</td> --> <template>{{item.Way==1?'销售额':'利润比'}}</template>
<td>{{item.Way==1?'销售额':'利润比'}}</td> </td>
<td>{{item.Rate?item.Rate+'%':'-'}}</td> <td>
<td>{{item.OrderProfit}}</td> <template v-if="OP">
{{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'/人':'-'}}
</template>
<template v-else>
{{item.Rate?item.Rate+'%':'-'}}
</template>
</td>
<td v-if="!OP">{{item.OrderProfit}}</td>
<td>{{item.TCProfit}}</td> <td>{{item.TCProfit}}</td>
<td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td> <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.Periods}}</td> <td>{{OP?item.PeriodsReissue:item.Periods}}</td>
<td>{{item.Description?item.Description:'-'}}</td> <td>{{item.Description?item.Description:'-'}}</td>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td style="text-align:center" colspan="13">暂无数据</td> <td style="text-align:center" colspan="13">暂无数据</td>
</tr> </tr>
</table> </table>
<!-- <div v-if="dataList.length==0"
style="width: 100%;border:1px solid #fff;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>暂无数据</div> -->
<!-- 分页 --> <!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
...@@ -117,7 +124,7 @@ ...@@ -117,7 +124,7 @@
<script> <script>
export default { export default {
props:['objNew','type'], props:['objNew','type','OP'],
data() { data() {
return { return {
dataObj:{}, dataObj:{},
...@@ -142,6 +149,7 @@ ...@@ -142,6 +149,7 @@
watch:{ watch:{
objNew: { objNew: {
handler(val, oldVal) { handler(val, oldVal) {
this.objNew = val
this.msg.OrderId = val.id?val.id:val.OrderId?val.OrderId:val.orderId this.msg.OrderId = val.id?val.id:val.OrderId?val.OrderId:val.orderId
this.msg.PeriodId = this.$route.query.PeriodId?this.$route.query.PeriodId:-1 this.msg.PeriodId = this.$route.query.PeriodId?this.$route.query.PeriodId:-1
}, },
...@@ -155,8 +163,14 @@ ...@@ -155,8 +163,14 @@
methods: { methods: {
goUrl(){ goUrl(){
this.outerVisible = false this.outerVisible = false
let name
if(this.OP){
name = 'OpComPersonDetails'
}else{
name = 'TradeTicketUserDetails'
}
this.$router.push({ this.$router.push({
path: 'TradeTicketUserDetails', path: name,
query: { query: {
blank: 'y', blank: 'y',
tab: '提成明细' tab: '提成明细'
...@@ -170,6 +184,14 @@ ...@@ -170,6 +184,14 @@
// 获取员工生成比例 // 获取员工生成比例
getList(){ getList(){
this.loading = true this.loading = true
if(!this.OP){
this.GetTYSaleCommission()
}else{
this.GetNewOPCommission()
}
},
// 销售提成
GetTYSaleCommission(){
this.apipost("sellcommission_GetTYSaleCommissionSingleDetailsList",this.msg,res => { this.apipost("sellcommission_GetTYSaleCommissionSingleDetailsList",this.msg,res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false this.loading = false
...@@ -183,6 +205,39 @@ ...@@ -183,6 +205,39 @@
} }
); );
}, },
// op提成
GetNewOPCommission(){
let msg = {
pageIndex: 1,
pageSize: 5,
EmployeeId: -1,
PeriodsId: -1,
OrderType: -1,
Way: -1,
TCID: this.objNew.OrderId,
TCNUM: '',
RB_Department_Id: -1,//部门ID
EmBranchId: -1,//公司ID
RB_Branch_Id: -1,//出团公司ID
}
if (msg.TCID == '') {
msg.TCID = 0
}
this.apipost(
"opcommission_GetNewOPCommissionDetailsPageList",
msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataObj = res.data.data
this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count;
} else {
this.Error(res.data.message);
}
}
);
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
......
src/components/Hotel/reservation/OrderList.vue
View file @ 7f8226ff
...@@ -535,9 +535,14 @@ ...@@ -535,9 +535,14 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span> <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA"> <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog> <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
<commissionDialog :objNew="item" :OP="0"></commissionDialog>
</div>
<div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
<commissionDialog :objNew="item" :OP="1"></commissionDialog>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 7f8226ff
...@@ -1467,9 +1467,16 @@ ...@@ -1467,9 +1467,16 @@
<p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p> <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p> <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p> <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red"> <p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)' style="color:red">
<span style="float: left;">{{$t('salesModule.Commission')}}：</span> <template v-if="item.commissionMoney&&item.commissionMoney>0">
<commissionDialog :objNew="item"></commissionDialog> <span style="float: left;">销售{{$t('salesModule.Commission')}}：</span>
<commissionDialog :objNew="item" :OP="0"></commissionDialog>
</template>
<template v-if="item.opcommission&&item.opcommission>0">
<span style="float: left; margin-left: 10px;">OP提成：</span>
<commissionDialog :objNew="item" :OP="1"></commissionDialog>
</template>
<!-- {{item.commissionMoney}} --> <!-- {{item.commissionMoney}} -->
</p> </p>
<p v-else-if="item.latestCommissionMoney" style="color:red"> <p v-else-if="item.latestCommissionMoney" style="color:red">
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 7f8226ff
...@@ -610,10 +610,17 @@ ...@@ -610,10 +610,17 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA"> <el-table-column label="提成" style="background:#EAEAEA"
v-if="(item.commissionMoney&&item.commissionMoney>0)||(item.opCommission&&item.opCommission>0)">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="cF1416C" style="float: left;">￥</span> <div class="width100-float-l" v-if="item.commissionMoney&&item.commissionMoney>0">
<commissionDialog :objNew="scope.row"></commissionDialog> <span class="float-l">销售：<span class="cF1416C">￥</span></span>
<commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
</div>
<div class="width100-float-l" v-if="item.opCommission&&item.opCommission>0">
<span class="float-l">OP：<span class="cF1416C">￥</span></span>
<commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
</div>
</template> </template>
</el-table-column> </el-table-column>
<template slot="append" > <template slot="append" >
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 7f8226ff
...@@ -663,12 +663,17 @@ ...@@ -663,12 +663,17 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.SellCommission && item.SellCommission > 0" v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)"
label="提成" label="提成"
style="background: #eaeaea" style="background: #eaeaea"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog> <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
<commissionDialog :objNew="item" :OP="0"></commissionDialog>
</div>
<div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
<commissionDialog :objNew="item" :OP="1"></commissionDialog>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -1612,4 +1617,3 @@ export default { ...@@ -1612,4 +1617,3 @@ export default {
</script> </script>
<style></style> <style></style>
\ No newline at end of file
src/components/scenicSpot/reservation/OrderList.vue
View file @ 7f8226ff
...@@ -625,9 +625,14 @@ ...@@ -625,9 +625,14 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span> <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA"> <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<commissionDialog :objNew="item"></commissionDialog> <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
<commissionDialog :objNew="item" :OP="0"></commissionDialog>
</div>
<div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
<commissionDialog :objNew="item" :OP="1"></commissionDialog>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
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