Skip to content

S
SuperMan
Commit cb9f45b6 authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' into month

parents 6d04730f f1d78b81
Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 172 deletions
src/App.vue
View file @ cb9f45b6
...@@ -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 @ cb9f45b6
...@@ -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/ServiceCommission/ServiceCommissionUser.vue
View file @ cb9f45b6
...@@ -164,9 +164,7 @@ ...@@ -164,9 +164,7 @@
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)
} }
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
this.getEmployee()//人员 this.getEmployee()//人员
......
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ cb9f45b6
...@@ -345,7 +345,6 @@ ...@@ -345,7 +345,6 @@
// }); // });
}, },
clickUrl(row,type){ clickUrl(row,type){
console.log(row.OrderType,'----')
let data = [{ let data = [{
path: "", path: "",
OrderId: row.OrderId, OrderId: row.OrderId,
......
src/components/FinancialModule/TradeCommission/commissionDialog.vue
View file @ cb9f45b6
...@@ -20,14 +20,19 @@ ...@@ -20,14 +20,19 @@
</style> </style>
<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>
...@@ -36,11 +41,11 @@ ...@@ -36,11 +41,11 @@
class="cm_content" class="cm_content"
style="width: 100%;margin-bottom: 35px; " style="width: 100%;margin-bottom: 35px; "
> >
<div style="margin-bottom: 20px;display: flex;justify-content: space-between;"> <div style="margin-bottom: 20px;display: flex;justify-content: space-between;">
<div> <div>
<span>总人数：{{dataObj.TotalNum}}</span> <span>总人数：{{dataObj.TotalNum}}</span>
<span style="margin-left: 20px;">总提成：{{dataObj.TotalMoney}}</span> <span style="margin-left: 20px;">总提成：{{dataObj.TotalMoney}}</span>
</div> </div>
<input type="button" class="normalBtn" value="查看提成明细" <input type="button" class="normalBtn" value="查看提成明细"
@click="goUrl" /> @click="goUrl" />
...@@ -54,58 +59,55 @@ ...@@ -54,58 +59,55 @@
<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;">{{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;">当月利润</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>
</tr> </tr>
<tr v-for="(item,index) in dataList" <tr v-for="(item,index) in dataList"
: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'>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp; <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
...@@ -117,7 +119,7 @@ ...@@ -117,7 +119,7 @@
<script> <script>
export default { export default {
props:['objNew','type'], props:['objNew','type','OP'],
data() { data() {
return { return {
dataObj:{}, dataObj:{},
...@@ -142,6 +144,7 @@ ...@@ -142,6 +144,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
}, },
...@@ -150,13 +153,19 @@ ...@@ -150,13 +153,19 @@
}, },
}, },
mounted() { mounted() {
}, },
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,19 +179,60 @@ ...@@ -170,19 +179,60 @@
// 获取员工生成比例 // 获取员工生成比例
getList(){ getList(){
this.loading = true this.loading = true
this.apipost("sellcommission_GetTYSaleCommissionSingleDetailsList",this.msg,res => { if(!this.OP){
if (res.data.resultCode == 1) { this.GetTYSaleCommission()
this.loading = false }else{
this.dataObj = res.data.data this.GetNewOPCommission()
this.dataList = res.data.data.pmodel.pageData; }
this.total = res.data.data.pmodel.count;
} else {
this.loading = false
this.Error(res.data.message);
}
}
);
}, },
// 销售提成
GetTYSaleCommission(){
this.apipost("sellcommission_GetTYSaleCommissionSingleDetailsList",this.msg,res => {
if (res.data.resultCode == 1) {
this.loading = false
this.dataObj = res.data.data
this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count;
} else {
this.loading = false
this.Error(res.data.message);
}
}
);
},
// 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();
...@@ -190,4 +240,4 @@ ...@@ -190,4 +240,4 @@
} }
} }
</script> </script>
\ No newline at end of file
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @ cb9f45b6
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<td>{{item.PeopleCount}}</td> <td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td> <td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
<td> <td>
...@@ -140,9 +140,7 @@ ...@@ -140,9 +140,7 @@
this.disabled = true; this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId) this.msg.UserId = Number(userInfo.EmployeeId)
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getList(); this.getList();
// this.getqishilist() // this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
...@@ -233,7 +231,7 @@ ...@@ -233,7 +231,7 @@
PeriodId: this.$route.query.PeriodId, PeriodId: this.$route.query.PeriodId,
UserId:item.UserId, UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id:item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
...@@ -260,4 +258,4 @@ ...@@ -260,4 +258,4 @@
} }
} }
</script> </script>
\ No newline at end of file
src/components/FinancialModule/domesticCommissionUser.vue
View file @ cb9f45b6
...@@ -160,9 +160,7 @@ ...@@ -160,9 +160,7 @@
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)
} }
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
......
src/components/FinancialModule/domesticCommissionUserTW.vue
View file @ cb9f45b6
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<th>销售</th> <th>销售</th>
<th>团的数量</th> <th>团的数量</th>
<th>提成金额</th> <th>提成金额</th>
<th>期数</th> <th>期数</th>
...@@ -142,9 +142,7 @@ ...@@ -142,9 +142,7 @@
this.disabled = true; this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId) this.msg.UserId = Number(userInfo.EmployeeId)
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getList(); this.getList();
// this.getqishilist() // this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
...@@ -235,7 +233,7 @@ ...@@ -235,7 +233,7 @@
PeriodId: this.$route.query.PeriodId, PeriodId: this.$route.query.PeriodId,
UserId:item.UserId, UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id:item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
...@@ -262,4 +260,4 @@ ...@@ -262,4 +260,4 @@
} }
} }
</script> </script>
\ No newline at end of file
src/components/FinancialModule/domesticCommissionUserTW2.vue
View file @ cb9f45b6
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</li> </li>
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder"> :disabled="S_CheckBranchOrder">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
...@@ -60,13 +60,13 @@ ...@@ -60,13 +60,13 @@
:value="item.DepartmentID"></el-option> :value="item.DepartmentID"></el-option>
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<div style="display: flex;align-items: center;height: 50px;justify-content: space-between;"> <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
<div style="display: flex;align-items: center;"></div> <div style="display: flex;align-items: center;"></div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<th>销售</th> <th>销售</th>
<!-- <th>团的数量</th> --> <!-- <th>团的数量</th> -->
<th>提成金额</th> <th>提成金额</th>
<th>地接奖金</th> <th>地接奖金</th>
<th>年终奖金</th> <th>年终奖金</th>
...@@ -160,9 +160,7 @@ ...@@ -160,9 +160,7 @@
this.S_CheckBranchOrder = true this.S_CheckBranchOrder = true
this.msg.OutBranchId = userInfo.RB_Branch_id this.msg.OutBranchId = userInfo.RB_Branch_id
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
if (this.$route.query && this.$route.query.OutBranchId) { if (this.$route.query && this.$route.query.OutBranchId) {
this.msg.OutBranchId = this.$route.query.OutBranchId this.msg.OutBranchId = this.$route.query.OutBranchId
} }
...@@ -262,7 +260,7 @@ ...@@ -262,7 +260,7 @@
PeriodId: this.$route.query.PeriodId, PeriodId: this.$route.query.PeriodId,
UserId:item.UserId, UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id:item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
...@@ -300,4 +298,4 @@ ...@@ -300,4 +298,4 @@
} }
} }
</script> </script>
\ No newline at end of file
src/components/Hotel/reservation/OrderList.vue
View file @ cb9f45b6
...@@ -510,7 +510,7 @@ ...@@ -510,7 +510,7 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span> <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="手配费应收" min-width="100"> <!-- <el-table-column label="手配费应收" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ <span class="fz15 fbold">{{
...@@ -535,14 +535,19 @@ ...@@ -535,14 +535,19 @@
<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>
<div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3"> <div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
<div class="row pt20" style="margin-right: 10px;width: 300px;" <div class="row pt20" style="margin-right: 10px;width: 300px;"
v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)"> v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)">
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> --> <!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<div class="column"> <div class="column">
...@@ -580,10 +585,10 @@ ...@@ -580,10 +585,10 @@
</div> </div>
<div class="row fz12 see-rec mt"> <div class="row fz12 see-rec mt">
<el-upload ref="my-upload" :http-request="uploadFileBtn" v-loading="loading" <el-upload ref="my-upload" :http-request="uploadFileBtn" v-loading="loading"
:multiple="true" :multiple="true"
:show-file-list="false" action=""> :show-file-list="false" action="">
<div :class="{'cursor-pointer seeLK c059FF6':!loading, <div :class="{'cursor-pointer seeLK c059FF6':!loading,
'cursor-pointer see c04C8C8':loading}" 'cursor-pointer see c04C8C8':loading}"
@click="uploadOrderId=item.OrderId">上车旅客名单</div> @click="uploadOrderId=item.OrderId">上车旅客名单</div>
</el-upload> </el-upload>
</div> </div>
...@@ -594,7 +599,7 @@ ...@@ -594,7 +599,7 @@
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.IncomeList" v-for="(x, i) in item.IncomeList"
...@@ -622,7 +627,7 @@ ...@@ -622,7 +627,7 @@
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.RefundList" v-for="(x, i) in item.RefundList"
...@@ -650,7 +655,7 @@ ...@@ -650,7 +655,7 @@
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.CostList" v-for="(x, i) in item.CostList"
...@@ -677,7 +682,7 @@ ...@@ -677,7 +682,7 @@
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.HandFittingFinanceList" v-for="(x, i) in item.HandFittingFinanceList"
...@@ -973,7 +978,7 @@ export default { ...@@ -973,7 +978,7 @@ export default {
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
}, },
OrderList:{ OrderList:{
handler(val, oldVal){ handler(val, oldVal){
...@@ -1006,7 +1011,7 @@ export default { ...@@ -1006,7 +1011,7 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.cdState = true this.cdState = true
},100) },100)
}, },
editRemark(item){ editRemark(item){
this.postMsg.OrderId = item.OrderId this.postMsg.OrderId = item.OrderId
...@@ -1044,7 +1049,7 @@ export default { ...@@ -1044,7 +1049,7 @@ export default {
} }
}) })
} }
}, },
uploadFileBtn(file){ uploadFileBtn(file){
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase(); let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
...@@ -1210,7 +1215,7 @@ export default { ...@@ -1210,7 +1215,7 @@ export default {
this.Error(res.data.message); this.Error(res.data.message);
} }
}).catch(err=>{ }).catch(err=>{
this.Error(err.message) this.Error(err.message)
this.loading0= false this.loading0= false
}) })
}).catch(()=>{ }).catch(()=>{
...@@ -1260,9 +1265,9 @@ export default { ...@@ -1260,9 +1265,9 @@ export default {
this.loading0 = false; this.loading0 = false;
} }
); );
}, },
saveUpdate() { saveUpdate() {
this.$confirm("是否确认设置收损?", "提示", { this.$confirm("是否确认设置收损?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ cb9f45b6
...@@ -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">
...@@ -3409,7 +3416,7 @@ ...@@ -3409,7 +3416,7 @@
} }
}) })
}, },
cancelSubmit() { cancelSubmit() {
this.isShowLayer = false this.isShowLayer = false
this.$refs['addMsg'].resetFields() this.$refs['addMsg'].resetFields()
......
src/components/SalesModule/productOrderList.vue
View file @ cb9f45b6
...@@ -407,8 +407,9 @@ ...@@ -407,8 +407,9 @@
}, },
// 线路 // 线路
getLineList() { getLineList() {
this.apipost("line_post_GetAllList_V2", { // LineDirection: 0
LineDirection: 0 this.apipost("line_post_GetAllList_V3", {
IsShow: -1
}, (res) => { }, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.LineList = res.data.data;
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ cb9f45b6
...@@ -528,12 +528,12 @@ ...@@ -528,12 +528,12 @@
<span class="mr">{{ item.createName }}</span> <span class="mr">{{ item.createName }}</span>
<el-image class="mr" v-if="item.createPhoto" <el-image class="mr" v-if="item.createPhoto"
style="width: 20px; height: 20px;border-radius: 50%;" style="width: 20px; height: 20px;border-radius: 50%;"
:src="item.createPhoto" :src="item.createPhoto"
:preview-src-list="[item.createPhoto]"> :preview-src-list="[item.createPhoto]">
</el-image> </el-image>
</template> </template>
</div> </div>
<span>下单时间：</span> <span>下单时间：</span>
<span>{{ item.createTime }}</span> <span>{{ item.createTime }}</span>
</div> </div>
...@@ -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" >
...@@ -634,7 +641,7 @@ ...@@ -634,7 +641,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="row justify-sb"> <div class="row justify-sb">
<div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative" style="min-width: 200px;max-width: 400px;"> <div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative" style="min-width: 200px;max-width: 400px;">
<div class="row-c"> <div class="row-c">
...@@ -734,13 +741,13 @@ ...@@ -734,13 +741,13 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</el-table> </el-table>
</div> </div>
</div> </div>
<div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''"> <div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
<p class="_tit">{{$t('salesModule.UpOrder')}} <p class="_tit">{{$t('salesModule.UpOrder')}}
...@@ -891,7 +898,7 @@ export default { ...@@ -891,7 +898,7 @@ export default {
userInfo: {}, userInfo: {},
qjGroupId: -1, qjGroupId: -1,
F_InvoiceManagement: false, F_InvoiceManagement: false,
F_Finance_Create: false, F_Finance_Create: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 12, pageSize: 12,
...@@ -981,7 +988,7 @@ export default { ...@@ -981,7 +988,7 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.cdState = true this.cdState = true
},100) },100)
}, },
PerferPrice() { PerferPrice() {
this.apipost('dmc_get_visa_SetVisaOrderPrice', this.EditMsg, res => { this.apipost('dmc_get_visa_SetVisaOrderPrice', this.EditMsg, res => {
...@@ -1237,7 +1244,7 @@ export default { ...@@ -1237,7 +1244,7 @@ export default {
this.addMsg.EnterCountryFlight = x[0].EnterCountryFlight this.addMsg.EnterCountryFlight = x[0].EnterCountryFlight
this.addMsg.LeaveCountryFlight = x[0].LeaveCountryFlight this.addMsg.LeaveCountryFlight = x[0].LeaveCountryFlight
this.addMsg.VisaPlanId = x[0].VisaPlanId this.addMsg.VisaPlanId = x[0].VisaPlanId
//this.addMsg.DepartDate=x[0].DepartDate //this.addMsg.DepartDate=x[0].DepartDate
this.addMsg.ClientType = x[0].ClientType.toString() this.addMsg.ClientType = x[0].ClientType.toString()
} }
...@@ -1324,7 +1331,7 @@ export default { ...@@ -1324,7 +1331,7 @@ export default {
SourceID: row.visaId, SourceID: row.visaId,
TCIDList: TCIDARR, TCIDList: TCIDARR,
ReFinanceId2: num, ReFinanceId2: num,
MatchFrId:0 MatchFrId:0
} }
let query = {}; let query = {};
query = { query = {
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ cb9f45b6
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
.cff9800 { .cff9800 {
color: #ff9800; color: #ff9800;
} }
.cF1416C { .cF1416C {
color: #f1416c; color: #f1416c;
} }
...@@ -449,17 +449,17 @@ ...@@ -449,17 +449,17 @@
} }
/deep/.el-table tr:last-child td{ /deep/.el-table tr:last-child td{
border-bottom: 1px solid #EBEEF5; border-bottom: 1px solid #EBEEF5;
} }
/deep/.el-table tr td{ /deep/.el-table tr td{
border-bottom: 1px solid #EBEEF5; border-bottom: 1px solid #EBEEF5;
} }
.cp{ .cp{
cursor: pointer; cursor: pointer;
} }
</style> </style>
<template> <template>
<div> <div>
<div <div
...@@ -492,7 +492,7 @@ ...@@ -492,7 +492,7 @@
(items.Id==3?'three': (items.Id==3?'three':
(items.Id==4?'four': (items.Id==4?'four':
(items.Id==5?'five':'')))),{'line-through':items.show}]" (items.Id==5?'five':'')))),{'line-through':items.show}]"
v-for="(items,i) in item.MultipleChoiceList">{{items.Name}}</span> --> v-for="(items,i) in item.MultipleChoiceList">{{items.Name}}</span> -->
</div> </div>
<div class="c9e fz12"> <div class="c9e fz12">
...@@ -603,14 +603,21 @@ ...@@ -603,14 +603,21 @@
<span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span> <span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</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="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> </template>
</el-table-column> </el-table-column>
<el-table-column label="出票状态" style="background:#EAEAEA"> <el-table-column label="出票状态" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''" <span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''"
class="cp tatusText" class="cp tatusText"
:class="item.TicketStatus==1?'grey': :class="item.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success': (scope.row.TicketStatus==2?'success':
...@@ -619,21 +626,21 @@ ...@@ -619,21 +626,21 @@
(scope.row.TicketStatus==5?'Black':''))))"> (scope.row.TicketStatus==5?'Black':''))))">
{{item.TicketStatusName}} {{item.TicketStatusName}}
</span> </span>
<!-- <i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'" <!-- <i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'"
class="c3FC4FF cursor-pointer el-icon-document-checked" class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="viewCredentials(scope.row)"></i> --> @click="viewCredentials(scope.row)"></i> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="签证状态" style="background:#EAEAEA"> <el-table-column label="签证状态" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''" <span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
class="tatusText" class="tatusText"
:class="scope.row.VisaStatus==1?'grey'+' cursor-pointer': :class="scope.row.VisaStatus==1?'grey'+' cursor-pointer':
(scope.row.VisaStatus==2?'success': (scope.row.VisaStatus==2?'success':
(scope.row.VisaStatus==0?'Black':''))"> (scope.row.VisaStatus==0?'Black':''))">
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}} {{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
</span> </span>
<i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked" <i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="CheckOutDetails(scope.row)"></i> @click="CheckOutDetails(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
...@@ -643,7 +650,7 @@ ...@@ -643,7 +650,7 @@
style="background:#EAEAEA" style="background:#EAEAEA"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<input type="button" class="normalBtn" value="查看" <input type="button" class="normalBtn" value="查看"
@click="goDetails(scope.row)" /> @click="goDetails(scope.row)" />
</template> </template>
</el-table-column> !--> </el-table-column> !-->
...@@ -686,7 +693,7 @@ ...@@ -686,7 +693,7 @@
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2, :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" 'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.IncomeFinance" v-for="(x, i) in item.IncomeFinance"
...@@ -714,7 +721,7 @@ ...@@ -714,7 +721,7 @@
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2, :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" 'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.BackFinance" v-for="(x, i) in item.BackFinance"
...@@ -742,7 +749,7 @@ ...@@ -742,7 +749,7 @@
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
class="cursor-pointer radius5 mr px5" class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2, :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}" 'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
v-for="(x, i) in item.PayFinance" v-for="(x, i) in item.PayFinance"
...@@ -795,7 +802,7 @@ ...@@ -795,7 +802,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog <el-dialog
custom-class="w400" custom-class="w400"
title="设置收损金额" title="设置收损金额"
...@@ -988,7 +995,7 @@ ...@@ -988,7 +995,7 @@
}, },
OrderList:{ OrderList:{
handler(val, oldVal){ handler(val, oldVal){
} }
} }
}, },
...@@ -1077,7 +1084,7 @@ ...@@ -1077,7 +1084,7 @@
}, },
err => { err => {
this.loading3 = false this.loading3 = false
this.Error(err.message) this.Error(err.message)
}); });
}, },
uploadFileBtn(file){ uploadFileBtn(file){
...@@ -1319,9 +1326,9 @@ ...@@ -1319,9 +1326,9 @@
this.loading0 = false; this.loading0 = false;
} }
); );
}, },
saveUpdate() { saveUpdate() {
let text = '是否确认设置收损?' let text = '是否确认设置收损?'
this.$confirm(text, "提示", { this.$confirm(text, "提示", {
...@@ -1438,6 +1445,5 @@ ...@@ -1438,6 +1445,5 @@
} }
}; };
</script> </script>
<style></style> <style></style>
\ No newline at end of file
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ cb9f45b6
...@@ -637,7 +637,7 @@ ...@@ -637,7 +637,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a;display:none;">广告&nbsp;{{item.AdvertCount}} style="background:#67c23a; border-color:#67c23a;">广告&nbsp;{{item.AdvertCount}}
</el-button> </el-button>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C"> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}} {{$t('Operation.Op_remark')}}
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ cb9f45b6
...@@ -250,7 +250,10 @@ ...@@ -250,7 +250,10 @@
</el-tooltip> </el-tooltip>
开 开
</span> </span>
<span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID, item.TeamType)">
<span class="bianji newAopbdd"
v-if="item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
@click="goMakeQuo('QuotationNewPrice',item.ID, item.TeamType)">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i> <i class="iconfont icon-bianji-smal"></i>
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ cb9f45b6
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
border-bottom: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5;
} }
</style> </style>
<template> <template>
<div> <div>
<div <div
...@@ -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>
...@@ -1610,6 +1615,5 @@ export default { ...@@ -1610,6 +1615,5 @@ export default {
}, },
}; };
</script> </script>
<style></style> <style></style>
\ No newline at end of file
src/components/myOrdersAllType/components/allList.vue
View file @ cb9f45b6
...@@ -615,8 +615,8 @@ ...@@ -615,8 +615,8 @@
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
this.msg.EnterId = this.$route.query.EnterId?this.$route.query.EnterId:0//userInfo.EmployeeId; this.msg.EnterId = this.$route.query.EnterId?Number(this.$route.query.EnterId):0//userInfo.EmployeeId;
this.msg.LureEmpId = this.$route.query.LureEmpId?this.$route.query.LureEmpId:0 this.msg.LureEmpId = this.$route.query.LureEmpId?Number(this.$route.query.LureEmpId):0
this.msg.StartTime = this.getBeforeDate(0, new Date()) this.msg.StartTime = this.getBeforeDate(0, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
......
src/components/sale/ExpectedCommission.vue
View file @ cb9f45b6
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;" v-if="isAnnualBonus">
<div class="CommissionLadder Line" style="margin: 0;"> <div class="CommissionLadder Line" style="margin: 0;">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<span>年终奖(不含门票、包车、国内游)</span> <span>年终奖(不含门票、包车、国内游)</span>
...@@ -498,12 +498,21 @@ ...@@ -498,12 +498,21 @@
IsSelectCRM: 0,//1来源crm IsSelectCRM: 0,//1来源crm
IsMyOrder: 1,//1我的订单 IsMyOrder: 1,//1我的订单
}, },
isAnnualBonus: false,// 年终奖权限
}; };
}, },
mounted() { mounted() {
this.getList() this.getList()
}, },
created() { created() {
let userInfo = this.getLocalStorage();
// 年终奖权限 销售， 引流， 市场， 票务 ， 票務，总经理，总经理
if(userInfo.PostName.indexOf('销售')||userInfo.PostName.indexOf('引流')||
userInfo.PostName.indexOf('市场，')||userInfo.PostName.indexOf('票务')||
userInfo.PostName.indexOf('票務')||userInfo.PostName.indexOf('总经理')||
userInfo.PostName.indexOf('总经理')){
this.isAnnualBonus = true
}
let nowdays = new Date() let nowdays = new Date()
this.Year = new Date().getFullYear() this.Year = new Date().getFullYear()
this.LastMonthTime = new Date().getMonth() this.LastMonthTime = new Date().getMonth()
......
src/components/sale/sale.vue
View file @ cb9f45b6
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
</div> </div>
<el-tooltip class="item" effect="dark" content="预期提成" placement="top"> <el-tooltip class="item" effect="dark" content="预期提成" placement="top">
<img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)" <img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
style="width: 15px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img> style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ cb9f45b6
...@@ -614,7 +614,7 @@ ...@@ -614,7 +614,7 @@
</el-table-column> </el-table-column>
<el-table-column label="待收" min-width="100"> <el-table-column label="待收" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold" <span class="fz15 fbold"
:class="{'cF1416C':item.DaiShou>0}"> :class="{'cF1416C':item.DaiShou>0}">
{{item.DaiShou}} {{item.DaiShou}}
</span> </span>
...@@ -625,13 +625,18 @@ ...@@ -625,13 +625,18 @@
<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>
<div class="row justify-sb mt mb20"> <div class="row justify-sb mt mb20">
<div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;"> <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;">
<div class="fz12 row justify-sb" v-if="item.MailingState != 4"> <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
...@@ -679,13 +684,13 @@ ...@@ -679,13 +684,13 @@
<span class="cff9800">{{item.UseDate}}</span> 前 <span class="cff9800">{{item.UseDate}}</span> 前
</div> </div>
<div class="row fz12 see-rec mt"> <div class="row fz12 see-rec mt">
<el-upload ref="my-upload" <el-upload ref="my-upload"
:http-request="uploadFileBtn" :http-request="uploadFileBtn"
v-loading="loadingDZP" v-loading="loadingDZP"
:multiple="true" :multiple="true"
:show-file-list="false" action=""> :show-file-list="false" action="">
<div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP, <div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP,
'cursor-pointer see c04C8C8':loadingDZP}" 'cursor-pointer see c04C8C8':loadingDZP}"
@click="uploadOrderId=item.OrderId">上传电子券</div> @click="uploadOrderId=item.OrderId">上传电子券</div>
</el-upload> </el-upload>
</div> </div>
...@@ -701,7 +706,7 @@ ...@@ -701,7 +706,7 @@
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.IncomeList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.IncomeList"
@click="openDetails(x)">{{ x.FrID }}</span> @click="openDetails(x)">{{ x.FrID }}</span>
...@@ -717,7 +722,7 @@ ...@@ -717,7 +722,7 @@
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList"
@click="openDetails(x)">{{ x.FrID }}</span> @click="openDetails(x)">{{ x.FrID }}</span>
...@@ -733,7 +738,7 @@ ...@@ -733,7 +738,7 @@
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList"
@click="openDetails(x)">{{ x.FrID }}</span> @click="openDetails(x)">{{ x.FrID }}</span>
...@@ -752,7 +757,7 @@ ...@@ -752,7 +757,7 @@
@click="isOffset(item, index, 3)"></i> @click="isOffset(item, index, 3)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
...@@ -1166,7 +1171,7 @@ export default { ...@@ -1166,7 +1171,7 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.cdState = true this.cdState = true
},100) },100)
}, },
editRemark(item){ editRemark(item){
this.postMsg.OrderId = item.OrderId this.postMsg.OrderId = item.OrderId
...@@ -1319,7 +1324,7 @@ export default { ...@@ -1319,7 +1324,7 @@ export default {
this.BillMakingMsg.ReFinanceId = row.OrderId; this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num; this.BillMakingMsg.ReFinanceId2 = num;
this.BillMakingMsg.OtherType = 66; this.BillMakingMsg.OtherType = 66;
let text = ""; let text = "";
let query = {}; let query = {};
if (num == 1) { if (num == 1) {
...@@ -1329,7 +1334,7 @@ export default { ...@@ -1329,7 +1334,7 @@ export default {
} else if (num == 3) { } else if (num == 3) {
text = "成本"; text = "成本";
} }
query = { query = {
blank: "y", blank: "y",
tab: `新增${text}单据`, tab: `新增${text}单据`,
......
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