Skip to content

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

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

parents ce282fdf d749751c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 799 additions and 63 deletions
src/components/FinancialModule/OPRules.vue
View file @ edfdbc9d
<template> <template>
<div class="Feedback OPRules"> <div class="red-theme Feedback OPRules">
<ul style="overflow: initial!important"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<li> <ul>
<span> <li>
<em>公司</em> <span>
</span> <em>公司</em>
<el-select filterable v-model="obj.BranchId"> </span>
<el-option label="不限" :value='-1'></el-option> <el-select filterable v-model="obj.BranchId">
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'> <el-option label="不限" :value='-1'></el-option>
</el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-select> </el-option>
</li> </el-select>
<li> </li>
<span> <li>
<em>线路</em> <span>
</span> <em>线路</em>
<el-select filterable v-model="obj.LineId"> </span>
<el-option label="不限" :value='0'></el-option> <el-select filterable v-model="obj.LineId">
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'> <el-option label="不限" :value='0'></el-option>
</el-option> <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-select> </el-option>
</li> </el-select>
<li> </li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"> <li style="float:right;color:red;font-weight:700;line-height: 30px;">{{tips}}</li>
<input type="button" class="hollowFixedBtn" value="新增" @click="addRule"> <li>
</li> <input type="button" class="hollowFixedBtn" value="查询" @click="getList()">
<li style="float:right;color:red;font-weight:700">{{tips}}</li> <input type="button" class="hollowFixedBtn" value="新增" @click="addRule">
</ul> <input type="button" class="normalBtn" value="额外奖励配置" @click="goExtraReward"/>
</li>
</ul>
</div>
<table style="margin-bottom:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" <table style="margin-bottom:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
v-loading="loading"> v-loading="loading">
<tr> <tr>
...@@ -255,6 +259,14 @@ ...@@ -255,6 +259,14 @@
this.getDepartment(); this.getDepartment();
}, },
methods: { methods: {
goExtraReward(){
this.$router.push({
name: 'OPExtraRewardRule',
query: {
blank: 'y'
}
});
},
Delete(item) { Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", { this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
......
src/components/FinancialModule/TradeCommission/CommissionRule.vue
View file @ edfdbc9d
...@@ -678,7 +678,6 @@ ...@@ -678,7 +678,6 @@
], ],
}; };
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.getList()
}, },
} }
} }
......
src/components/Ticketing/TicketManager.vue
View file @ edfdbc9d
...@@ -1341,7 +1341,7 @@ ...@@ -1341,7 +1341,7 @@
<li> <li>
<span> <span>
<em>操作人</em> <em>操作人</em>
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('system.ph_in')" class="w120"> <el-select v-model="msg.CreateBy" filterable :placeholder="$t('system.ph_in')" class="w120" clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option> :key="item.EmployeeId"></el-option>
...@@ -1470,7 +1470,6 @@ ...@@ -1470,7 +1470,6 @@
</el-tooltip> </el-tooltip>
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span> <span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="4" class="vmiddle">
<div class="FlightDivDetailsTM"> <div class="FlightDivDetailsTM">
...@@ -2939,7 +2938,8 @@ ...@@ -2939,7 +2938,8 @@
message: "请填写B2C单价", message: "请填写B2C单价",
trigger: "change" trigger: "change"
}] }]
} },
userInfo: {}, //当前登录用户
}; };
}, },
methods: { methods: {
...@@ -4131,9 +4131,17 @@ ...@@ -4131,9 +4131,17 @@
} }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
var id = this.$route.query.id; var id = this.$route.query.id;
if (id) { if (id) {
this.msg.ID = id; this.msg.ID = id;
} else {
//358,359,360,361,362,363
if (this.userInfo.RB_Department_Id == 358 || this.userInfo.RB_Department_Id == 359 || this.userInfo
.RB_Department_Id == 360 || this.userInfo.RB_Department_Id == 361 || this.userInfo.RB_Department_Id == 362 ||
this.userInfo.RB_Department_Id == 363) {
this.msg.CreateBy = this.userInfo.EmployeeId;
}
} }
this.GetChinaCityList(); this.GetChinaCityList();
this.GetLineList(); this.GetLineList();
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ edfdbc9d
...@@ -739,16 +739,9 @@ ...@@ -739,16 +739,9 @@
<el-col :span="2" class="vmiddle"> <el-col :span="2" class="vmiddle">
<div class="TM_AirUrl"> <div class="TM_AirUrl">
<span class="TICK_Code">{{$t('op.PurchaseNumber')}}：{{item.Id}}</span> <span class="TICK_Code">{{$t('op.PurchaseNumber')}}：{{item.Id}}</span>
<img v-if="!item.AirlineUrl" class="_oll_img" src="../../../assets/img/bg_z1@2x.png"> <img v-if="!item.AirlineUrl" class="_oll_img" src="../../../assets/img/bg_z1@2x.png" />
<img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg"> <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg" />
</div> <span class="_oll_tit"> {{item.AirlineName}} </span>
</el-col>
<el-col :span="2" class="vmiddle">
<div class="_oll_info">
<el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start"
popper-class="max-w250">
<p class="_oll_tit"> {{item.AirlineName}} </p>
</el-tooltip>
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span> <span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
</div> </div>
</el-col> </el-col>
...@@ -785,7 +778,7 @@ ...@@ -785,7 +778,7 @@
<p slot="reference">{{$t('hotel.hotel_cost')}}<span class="PingFangSC">{{item.CostPrice}}</span></p> <p slot="reference">{{$t('hotel.hotel_cost')}}<span class="PingFangSC">{{item.CostPrice}}</span></p>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="3" class="vmiddle">
<div class="TMT_Seat"> <div class="TMT_Seat">
<div class="TM_SeatList"> <div class="TM_SeatList">
<ul class="clearfix"> <ul class="clearfix">
...@@ -804,17 +797,64 @@ ...@@ -804,17 +797,64 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="5" class="vmiddle">
<table>
<tr>
<td v-if="item.FirstDeposit&&item.FirstDeposit!=''" style="text-align:center;">
<el-button v-if="item.FirstDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
1
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>1</el-button>
</td>
<td v-if="item.SecondDeposit&&item.SecondDeposit!=''" style="text-align:center;">
<el-button v-if="item.SecondDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
2
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;" circle>2</el-button>
</td>
<td v-if="item.ThirdDeposit&&item.ThirdDeposit!=''" style="text-align:center;">
<el-button v-if="item.ThirdDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
3
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;" circle>3</el-button>
</td>
<td v-if="item.FourthDeposit&&item.FourthDeposit!=''" style="text-align:center;">
<el-button v-if="item.FourthDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
4
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>4</el-button>
</td>
<td v-if="item.FinalPayment&&item.FinalPayment!=''" style="text-align:center;">
<el-button v-if="item.FinalPaymentStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
尾
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>尾</el-button>
</td>
</tr>
<tr>
<td v-if="item.FirstDeposit&&item.FirstDeposit!=''">
{{item.FirstDeposit}}
</td>
<td v-if="item.SecondDeposit&&item.SecondDeposit!=''">
&nbsp;{{item.SecondDeposit}}
</td>
<td v-if="item.ThirdDeposit&&item.ThirdDeposit!=''">
&nbsp;{{item.ThirdDeposit}}
</td>
<td v-if="item.FourthDeposit&&item.FourthDeposit!=''">
&nbsp;{{item.FourthDeposit}}
</td>
<td v-if="item.FinalPayment&&item.FinalPayment!=''">
&nbsp;{{item.FinalPayment}}
</td>
</tr>
</table>
</el-col>
<el-col :span="2" class="vmiddle">
<div class="TMT_raduis"> <div class="TMT_raduis">
<ul> <ul>
<li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"
v-if="item.FinalPayment">
<span>{{$t('op.WEI')}}</span>
</el-tooltip>
<span v-else>{{$t('op.WEI')}}</span>
</li>
<div>{{item.FinalPayment}}</div>
<li class="_head" style="margin-left:20px;"> <li class="_head" style="margin-left:20px;">
<img v-if="item.CreateUrl" :src="item.CreateUrl" :onerror="defaultImg" /> <img v-if="item.CreateUrl" :src="item.CreateUrl" :onerror="defaultImg" />
<img v-else src="../../../assets/img/default_head_img.jpg" /> <img v-else src="../../../assets/img/default_head_img.jpg" />
...@@ -829,7 +869,7 @@ ...@@ -829,7 +869,7 @@
<p class="_text">{{$t('Airticket.Air_departureDate')}}</p> <p class="_text">{{$t('Airticket.Air_departureDate')}}</p>
</div> </div>
</el-col> </el-col>
<el-col :span="3" class="vmiddle"> <el-col :span="2" class="vmiddle">
<div class="_btn _tmt_page"> <div class="_btn _tmt_page">
<button class="hollowFixedBtn inversion" type="button" <button class="hollowFixedBtn inversion" type="button"
@click="outBtn(item)">{{$t('op.Inversion')}}</button> @click="outBtn(item)">{{$t('op.Inversion')}}</button>
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ edfdbc9d
...@@ -776,9 +776,64 @@ ...@@ -776,9 +776,64 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="vmiddle"> <el-col :span="6" class="vmiddle">
<div class="TKM_raduis"> <table>
<ul style="display: block"> <tr>
<td v-if="item.FirstDeposit&&item.FirstDeposit!=''" style="text-align:center;">
<el-button v-if="item.FirstDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
1
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>
1
</el-button>
</td>
<td v-if="item.SecondDeposit&&item.SecondDeposit!=''" style="text-align:center;">
<el-button v-if="item.SecondDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
2
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>2</el-button>
</td>
<td v-if="item.ThirdDeposit&&item.ThirdDeposit!=''" style="text-align:center;">
<el-button v-if="item.ThirdDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
3
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>3</el-button>
</td>
<td v-if="item.FourthDeposit&&item.FourthDeposit!=''" style="text-align:center;">
<el-button v-if="item.FourthDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
4
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>4</el-button>
</td>
<td v-if="item.FinalPayment&&item.FinalPayment!=''" style="text-align:center;">
<el-button v-if="item.FinalPaymentStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
尾
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>尾</el-button>
</td>
</tr>
<tr>
<td v-if="item.FirstDeposit&&item.FirstDeposit!=''">
{{item.FirstDeposit}}
</td>
<td v-if="item.SecondDeposit&&item.SecondDeposit!=''">
&nbsp;{{item.SecondDeposit}}
</td>
<td v-if="item.ThirdDeposit&&item.ThirdDeposit!=''">
&nbsp;{{item.ThirdDeposit}}
</td>
<td v-if="item.FourthDeposit&&item.FourthDeposit!=''">
&nbsp;{{item.FourthDeposit}}
</td>
<td v-if="item.FinalPayment&&item.FinalPayment!=''">
&nbsp;{{item.FinalPayment}}
</td>
</tr>
</table>
<!-- <div class="TKM_raduis">
<ul>
<li :class="item.FirstDeposit?'_bg_gre':''"> <li :class="item.FirstDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250" <el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250"
v-if="item.FirstDeposit"> v-if="item.FirstDeposit">
...@@ -786,7 +841,6 @@ ...@@ -786,7 +841,6 @@
</el-tooltip> </el-tooltip>
<span v-else>1</span> <span v-else>1</span>
</li> </li>
<span>{{item.FirstDeposit}}</span>
<li :class="item.SecondDeposit?'_bg_gre':''"> <li :class="item.SecondDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250" <el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250"
v-if="item.SecondDeposit"> v-if="item.SecondDeposit">
...@@ -794,7 +848,6 @@ ...@@ -794,7 +848,6 @@
</el-tooltip> </el-tooltip>
<span v-else>2</span> <span v-else>2</span>
</li> </li>
<span>{{item.SecondDeposit}}</span>
<li :class="item.ThirdDeposit?'_bg_gre':''"> <li :class="item.ThirdDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250" <el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250"
v-if="item.ThirdDeposit"> v-if="item.ThirdDeposit">
...@@ -802,7 +855,6 @@ ...@@ -802,7 +855,6 @@
</el-tooltip> </el-tooltip>
<span v-else>3</span> <span v-else>3</span>
</li> </li>
<span>{{item.ThirdDeposit}}</span>
<li :class="item.FourthDeposit?'_bg_gre':''"> <li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250" <el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250"
v-if="item.FourthDeposit"> v-if="item.FourthDeposit">
...@@ -810,7 +862,6 @@ ...@@ -810,7 +862,6 @@
</el-tooltip> </el-tooltip>
<span v-else>4</span> <span v-else>4</span>
</li> </li>
<span>{{item.FourthDeposit}}</span>
<li :class="item.FourthDeposit?'_bg_gre':''"> <li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250" <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"
v-if="item.FinalPayment"> v-if="item.FinalPayment">
...@@ -818,9 +869,8 @@ ...@@ -818,9 +869,8 @@
</el-tooltip> </el-tooltip>
<span v-else>{{$t('op.WEI')}}</span> <span v-else>{{$t('op.WEI')}}</span>
</li> </li>
<span>{{item.FinalPayment}}</span>
</ul> </ul>
</div> </div> -->
</el-col> </el-col>
<el-col :span="2" class="vmiddle"> <el-col :span="2" class="vmiddle">
<div class="_head"> <div class="_head">
...@@ -881,7 +931,6 @@ ...@@ -881,7 +931,6 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="Query.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="Query.currentPage"
layout="total,prev, pager, next, jumper" :page-size="Query.pageSize" :total="Query.total"> layout="total,prev, pager, next, jumper" :page-size="Query.pageSize" :total="Query.total">
</el-pagination> </el-pagination>
<div class="combottomDiv" style="height:150px;" v-if="isShowOrder"> <div class="combottomDiv" style="height:150px;" v-if="isShowOrder">
<div class="combottomTitle">{{$t('op.CaiGou')}}</div> <div class="combottomTitle">{{$t('op.CaiGou')}}</div>
<el-col :span="3"> <el-col :span="3">
......
src/router/config.js
View file @ edfdbc9d
...@@ -4976,6 +4976,14 @@ export default { ...@@ -4976,6 +4976,14 @@ export default {
title: '同业提成详情' title: '同业提成详情'
} }
}, },
{
path: '/OPExtraRewardRule',
name: 'OPExtraRewardRule',
component: resolve => require(['@/components/FinancialModule/OPExtraReward/CommissionRule'], resolve),
meta: {
title: '额外提成规则'
}
},
{ {
path: '/ServiceTheRules', path: '/ServiceTheRules',
name: 'ServiceTheRules', name: 'ServiceTheRules',
......
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