Skip to content

S
SuperMan
Commit 6e39bda2 authored by youjie's avatar youjie
Browse files
Options

no message

parent 47455376
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 52 deletions
src/components/FinancialModule/OPExtraReward/CommissionRule.vue
View file @ 6e39bda2
......@@ -4,8 +4,8 @@
<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"/>
<input type="button" class="hollowFixedBtn" value="新增" @click="AddMsg"/>
<input type="button" class="normalBtn" style="position: absolute; right: 90px;t" value="查询" @click="getList"/>
</li>
</ul>
</div>
......@@ -52,7 +52,7 @@
</td>
</tr>
</table>
<div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
......@@ -61,17 +61,32 @@
cellpadding="0"
>
<tr>
<td rowspan="2" width="150" style="min-width: 150px;">当月负责线路毛利金额<p>当月提成比例</p> </td>
<td :rowspan="item.FProfitList.length>0?4:2" width="150" style="min-width: 150px;">当月负责线路毛利金额<p>当月提成比例</p> </td>
<th v-if="item.FProfitList.length>0" width="80" style="min-width:80px;" rowspan="2">总公司OP</th>
<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>
</th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in item.ProfitList" :key="sIndex"> {{ son.Rate }}%</td>
</tr>
<template v-if="item.FProfitList.length>0">
<tr>
<th width="80" style="min-width:80px;" rowspan="2">分公司OP</th>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.FProfitList"
: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.FProfitList" :key="sIndex"> {{ son.Rate }}%</td>
</tr>
</template>
</table>
<table
class="po_content singeRowTable"
......@@ -80,7 +95,8 @@
cellpadding="0"
>
<tr>
<td rowspan="2" width="150" style="min-width: 150px;">当月负责团数<p>当月奖励</p> </td>
<td :rowspan="item.FExtraList.length>0?4:2" width="150" style="min-width: 150px;">当月负责团数<p>当月奖励</p> </td>
<th v-if="item.FExtraList.length>0" width="80" style="min-width:80px;" rowspan="2">总公司OP</th>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.ExtraList"
:key="sIndex"
......@@ -91,6 +107,20 @@
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in item.ExtraList" :key="sIndex"> {{ son.Rate }}</td>
</tr>
<template v-if="item.FExtraList.length>0">
<tr>
<th width="80" style="min-width:80px;" rowspan="2">分公司OP</th>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.FExtraList"
: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.FExtraList" :key="sIndex"> {{ son.Rate }}%</td>
</tr>
</template>
</table>
</div>
</div>
......@@ -99,6 +129,7 @@
>暂无数据</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="titleOP">总公司OP提成</div>
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
<el-col :span="8">
......@@ -107,7 +138,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="提成方式" prop="SingleVisaWay">
<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>
......@@ -115,7 +146,7 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.SingleVisaWay">
<el-form-item :label="form.SingleVisaWay==1?'人头奖金':'提成比例'" prop="SingleVisaRate"
<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>
......@@ -132,7 +163,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="助理奖励" prop="TravelVisaZLMoney">
<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>
......@@ -150,10 +181,10 @@
</el-col>
<el-col :span="16">
<el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags
<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'
<el-option v-for="item in LineList" :label='item.LineName'
:value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
......@@ -165,36 +196,36 @@
<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`"
<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"
<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`"
<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"
<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`"
<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"
<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>
......@@ -208,38 +239,38 @@
</el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">团数当月奖励</p>
<div class="ImpressionTicketing-msgbox"
<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`"
<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"
<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`"
<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"
<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`"
<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"
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input>
</el-form-item>
</div>
......@@ -249,6 +280,129 @@
</div>
</div>
</el-form-item>
<div style="text-align: right;padding: 10px 0 10px 0;border-top: 1px dashed #E6E6E6;">
<span>是否启用 分公司阶梯提成</span>
<el-switch
v-model="form.IsEnableFBranch"
@change="isSwitch"
active-value="1"
inactive-value="0">
</el-switch>
</div>
<div>
<div class="titleOP">分公司OP提成</div>
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
<el-col :span="8" v-if="form.SingleVisaWay">
<el-form-item :label="form.SingleVisaWay==1?'单签人头奖':'单签提成比'" prop="FSingleVisaMoney"
:rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.FSingleVisaMoney" 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="FTravelVisaMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.FTravelVisaMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<el-form-item v-if="form.IsEnableFBranch==1" class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">毛利当月提成比例</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.FProfitList" :key="index">
<div>
<el-form-item
:label="form.ProfitList.length>0?`开始值 ${index+1} `:` ` "
:prop="`FProfitList.${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="`FProfitList.${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="`FProfitList.${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,1)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,2,1)" 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.FExtraList" :key="index">
<div>
<el-form-item
:label="form.ExtraList.length>0?`开始值 ${index+1} `:` ` "
:prop="`FExtraList.${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="`FExtraList.${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="`FExtraList.${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,1)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,3,1)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
</el-form-item>
</div>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false,resetForm('form')">取 消</el-button>
......@@ -326,6 +480,16 @@
message: '请选择国家',
trigger: 'change'
}],
FSingleVisaMoney: [{
required: true,
message: '请输入分公司人头奖励',
trigger: "blur"
}],
FTravelVisaMoney: [{
required: true,
message: '请输入分公司团签奖励',
trigger: 'blur'
}],
},
ProfitList:
{
......@@ -339,6 +503,18 @@
EndValue:null,
Rate:null
},
FProfitList:
{
StartValue:0,
EndValue:null,
Rate:null
},
FExtraList:
{
StartValue:0,
EndValue:null,
Rate:null
},
form:{
Id:0,
Name:'',
......@@ -363,6 +539,23 @@
Rate:null
}
],
FProfitList: [
{
StartValue:0,
EndValue:null,
Rate:null
}
],
FExtraList: [
{
StartValue:0,
EndValue:null,
Rate:null
}
],
IsEnableFBranch: false,
FSingleVisaMoney: 0,
FTravelVisaMoney: 0
},
ruleLoading: false,
ruleVisible:false,
......@@ -387,24 +580,41 @@
this.$refs[formName].resetFields();
},
// 添加规则
addRule(row,index,type){
addRule(row,index,type,num){
if(type==2){
if(num){
this.form.FProfitList.push(JSON.parse(JSON.stringify(this.ProfitList)))
}else{
this.form.ProfitList.push(JSON.parse(JSON.stringify(this.ProfitList)))
}
}else if(type==3){
this.form.ExtraList.push(JSON.parse(JSON.stringify(this.ExtraList)))
if(num){
this.form.FExtraList.push(JSON.parse(JSON.stringify(this.ExtraList)))
}else{
this.form.ExtraList.push(JSON.parse(JSON.stringify(this.ExtraList)))
}
}
},
// 删除规则
deleteRule(row,index,type){
deleteRule(row,index,type,num){
if(type==2){
this.form.ProfitList.splice(index,1)
if(num){
this.form.FProfitList.splice(index,1)
}else{
this.form.ProfitList.splice(index,1)
}
}else if(type==3){
this.form.ExtraList.splice(index,1)
if(num){
this.form.FExtraList.splice(index,1)
}else{
this.form.ExtraList.splice(index,1)
}
}
},
AddMsg(){//新增
this.ruleVisible = true
this.titleName = '提成规则'
this.form.FExtraList.push(JSON.parse(JSON.stringify(this.FExtraList)))
},
SetRules(item){//编辑
this.titleName = '编辑规则'
......@@ -427,6 +637,11 @@
CountryId: item.CountryId>0||item.CountryId==0?item.CountryId:null,
ProfitList: item.ProfitList,
ExtraList: item.ExtraList,
IsEnableFBranch: item.IsEnableFBranch,
FProfitList: item.FProfitList&&item.FProfitList.length>0?item.FProfitList:item.IsEnableFBranch>0?[this.FProfitList]:[],
FExtraList: item.FExtraList&&item.FExtraList.length>0?item.FExtraList:[this.FExtraList],
FSingleVisaMoney: item.FSingleVisaMoney,
FTravelVisaMoney: item.FTravelVisaMoney
}
},
Delete(item){//删除
......@@ -449,6 +664,12 @@
})
.catch(() => {});
},
isSwitch(){
this.form.FProfitList = []
if(this.form.IsEnableFBranch){
this.form.FProfitList.push(JSON.parse(JSON.stringify(this.FProfitList)))
}
},
// 点击确定
RulesOk(formName) {
this.form.LineIds = this.form.LineIdList.join(',')
......@@ -553,7 +774,7 @@
<style scoped>
.hollowFixedBtn{
position: absolute;
top: 9px;
top: 0;
right: 20px;
}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 10px;background-color: #F1F1F1;cursor: pointer;position: relative;}
......@@ -617,4 +838,9 @@
/deep/.line-heigh .el-input-number{
line-height: 32px;
}
.titleOP{
font-size: 16px;
padding: 0 0 10px 0;
font-weight: bold;
}
</style>
src/components/orderCommon/order-form2.vue
View file @ 6e39bda2
......@@ -147,7 +147,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<!--出发是否联运-->
......@@ -190,7 +190,7 @@
<el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(priceObj, 2)"></el-switch>
</el-form-item>
</el-col>
<el-col :span="4">
<!--返程联运时间-->
......@@ -2230,8 +2230,9 @@
if (res.data.resultCode == 1) {
var tempData = res.data.data.pageData;
if (tempData && tempData.length > 0) {
this.priceObj = tempData[0];
this.priceObj = JSON.parse(JSON.stringify(tempData[0]));
}
}
});
},
......@@ -2280,8 +2281,8 @@
},
productObj: {
handler(oldValue, newVal) {
this.clearMsg();
this.getTravelPirceInfo();
// this.clearMsg();
// this.getTravelPirceInfo();
this.addMsg.DepartureCityId = oldValue.StartCityID;
this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId;
this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
......@@ -2305,13 +2306,14 @@
}
},
deep: true,
immediate: false
},
//监听TCID变化
PTCID: function (oldValue, newVal) {
// if (oldValue != newVal) {
// this.clearMsg();
// this.getTravelPirceInfo()
// }
if(oldValue){
this.clearMsg()
this.getTravelPirceInfo()
}
},
},
};
......
src/components/orderCommon/productOrderList.vue
View file @ 6e39bda2
......@@ -1151,7 +1151,7 @@
this.tripDetails = this.list[index].flightList;
},
goBuy(obj) {
this.teamInfo = obj;
this.teamInfo = JSON.parse(JSON.stringify(obj));
this.isShowTeamOrder = true;
},
// 产品详情
......
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