Skip to content

S
SuperMan
Commit 52707802 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 1a40dfee
Hide whitespace changes
Inline Side-by-side
Showing with 337 additions and 6 deletions
src/components/FinancialModule/viittoCommissions.vue 0 → 100644
View file @ 52707802
<template>
<div class="Feedback">
<ul style="overflow: initial!important">
<!-- <li>
<span>
<em>公司</em>
</span>
<el-select filterable v-model="obj.BranchId" >
<el-option label="不限" :value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<li>
<span>
<em>线路</em>
</span>
<el-select filterable v-model="obj.LineId" >
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select>
</li> -->
<li style="float:right;margin-bottom:10px">
<!-- <input
type="button"
class="hollowFixedBtn"
value="查询"
@click="getList()"
> -->
<input
type="button"
class="hollowFixedBtn"
value="新增"
@click="addRule"
>
</li>
</ul>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th style="width:30%">线路名称</th>
<th>人员</th>
<th>占比</th>
<th>设置</th>
</tr>
<tr>
<td>全部</td>
<td>地接账户基金</td>
<td>{{allzb}}%</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>
<tbody v-for="(item,i) in dataList" :key="i">
<tr v-for="(com,index) in item.OPCommissionList" :key="index">
<td :rowspan="item.OPCommissionList.length" v-if="index==0">{{item.LineName}}</td>
<td>{{com.EmployeeName}}</td>
<td>{{com.CommissionPercent}}%</td>
<td>
<el-button @click="SetRules(com)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button @click="Delete(com)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
</td>
</tr>
</tbody>
<tr v-if="dataList.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</table>
<el-dialog
title="提成规则"
:visible.sync="ruleVisible"
width="400px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<!-- <el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable value-key="item" v-model="form.LineIdList" @change="getLine">
<el-option v-for="item in LineList" :label='item.LineName' :value='item' :key='item.LineID'></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="人员" prop="EmployeeId">
<el-select class="multiple_input" filterable v-model="form.EmployeeId" >
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="占比" prop="CommissionPercent">
<el-input class="w220" @keyup.native="checkPrice(form,'CommissionPercent')" v-model="form.CommissionPercent"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">取 消</el-button>
<el-button size="small" type="danger" @click="RulesOk('form')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import moment from "moment"
import { constants } from 'fs';
export default {
name: 'Feedback',
data (){
return{
allzb:100,
obj:{
BranchId:-1,
LineId:0,
},
dataList:[],
loading:false,
dateList:[],
LineList:[],
companyList:[],
ruleVisible:false,
form:{
// LineIdList:[],
LineName:'出境日本线',
LineID:14,
EmployeeId:'',
CommissionPercent:0,
},
departmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id:'-1',
Status:'0',
ParentId:'-1',
Tier:'0',
},
LineTeamList:[],
EmployeeList:[],
rules:{
EmployeeId: [
{ required: true, message: '请选择参与人员', trigger: 'change' }
],
CommissionPercent: [{ required: true, message: "请输入占比", trigger: "blur" }],
},
departmentList:[]
}
},
created(){
},
mounted(){
this.getList();
this.getEmployeeList();
this.getLineList();
},
methods:{
Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('OPCommission_RemoveOPCommission', {ID:item.Id}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
}else{
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
addRule(){
this.ruleVisible=true;
this.form={
LineName:'出境日本线',
LineID:14,
EmployeeId:'',
CommissionPercent:0,
}
},
SetRules(item){
this.ruleVisible=true;
this.form={
LineName:'出境日本线',
LineID:14,
EmployeeId:item.EmployeeId,
CommissionPercent:item.CommissionPercent,
Id:item.Id
}
},
RulesOk(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
let num=0;
let newnum=0;
if(this.form.Id){
this.dataList.forEach(item=>{
item.OPCommissionList.forEach(com=>{
if(com.Id!=this.form.Id){
num+=com.CommissionPercent;
}
})
})
newnum=100-num;
}else{
newnum=this.allzb;
}
if(Number(this.form.CommissionPercent)>newnum || Number(this.form.CommissionPercent)==0){
this.Error("请输入正确的占比！");
return;
}
this.apipost(
'OPCommission_SetOPCommission', this.form,
res => {
if (res.data.resultCode == 1) {
this.getList();
this.ruleVisible=false;
this.Success(res.data.message)
}else{
this.Error(res.data.message)
}
},
err => {
}
)
} else {
}
});
},
getEmployeeList () {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {
}
)
},
getLineList() {
this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
linkageDepartment(){
this.departmentMsg.RB_Branch_Id=this.form.BranchId;
this.departmentList=[];
this.form.DepartmentId=-1;
this.getDepartment();
},
getDepart(id){
this.form.DepartmentId= id;
this.$forceUpdate();
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
}
}, err => {})
},
getList(){
this.loading=true;
this.apipost("OPCommission_GetPageList", {}, res => {
this.loading=false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
// allzb
let num=0;
this.dataList.forEach(item=>{
item.OPCommissionList.forEach(com=>{
num+=com.CommissionPercent;
})
})
this.allzb=100-num;
}
});
},
}
}
</script>
<style>
.Feedback ul>li{
display: inline-block;
font-size: 12px;
color: #666;
margin: 20px 30px 0px 0;
}
.Feedback .singeRowTable{
margin-top: 20px;
}
</style>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 52707802
......@@ -954,6 +954,11 @@
<script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
export default {
provide(){
return{
reload:this.reload
}
},
data() {
return {
//查询数据列表
......@@ -1150,6 +1155,13 @@ export default {
components: {
commonHotelInfo
},
//监听器
watch: {
// 方法1
'$route' (to, from) { //监听路由是否变化
location.reload()
},
},
methods: {
//获取TCID
clickAirticket(item) {
......@@ -2114,12 +2126,11 @@ export default {
}
var routeName = this.$route.name
if (routeName == 'TravelControlList') {
this.queryMsg.TeamType = 0;
this.queryMsg.TeamType = 0;
}
if (routeName == 'TravelControlList2') {
this.queryMsg.TeamType = 3;
this.queryMsg.TeamType = 3;
}
this.getControlList();
}
};
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 52707802
......@@ -455,13 +455,13 @@
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</div>
<el-form-item prop="B2BMemberPrice" :class="{'showOther':TeamType==3}">
<el-form-item prop="B2BMemberPrice" >
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="B2BPrice" :class="{'showOther':TeamType==3}">
<el-form-item prop="B2BPrice" >
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
......@@ -870,7 +870,7 @@
<div class="TPNotice">{{$t('sm.ysbjchajiacl')}}</div>
</div>
</div>
<TravelPriceFlightList :class="{'showOther':TeamType==3}" @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
<TravelPriceFlightList @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds"
:selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div>
......
src/router/config.js
View file @ 52707802
......@@ -3893,6 +3893,15 @@ export default {
title: '地接提成规则'
}
},
{
path: '/viittoCommissions',
name: 'viittoCommissions',
component: resolve => require(['@/components/FinancialModule/viittoCommissions'], resolve),
meta: {
title: '微途提成规则'
}
},
{
path: '/Qzcommissions',
name: 'Qzcommissions',
......
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