Skip to content

S
SuperMan
Commit 875e2796 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents b3a01c6a a9d547d6
Show whitespace changes
Inline Side-by-side
Showing with 243 additions and 134 deletions
src/App.vue
View file @ 875e2796
......@@ -322,4 +322,11 @@
.cursor-p.active{
color: #409EFF;
}
.float-l{
float: left;
}
.width100-float-l{
width: 100%;
float: left;
}
</style>
src/components/FinancialModule/FinancialDocuments.vue
View file @ 875e2796
......@@ -590,6 +590,18 @@ input[type="number"] {
<el-option key="3" value="3" :label="$t('fnc.jylshuihao')"></el-option>
</el-select>
</span>
</li>
<li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
<span>
<em>{{$t('fnc.zdriqi')}}</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
<template v-if="heightQueryBox">
<li>
......@@ -730,7 +742,8 @@ input[type="number"] {
<el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
</span>
</li>
<li v-if="msg.Conditon==1">
<!-- 制单日期 -->
<!-- <li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
<span>
<em>{{$t('fnc.zdriqi')}}</em>
<el-date-picker class="h34"
......@@ -741,7 +754,7 @@ input[type="number"] {
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
</li> -->
<li v-if="msg.Conditon==2">
<span>
<em>{{$t('fnc.spriqi')}}</em>
......@@ -968,7 +981,8 @@ input[type="number"] {
<i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
@click="showjiaoyi(item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" content="手续费设置" placement="top" v-if="active==2 && istransaction == true && item.Type==1">
<el-tooltip class="item" content="手续费设置" placement="top"
v-if="active==2 && item.Type==1 &&(istransaction == true || isJapanCommission == true)">
<i class="iconfont icon-zhifupeizhiguanli"
@click="showTranTax(item.FrID,'1')"></i>
</el-tooltip>
......@@ -1499,6 +1513,7 @@ export default {
F_Update_CurrencyRate: false,
costmodeHL:false,
trabeListHL:[],//修改费率下拉数据
isJapanCommission: false
};
},
created() {
......@@ -1517,6 +1532,9 @@ export default {
if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
this.F_Update_CurrencyRate=true;
}
if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
this.isJapanCommission=true;
}
if (this.$route.query.returnCode) {
this.active = this.$route.query.returnCode;
this.msg.Conditon = this.$route.query.returnCode;
......@@ -1547,6 +1565,9 @@ export default {
"my-GZ-Bill": myGZBill
},
mounted() {
let StartDate = this.getBeforeDate(186,new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1,new Date().Format("yyyy-MM-dd"))
this.productionDate = [StartDate,EndDate]
this.GetAuth();
this.getCostTypeList();
let userInfo = this.getLocalStorage();
......
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @ 875e2796
......@@ -212,7 +212,8 @@
EmployeeId: -1,
PeriodsId: -1,
OrderType: -1,
Way: -1,
Way: '-1',
TCID: '',
TCNUM: '',
RB_Department_Id: -1,//部门ID
EmBranchId: -1,//公司ID
......@@ -267,7 +268,6 @@
this.getDepartment()
this.getCompany()
this.GetOrderTypeEnumList()
this.GetCommissionPeroidsList()//期数
},
mounted() {
let userInfo = this.getLocalStorage();
......@@ -285,7 +285,6 @@
}
}
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.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)
......@@ -482,9 +481,7 @@
"opcommission_GetNewOPCommissionPeroidsList",{},res => {
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.$route.query.PeriodId?Number(this.$route.query.PeriodId):this.PeroidsList[0].ID
this.getList()
} else {
this.Error(res.data.message);
......
src/components/FinancialModule/TradeCommission/commissionDialog.vue
View file @ 875e2796
......@@ -21,13 +21,18 @@
<template>
<div style="float: left;">
<span class="cF1416C"
:class="{'cursor-pointer':!type||(type=='跟团游订单'&&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'))
:class="{'cursor-pointer':!type||(type=='跟团游订单'&&
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.CreateTime?DetailsOfRoyalty():''">
<span class="fz15 fbold">
<!-- {{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>
<el-dialog width="1000px" title="提成详情" :visible.sync="outerVisible" center>
......@@ -54,19 +59,14 @@
<tr>
<th style="width: 100px;">出团公司</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: 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;" v-if="!OP">当月利润</th>
<th style="width: 100px;">{{OP?'':'团队'}}利润</th>
<th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th>
<th width='200'>备注</th>
......@@ -76,30 +76,32 @@
:key="index">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
<td>{{item.OrderTypeName}}</td>
<td>{{item.OrderId}}</td>
<td><span v-if="item.TCNUM">{{item.TCNUM}}({{item.TCID}})</span></td>
<!-- <td>{{item.BranchName?item.BranchName:'-'}}</td> -->
<!-- <td>{{item.DeptName?item.DeptName:'-'}}</td> -->
<td>{{OP?item.TCID:item.OrderId}}</td>
<td><span v-if="item.TCNUM">{{item.TCNUM}}<template v-if="!OP">({{item.TCID}})</template> </span></td>
<td>{{item.UserName}}</td>
<!-- <td>{{item.LineName}}</td> -->
<!-- <td>{{item.IsEurope==1?'是':'否'}}</td> -->
<td>{{item.PeopleNum}}</td>
<!-- <td>{{item.TCGuestNum}}</td> -->
<td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.Rate?item.Rate+'%':'-'}}</td>
<td>{{item.OrderProfit}}</td>
<td>{{OP?item.PeopleCount:item.PeopleNum}}</td>
<td>
<template v-if="OP">{{item.Way==1?'人头奖励':'利润比例'}}</template>
<template>{{item.Way==1?'销售额':'利润比'}}</template>
</td>
<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.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.Periods}}</td>
<td>{{OP?item.PeriodsReissue:item.Periods}}</td>
<td>{{item.Description?item.Description:'-'}}</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="13">暂无数据</td>
</tr>
</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"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
......@@ -117,7 +119,7 @@
<script>
export default {
props:['objNew','type'],
props:['objNew','type','OP'],
data() {
return {
dataObj:{},
......@@ -142,6 +144,7 @@
watch:{
objNew: {
handler(val, oldVal) {
this.objNew = val
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
},
......@@ -155,8 +158,14 @@
methods: {
goUrl(){
this.outerVisible = false
let name
if(this.OP){
name = 'OpComPersonDetails'
}else{
name = 'TradeTicketUserDetails'
}
this.$router.push({
path: 'TradeTicketUserDetails',
path: name,
query: {
blank: 'y',
tab: '提成明细'
......@@ -170,6 +179,14 @@
// 获取员工生成比例
getList(){
this.loading = true
if(!this.OP){
this.GetTYSaleCommission()
}else{
this.GetNewOPCommission()
}
},
// 销售提成
GetTYSaleCommission(){
this.apipost("sellcommission_GetTYSaleCommissionSingleDetailsList",this.msg,res => {
if (res.data.resultCode == 1) {
this.loading = false
......@@ -183,6 +200,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) {
this.msg.pageIndex = val;
this.getList();
......
src/components/Hotel/reservation/OrderList.vue
View file @ 875e2796
......@@ -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>
</template>
</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">
<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>
</el-table-column>
</el-table>
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 875e2796
......@@ -1467,9 +1467,16 @@
<p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">
<span style="float: left;">{{$t('salesModule.Commission')}}：</span>
<commissionDialog :objNew="item"></commissionDialog>
<p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)' style="color:red">
<template v-if="item.commissionMoney&&item.commissionMoney>0">
<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}} -->
</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 875e2796
......@@ -610,10 +610,17 @@
</span>
</template>
</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">
<span class="cF1416C" style="float: left;">￥</span>
<commissionDialog :objNew="scope.row"></commissionDialog>
<div class="width100-float-l" v-if="item.commissionMoney&&item.commissionMoney>0">
<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>
</el-table-column>
<template slot="append" >
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ 875e2796
......@@ -603,9 +603,16 @@
<span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
</template>
</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">
<commissionDialog :objNew="scope.row"></commissionDialog>
<div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0">
<span class="float-l">销售：</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>
<commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
</div>
</template>
</el-table-column>
<el-table-column label="出票状态" style="background:#EAEAEA">
......@@ -1440,4 +1447,3 @@
</script>
<style></style>
\ No newline at end of file
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 875e2796
......@@ -663,12 +663,17 @@
</template>
</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="提成"
style="background: #eaeaea"
>
<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>
</el-table-column>
</el-table>
......@@ -1612,4 +1617,3 @@ export default {
</script>
<style></style>
\ No newline at end of file
src/components/scenicSpot/reservation/OrderList.vue
View file @ 875e2796
......@@ -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>
</template>
</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">
<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>
</el-table-column>
</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