Skip to content

S
SuperMan
Commit d45a7f70 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 23105f31 3a0f2f83
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 534 additions and 137 deletions
src/components/FinancialModule/viittoCommissions.vue 0 → 100644
View file @ d45a7f70
<template>
<div class="Feedback">
<ul style="overflow: initial!important">
<li style="float:right;margin-bottom:10px">
<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="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,
dataList: [],
loading: false,
ruleVisible: false,
form: {
LineName: '出境日本线',
LineID: 14,
EmployeeId: '',
CommissionPercent: 0,
},
EmployeeList: [],
rules: {
EmployeeId: [{
required: true,
message: '请选择参与人员',
trigger: 'change'
}],
CommissionPercent: [{
required: true,
message: "请输入占比",
trigger: "blur"
}],
},
}
},
created() {},
mounted() {
this.getList();
this.getEmployeeList();
},
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 => {}
)
},
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/Hotel/HotelDiscount.vue
View file @ d45a7f70
......@@ -526,11 +526,7 @@ export default {
if(item.FinanceId==0){
this.customerListAll.push(item)
}
})
console.log("this.customerListAll",this.customerListAll)
}
});
},
......
src/components/SingleContract.vue
View file @ d45a7f70
......@@ -1666,7 +1666,6 @@
res => {
if (res.data.resultCode == 1) {
var tempObj = res.data.data;
console.log("temp", tempObj);
this.CtObj.ID = tempObj.ID;
this.CtObj.CType = tempObj.CType;
this.CtObj.T_ContractNum = tempObj.T_ContractNum;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d45a7f70
......@@ -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/administrative/AirticketCommissionDetail.vue
View file @ d45a7f70
......@@ -25,12 +25,16 @@
<td>{{item.TotalPersion}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td>
<td><a @click="goUrl(item)" style="color:blue;text-decoration:underline;cursor:pointer;">详情</a></td>
<td>
<a @click="goUrl(item)" style="color:blue;text-decoration:underline;cursor:pointer;">详情</a>&nbsp;&nbsp;
<a
@click="DownLoadAirticketCommission(item)"
style="color:blue;text-decoration:underline;cursor:pointer; display:none;">下载差异</a>
</td>
</tr>
</table>
</div>
</template>
<script>
export default {
data() {
......@@ -41,14 +45,30 @@
loading: false,
//数据源
dataList: [],
CurrentUserInfo: {}, //当前登录对象
}
},
mounted() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
this.msg.MainId = this.$route.query.ID;
this.getList();
},
methods: {
//下载票务提成差异
DownLoadAirticketCommission(item) {
this.loading = true;
//导出报表
let msg = {
UserId: item.UserId,
Periods: item.Periods
};
var fileName = item.UName + "【" + item.Periods + "】" + "提成差异.xls";
this.GetLocalFile("airticket_get_DownloadAirticketCommission", msg, fileName,
res => {
this.loading = false;
});
},
//获取数据
getList() {
this.loading = true;
......@@ -70,8 +90,8 @@
this.$router.push({
path: "flightPerformance",
query: {
UserId:item.UserId,
Periods:item.Periods,
UserId: item.UserId,
Periods: item.Periods,
blank: 'y',
tab: '票务业绩详情'
}
......@@ -79,4 +99,5 @@
}
},
}
</script>
\ No newline at end of file
</script>
src/components/administrative/ElectronicAudit.vue
View file @ d45a7f70
......@@ -435,7 +435,6 @@
this.apipost("travelcontract_post_GetContractPageListService",this.msgOut,res => {
this.loadingOut = false;
if (res.data.resultCode === 1) {
console.log(res,'ressss');
this.dataListOut = res.data.data.pageData;
this.total2=res.data.data.count;
} else {
......
src/components/dmc/manager/tripsManager.vue
View file @ d45a7f70
......@@ -404,7 +404,6 @@
font-size: 12px;
border: 1px solid #E5E5E5;
}
</style>
<template>
<div>
......@@ -466,7 +465,8 @@
</li>
<li>
<button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<input type="button" class="hollowFixedBtn" :value="$t('op.TDHT')" @click="heTuan" v-show="this.ArrList.length>1" />
<input type="button" class="hollowFixedBtn" :value="$t('op.TDHT')" @click="heTuan"
v-show="this.ArrList.length>1" />
</li>
</ul>
</div>
......@@ -555,10 +555,19 @@
<span>{{$t('Airticket.Air_StartTime')}}</span>
{{item.StartDate}}
</p>
<p>
<span>{{$t('leader.leader_Leader')}}</span>
<span v-if="item.LeaderName" class="TCL-greenType">{{item.LeaderName}}</span>
<span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
</p>
<p>
<span>{{$t('leader.leader_Guide')}}</span>
<span v-if="item.GuideName" class="TCL-greenType">{{item.GuideName}}</span>
<span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
</p>
</div>
</td>
<td>
<td style="width:20%">
<div class="d5">
<p>
<i class="iconfont icon-tuanwei"></i>{{$t('visa.v_tuanweiinfo')}}
......@@ -576,6 +585,18 @@
<span v-if="item.IsSubstitution==1">{{$t('visa.v_yxhoubu')}}</span>
<span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span>
</p>
<p>
<span>参团</span>
<span>{{item.JoinNum+item.SingleGroupNum}}</span> <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</p>
<p>
<span>自由行</span>
<span>{{item.IndependentTravelNum}}</span>
<span>单机票</span>
<span>{{item.SingleAirTicketNum}}</span>
<span>单地接</span>
<span>{{item.SingleDMNum}}</span>
</p>
</div>
</td>
<td width="240">
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ d45a7f70
......@@ -85,7 +85,8 @@
export default {
provide() {
return {
loadConfigInfo: this.firstLoadConfigInfo
loadConfigInfo: this.firstLoadConfigInfo,
reload:this.reload
}
},
data() {
......@@ -821,7 +822,12 @@
updated: function () {
this.MsgBus.$emit('FeatureDataFlag');
},
watch: {},
watch: {
// 方法1
'$route' (to, from) { //监听路由是否变化
location.reload()
},
},
mounted() {
this.ScrollMethod();
},
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ d45a7f70
......@@ -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/components/scenicSpot/admissionStatisticsDetails.vue
View file @ d45a7f70
......@@ -9,7 +9,8 @@
</template>
<template v-else>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="CurrentUserInfo.EmployeeId == 615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="CurrentUserInfo.EmployeeId == 615" type="button" class="fr normalBtn mb30" value="保存"
@click="saveList(1)" />
</template>
</li>
</ul>
......@@ -49,7 +50,9 @@
<table class="scenicTable">
<tr>
<td colspan="2" style="text-align:left;padding-left:8px;">
{{subItem.ScenicName}}
<span class="spanlink" @click="goUrl('ticketManagement',subItem,'门票管理')">
{{subItem.ScenicName}}
</span>
</td>
</tr>
<tr>
......@@ -88,24 +91,31 @@
@input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
</td>
<td>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<span v-else>
<template v-if="CurrentUserInfo.EmployeeId==615">
<el-input class='w135' v-model='childItem.PeoplePrice' @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
</template>
<template v-else>
{{childItem.PeoplePrice}}
</template>
</span>
<template v-if="CurrentUserInfo.EmployeeId==615">
<el-input class='w135' v-model='childItem.PeoplePrice'
@keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
</template>
<template v-else>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<span v-else>
{{childItem.PeoplePrice}}
</span>
</template>
</td>
<td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
</td>
<td>
<span class="spanlink" v-if='childItem.DiscountPrice==0'
@click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span>
<span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span>
<template v-if="CurrentUserInfo.EmployeeId==615">
<el-input class='w135' v-model='childItem.DiscountPrice'
@keyup.native="checkPrice(childItem,'DiscountPrice')" type="text"></el-input>
</template>
<template v-else>
<span class="spanlink" v-if='childItem.DiscountPrice==0'
@click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span>
<span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.TotalPrice}}
......@@ -160,9 +170,9 @@
loading: false,
IsOperation: '',
//当前登录人信息
CurrentUserInfo:{},
CurrentUserInfo: {},
//是否禁用按钮
IsDisabled:false,
IsDisabled: false,
}
},
methods: {
......@@ -215,7 +225,7 @@
}, err => {})
},
saveList(type) {
this.IsDisabled=true;
this.IsDisabled = true;
if (type == 0) {
this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(insideItem => {
......@@ -250,9 +260,9 @@
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.IsDisabled=false;
this.IsDisabled = false;
} else {
this.IsDisabled=false;
this.IsDisabled = false;
this.$message.error(res.data.message);
}
}, err => {})
......
src/router/config.js
View file @ d45a7f70
......@@ -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