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
Show whitespace changes
Inline Side-by-side
Showing with 799 additions and 63 deletions
src/components/FinancialModule/OPExtraReward/CommissionRule.vue 0 → 100644
View file @ edfdbc9d
<template>
<div class="red-theme page_FProcessManagement">
<div class="query-box" style="background: none;border: 0;">
<ul>
<li style="color: red;"></li>
<li>
<input type="button" class="hollowFixedBtn" value="新增" @click="AddMsg"/>
<input type="button" class="normalBtn" style="position: absolute; right: 90px;top: 9px;" value="查询" @click="getList"/>
</li>
</ul>
</div>
<div
class="cm_content"
style="width: 100%;margin-bottom: 35px;margin-top: 6px;"
v-for="(item,index ) in dataList "
:key="index"
v-loading="loading"
>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<th width="100" style="min-width: 100px;max-width: 100px;">方案名称</th>
<th width="200" class="left-text-indent">线路</th>
<th width="100">提成方式</th>
<th width="150" style="min-width: 150px;max-width: 150px;">修改时间</th>
<th width="150" style="min-width: 150px;max-width: 150px;">操作</th>
</tr>
<tr>
<td>
<span>{{item.Name}}</span>
</td>
<td style="padding: 0 10px;" class="left-text-indent">
{{item.LineName}}
</td>
<td style="padding: 0 10px;">
{{item.SingleVisaWay==1?'人头奖励':item.SingleVisaWay==2?'利润比':'-'}}
</td>
<td style="padding: 0 10px;">
<p>{{item.UpdateBy}}</p>
<span>
{{item.UpdateDate}}
</span>
</td>
<td>
<el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle>
</el-button>
<el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
</td>
</tr>
</table>
<div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<td rowspan="2" width="150" style="min-width: 150px;">当月负责线路毛利金额<p>当月提成比例</p> </td>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.ProfitList"
:key="sIndex"
>{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=当月毛利润<':'<=当月毛利润'}}</span>
<span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span>
</th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in item.ProfitList" :key="sIndex"> {{ son.Rate }}%</td>
</tr>
</table>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<td rowspan="2" width="150" style="min-width: 150px;">当月负责团数<p>当月奖励</p> </td>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.ExtraList"
:key="sIndex"
>{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=当月团数<':'<=当月团数'}}</span>
<span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span>
</th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in item.ExtraList" :key="sIndex"> {{ son.Rate }}</td>
</tr>
</table>
</div>
</div>
<div v-if="dataList.length==0"
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>暂无数据</div>
<el-dialog :title="titleName" :visible.sync="ruleVisible" width="750px" @close="resetForm('form')">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
<el-col :span="8">
<el-form-item label="规则名称" prop="Name">
<el-input v-model="form.Name" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="提成方式" prop="SingleVisaWay">
<el-select v-model="form.SingleVisaWay" size="mini">
<el-option v-for="(item,index) in typeList" :key="item.index" :label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="团签奖励" prop="TravelVisaMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.TravelVisaMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.SingleVisaWay">
<el-form-item :label="form.SingleVisaWay==1?'人头奖金':'提成比例'" prop="SingleVisaRate"
:rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.SingleVisaRate" clearable></el-input>
<span class="Impression-ratio-right">{{form.SingleVisaWay==1?'/人':'%'}}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签证奖励" prop="TravelVisaZLMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.TravelVisaZLMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8" v-if="titleName=='编辑规则'">
<el-form-item label="国家" prop="CountryId">
<el-select v-model="form.CountryId" class="w256" filterable>
<el-option label="欧洲" :value="0" :key="0"></el-option>
<el-option v-for="subItem in CountryList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags
style="width: 100%;" v-model="form.LineIdList" @change="getLineTeamList">
<el-option label='全线' :value='-1' :key='-1'></el-option>
<el-option v-for="item in LineList" :label='item.LineName'
:value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">毛利当月提成比例</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.ProfitList" :key="index">
<div>
<el-form-item
:label="form.ProfitList.length>0?`开始值 ${index+1} `:` ` "
:prop="`ProfitList.${index}.StartValue`"
:rules="rules.StartValue"
label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.ProfitList.length>0?`结束值 ${index+1} `:` ` "
:prop="`ProfitList.${index}.EndValue`"
:rules="rules.EndValue"
label-width="100px"
label-position="left">
<el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.ProfitList.length>0?`比例 ${index+1} `:` ` "
:prop="`ProfitList.${index}.Rate`"
:rules="rules.Rate2"
label-width="100px"
label-position="left">
<div class="Impression-ratio-box">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input>
<span class="Impression-ratio-right">%</span>
</div>
</el-form-item>
</div>
<div class="ImpressionTicketing-msg-but">
<span @click="addRule(item,index,2)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,2)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
</el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">团数当月奖励</p>
<div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.ExtraList" :key="index">
<div>
<el-form-item
:label="form.ExtraList.length>0?`开始值 ${index+1} `:` ` "
:prop="`ExtraList.${index}.StartValue`"
:rules="rules.StartValue"
label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.ExtraList.length>0?`结束值 ${index+1} `:` ` "
:prop="`ExtraList.${index}.EndValue`"
:rules="rules.EndValue"
label-width="100px"
label-position="left">
<el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.ExtraList.length>0?`奖励 ${index+1} `:` ` "
:prop="`ExtraList.${index}.Rate`"
:rules="rules.Rate"
label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input>
</el-form-item>
</div>
<div class="ImpressionTicketing-msg-but">
<span @click="addRule(item,index,3)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,3)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false,resetForm('form')">取 消</el-button>
<el-button size="small" type="danger" @click="RulesOk('form')" :loading="ruleLoading">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
CountryList: [],
LineList: [],
value:"",
rules: {
Name: [{
required: true,
message: '请输入规则名称',
trigger: "blur"
}],
SingleVisaWay: [{
required: true,
message: '请选择提成方式',
trigger: "change"
}],
SingleVisaRate: [{
required: true,
message: '请输入提成比例',
trigger: "blur"
}],
SingleVisaRate2: [{
required: true,
message: '请输入人头奖金',
trigger: "blur"
}],
TravelVisaMoney: [{
required: true,
message: '请输入人头奖励',
trigger: "blur"
}],
TravelVisaZLMoney: [{
required: true,
message: '请输入签证奖励',
trigger: 'blur'
}],
StartValue: [{
required: true,
message: "请输入开始值",
trigger: "blur"
}],
EndValue: [{
required: true,
message: "请输入结束值",
trigger: "blur"
}],
Rate: [{
required: true,
message: "请输入金额",
trigger: "blur"
}],
Rate2: [{
required: true,
message: "请输入比例",
trigger: "blur"
}],
LineIdList: [{
required: true,
message: '请选择线路',
trigger: 'change'
}],
CountryId: [{
required: true,
message: '请选择国家',
trigger: 'change'
}],
},
ProfitList:
{
StartValue:0,
EndValue:null,
Rate:null
},
ExtraList:
{
StartValue:0,
EndValue:null,
Rate:null
},
form:{
Id:0,
Name:'',
SingleVisaWay: null,
SingleVisaRate: 0,
TravelVisaMoney: 0,
TravelVisaZLMoney: 0,
CountryId: null,
LineIdList: [],
LineIds: '',
ProfitList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
ExtraList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
},
ruleLoading: false,
ruleVisible:false,
titleName:'提成规则',
loading: false,
dataList:[],
typeList:[
{name:'人头奖励',id:1},
{name:'利润比',id:2}
]
}
},
created() {},
mounted() {
this.getCountry()
this.getLineList()
this.getList()
},
methods: {
// 初始化表单
resetForm(formName) {
this.$refs[formName].resetFields();
},
// 添加规则
addRule(row,index,type){
if(type==2){
this.form.ProfitList.push(JSON.parse(JSON.stringify(this.ProfitList)))
}else if(type==3){
this.form.ExtraList.push(JSON.parse(JSON.stringify(this.ExtraList)))
}
},
// 删除规则
deleteRule(row,index,type){
if(type==2){
this.form.ProfitList.splice(index,1)
}else if(type==3){
this.form.ExtraList.splice(index,1)
}
},
AddMsg(){//新增
this.ruleVisible = true
this.titleName = '提成规则'
},
SetRules(item){//编辑
this.titleName = '编辑规则'
this.ruleVisible = true;
item = JSON.parse(JSON.stringify(item))
let arr = item.LineIds.split(',')
let ids = []
arr.forEach(item => {
ids.push(Number(item))
});
this.form = {
Id: item.Id,
Name: item.Name,//规则名称
LineIdList: ids,
LineIds: item.LineIds,
SingleVisaWay: item.SingleVisaWay,
SingleVisaRate: item.SingleVisaRate,
TravelVisaMoney: item.TravelVisaMoney,
TravelVisaZLMoney: item.TravelVisaZLMoney,
CountryId: item.CountryId>0?item.CountryId:null,
ProfitList: item.ProfitList,
ExtraList: item.ExtraList,
}
},
Delete(item){//删除
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('commission_DelOPCommissionAwardRule', {
RuleId: item.Id
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
} else {
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
// 点击确定
RulesOk(formName) {
this.form.LineIds = this.form.LineIdList.join(',')
this.form.CountryId = this.form.CountryId?this.form.CountryId:-1
this.$refs[formName].validate((valid) => {
if (valid) {
this.ruleLoading = true
this.apipost(
'commission_SetOPCommissionAwardRule', this.form,
res => {
if (res.data.resultCode == 1) {
this.resetForm('form')
this.getList();
this.ruleVisible = false;
this.Success(res.data.message)
} else {
this.Error(res.data.message)
}
this.ruleLoading = false
},
err => {}
)
}
});
},
// 获取列表数据
getList() {
this.loading = true;
this.apipost("commission_GetOPCommissionAwardRuleList", {}, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
}else{
this.Error(res.data.message)
}
this.loading = false
});
},
// 重置表单
resetForm(formName) {
this.ruleVisible = false;
// 重置表单
this.form = {
Id:0,
Name:'',
CountryId: null,
ProfitList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
ExtraList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
LineIdList:[],
LineIds: '',
SingleVisaWay: null,
SingleVisaRate: 0,
TravelVisaMoney: 0,
TravelVisaZLMoney: 0,
};
this.$refs[formName].resetFields();
},
//获取系列列表
getLineTeamList() {
if (this.form.LineIdList.indexOf(-1) != -1) {
this.form.LineIdList = [-1];
return;
}
},
//获取国家列表
getCountry() {
this.apipost(
"dict_post_Destination_GetCountry", {},
res => {
if (res.data.resultCode == 1) {
this.CountryList = res.data.data;
}
},
err => {}
);
},
// 线路
getLineList() {
this.apipost("line_post_GetAllList_V2", {
LineDirection: 0
}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
}
}
</script>
<style scoped>
.hollowFixedBtn{
position: absolute;
top: 9px;
right: 20px;
}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 10px;background-color: #F1F1F1;cursor: pointer;position: relative;}
._nav li._active{background-color:#FFFFFF;color: #333333 }
._nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.ImpressionTicketing-OuterFrame{
padding: 10px 20px 20px 20px;
box-shadow: 0 1px 8px rgb(0 0 0 / 20%), 0 3px 4px rgb(0 0 0 / 14%), 0 3px 3px -2px rgb(0 0 0 / 12%);
}
.ImpressionTicketing-msgbox{
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 20px;
}
.ImpressionTicketing-msgbox.bottom0{
margin-bottom: 0;
}
.ImpressionTicketing-msgbox div{
flex: 1;
}
.ImpressionTicketing-msgbox div.ImpressionTicketing-msg-but{
flex: 0 0 auto;
}
.itc-delete{
color: #E95252;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.itc-outline{
color: #409EFF;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.ImpressionTicketing-title{
padding: 0;
}
.left-text-indent{
text-align: left;
text-indent: 20px
}
/deep/.el-input-number{
width: inherit;
}
/deep/.el-input-number .el-input__inner{
text-align: left;
height: 34px;
}
.Impression-ratio-box{
display: flex;
justify-content: space-between;
}
.Impression-ratio-right{
font-size: 13px;
margin-left: 5px;
}
/deep/.line-heigh .el-input-number{
line-height: 32px;
}
</style>
src/components/FinancialModule/OPRules.vue
View file @ edfdbc9d
<template>
<div class="Feedback OPRules">
<ul style="overflow: initial!important">
<div class="red-theme Feedback OPRules">
<div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul>
<li>
<span>
<em>公司</em>
......@@ -21,12 +22,15 @@
</el-option>
</el-select>
</li>
<li style="float:right;color:red;font-weight:700;line-height: 30px;">{{tips}}</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()">
<input type="button" class="hollowFixedBtn" value="新增" @click="addRule">
<input type="button" class="normalBtn" value="额外奖励配置" @click="goExtraReward"/>
</li>
<li style="float:right;color:red;font-weight:700">{{tips}}</li>
</ul>
</div>
<table style="margin-bottom:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
v-loading="loading">
<tr>
......@@ -255,6 +259,14 @@
this.getDepartment();
},
methods: {
goExtraReward(){
this.$router.push({
name: 'OPExtraRewardRule',
query: {
blank: 'y'
}
});
},
Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
......
src/components/FinancialModule/TradeCommission/CommissionRule.vue
View file @ edfdbc9d
......@@ -678,7 +678,6 @@
],
};
this.$refs[formName].resetFields();
this.getList()
},
}
}
......
src/components/Ticketing/TicketManager.vue
View file @ edfdbc9d
......@@ -1341,7 +1341,7 @@
<li>
<span>
<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 v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
......@@ -1470,7 +1470,6 @@
</el-tooltip>
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
</div>
</el-col>
<el-col :span="4" class="vmiddle">
<div class="FlightDivDetailsTM">
......@@ -2939,7 +2938,8 @@
message: "请填写B2C单价",
trigger: "change"
}]
}
},
userInfo: {}, //当前登录用户
};
},
methods: {
......@@ -4131,9 +4131,17 @@
}
},
mounted() {
this.userInfo = this.getLocalStorage();
var id = this.$route.query.id;
if (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.GetLineList();
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ edfdbc9d
......@@ -739,16 +739,9 @@
<el-col :span="2" class="vmiddle">
<div class="TM_AirUrl">
<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-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
</div>
</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>
<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" />
<span class="_oll_tit"> {{item.AirlineName}} </span>
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
</div>
</el-col>
......@@ -785,7 +778,7 @@
<p slot="reference">{{$t('hotel.hotel_cost')}}<span class="PingFangSC">{{item.CostPrice}}</span></p>
</div>
</el-col>
<el-col :span="4" class="vmiddle">
<el-col :span="3" class="vmiddle">
<div class="TMT_Seat">
<div class="TM_SeatList">
<ul class="clearfix">
......@@ -804,17 +797,64 @@
</div>
</div>
</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">
<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;">
<img v-if="item.CreateUrl" :src="item.CreateUrl" :onerror="defaultImg" />
<img v-else src="../../../assets/img/default_head_img.jpg" />
......@@ -829,7 +869,7 @@
<p class="_text">{{$t('Airticket.Air_departureDate')}}</p>
</div>
</el-col>
<el-col :span="3" class="vmiddle">
<el-col :span="2" class="vmiddle">
<div class="_btn _tmt_page">
<button class="hollowFixedBtn inversion" type="button"
@click="outBtn(item)">{{$t('op.Inversion')}}</button>
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ edfdbc9d
......@@ -776,9 +776,64 @@
</div>
</div>
</el-col>
<el-col :span="4" class="vmiddle">
<div class="TKM_raduis">
<ul style="display: block">
<el-col :span="6" 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;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':''">
<el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250"
v-if="item.FirstDeposit">
......@@ -786,7 +841,6 @@
</el-tooltip>
<span v-else>1</span>
</li>
<span>{{item.FirstDeposit}}</span>
<li :class="item.SecondDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250"
v-if="item.SecondDeposit">
......@@ -794,7 +848,6 @@
</el-tooltip>
<span v-else>2</span>
</li>
<span>{{item.SecondDeposit}}</span>
<li :class="item.ThirdDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250"
v-if="item.ThirdDeposit">
......@@ -802,7 +855,6 @@
</el-tooltip>
<span v-else>3</span>
</li>
<span>{{item.ThirdDeposit}}</span>
<li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250"
v-if="item.FourthDeposit">
......@@ -810,7 +862,6 @@
</el-tooltip>
<span v-else>4</span>
</li>
<span>{{item.FourthDeposit}}</span>
<li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"
v-if="item.FinalPayment">
......@@ -818,9 +869,8 @@
</el-tooltip>
<span v-else>{{$t('op.WEI')}}</span>
</li>
<span>{{item.FinalPayment}}</span>
</ul>
</div>
</div> -->
</el-col>
<el-col :span="2" class="vmiddle">
<div class="_head">
......@@ -881,7 +931,6 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="Query.currentPage"
layout="total,prev, pager, next, jumper" :page-size="Query.pageSize" :total="Query.total">
</el-pagination>
<div class="combottomDiv" style="height:150px;" v-if="isShowOrder">
<div class="combottomTitle">{{$t('op.CaiGou')}}</div>
<el-col :span="3">
......
src/router/config.js
View file @ edfdbc9d
......@@ -4976,6 +4976,14 @@ export default {
title: '同业提成详情'
}
},
{
path: '/OPExtraRewardRule',
name: 'OPExtraRewardRule',
component: resolve => require(['@/components/FinancialModule/OPExtraReward/CommissionRule'], resolve),
meta: {
title: '额外提成规则'
}
},
{
path: '/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