Skip to content

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

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

parents 1384d450 09ffcfff
Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 248 deletions
src/components/Hotel/HotelWorkList.vue
View file @ c7be6b26
......@@ -11,7 +11,6 @@
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList()" />
<!-- <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" /> -->
</li>
</ul>
</div>
......@@ -36,10 +35,12 @@
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存
</div>
</template>
<template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
<template v-else>
<template
v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
<div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">
<template v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
<div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'"
v-if="childItem.DMCState==0">
{{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'"
v-if="childItem.DMCState==1">
......@@ -47,8 +48,74 @@
<div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'"
v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
</template>
</template>
<template v-else>
<a style="text-decoration:underline;cursor:pointer;">添加酒店</a>
<el-popover width="650" trigger="click" popper-class="Bus_HotelPop" style="display:none;">
<table v-loading="changeLoading">
<tr>
<th width="60">
选择
</th>
<th width="140">
团号
</th>
<th width="120">
酒店
</th>
<th width="120">
更换酒店
</th>
<th width="100">
OP状态
</th>
<th width="100">
地接状态
</th>
</tr>
<tr v-for="(hItem,hIndex) in ChangeHotelList">
<td>
<el-checkbox :checked="hItem.IsChecked" @change="ChangeStatus(hItem)"></el-checkbox>
</td>
<td style="text-align:center;">
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</td>
<td style="text-align:left;">
{{hItem.OldHotelName}}
</td>
<td style="text-align:left;">
{{hItem.NewHotelName}}
</td>
<td>
<template v-if="hItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
</td>
<td>
<template v-if="hItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</td>
</tr>
<tfoot>
<tr>
<td colspan="6">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder(scope.row.Hotel)" />
</td>
</tr>
</tfoot>
</table>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="GetChangeList(item.DateAllStr)">设置酒店</div>
</el-popover>
</template>
</template>
</template>
......@@ -74,9 +141,14 @@
dataList: [],
loading: false,
isShow: false,
changeLoading: false, //改变酒店loading
ChangeHotelList: [], //获取可变更的酒店列表
};
},
methods: {
ChangeStatus(item) {
item.IsChecked = !item.IsChecked;
},
GotoHotel(HotelId) {
this.$router.push({
path: "HotelManagement",
......@@ -99,7 +171,6 @@
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
this.isShow = true;
console.log("this.dataList", this.dataList);
} else {
this.Error(res.data.message);
}
......@@ -107,7 +178,58 @@
err => {}
);
},
//获取可以改变的酒店列表
GetChangeList(useTime) {
this.changeLoading = true;
this.ChangeHotelList = [];
this.apipost("journeyorder_post_GetCanChangeHotelListService", {
UseTime: useTime
},
res => {
this.changeLoading = false;
if (res.data.resultCode == 1) {
this.ChangeHotelList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//保存酒店订单
SaveHotelOrder(HotelID) {
var newList=[];
if (this.ChangeHotelList && this.ChangeHotelList.length > 0) {
this.ChangeHotelList.forEach(item => {
if(item.IsChecked)
{
var Nitem=JSON.parse(JSON.stringify(item));
Nitem.NewHotelID=HotelID;
newList.push(Nitem);
}
});
}
if(newList&&newList.length>0)
{
this.apipost("journeyorder_post_SaveWorkHotelOrderService",newList,
res => {
if (res.data.resultCode == 1) {
con
} else {
this.Error(res.data.message);
}
},
err => {}
);
}else
{
this.Info("请选择团期!");
}
}
},
mounted() {
this.msg.YearMonthStr = new Date().Format("yyyy-MM");
......
src/components/LeaderManagement/leaderPerformance.vue
View file @ c7be6b26
......@@ -312,7 +312,7 @@
<el-option :key="-1" label="全部" :value="-1"></el-option>
<el-option v-for="item in yearList" :key="item" :label="item" :value="item"></el-option>
</el-select>
<el-select v-model="msg.Month" >
<el-select v-model="msg.Month">
<el-option :key="-1" label="全部" :value="-1"></el-option>
<el-option v-for="item in monthList" :key="item" :label="item" :value="item"></el-option>
</el-select>
......@@ -327,6 +327,7 @@
<el-option label="总榜" :value='6'></el-option>
<el-option label="人均" :value='4'></el-option>
<el-option label="回佣人均" :value='5'></el-option>
<el-option label="人均低于1W" :value='7'></el-option>
</el-option>
</el-select>
</span>
......@@ -369,8 +370,13 @@
回佣人均
<i></i>
</li>
<li :class="msg.Type==7?'Day_active':''" @click="msg.Type=7,getStatis()" title="回佣人均低于1W">
人均低于1W
<i></i>
</li>
</ul>
<div class="ChampionsLeague clearfix">
<template v-if="msg.Type!=7">
<div class="championList" v-for="item in yajun" :key="item.subCode">
<div class="runnderUp">
<img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
......@@ -401,8 +407,30 @@
<div class="championName">{{item.Name}}</div>
<div class="championMoney cmoney">￥{{item.LeaderExtract}}</div>
</div>
</template>
<template v-else>
<table class="singeRowTable" style="margin-top:5px;">
<tr>
<th width="100">编号</th>
<th width="100">姓名</th>
<th width="200">人均回佣金额</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>
{{index+1}}
</td>
<td>
{{item.Name}}
</td>
<td>
￥{{item.LeaderExtract}}
</td>
</tr>
</table>
</template>
</div>
</div>
<template v-if="msg.Type!=7">
<div class="leftBottom clearfix">
<div class="bottomList">
<div class="btLittle" v-for="(item,index) in fourToSeven" :key="item.subCode">
......@@ -431,7 +459,9 @@
</div>
</div>
</div>
</template>
</div>
<template v-if="msg.Type!=7">
<div class="rightDiv">
<div class="_btTitle" v-for="(item,index) in twelveToTwenty" :key="item.subCode">
<div class="tweleindex">{{12+index}}</div>
......@@ -445,6 +475,7 @@
</div>
</div>
</div>
</template>
</div>
</div>
</template>
......@@ -465,7 +496,7 @@
},
//工作类型
workTypeList: [],
DataList: "",
DataList: [],
//冠军
Champion: [],
//亚军
......@@ -493,11 +524,10 @@
Type: this.msg.Type,
QLeaderType: this.msg.QLeaderType,
QMonthStr: this.msg.MonthStr,
ShoppingID:this.msg.ShoppingID
ShoppingID: this.msg.ShoppingID
};
if(msg.Type==4||msg.Type==5)
{
msg.QMonthStr=this.msg.Year+","+this.msg.Month;
if (msg.Type == 4 || msg.Type == 5 || msg.Type == 7) {
msg.QMonthStr = this.msg.Year + "-" + this.msg.Month;
}
this.Champion = [];
this.yajun = [];
......@@ -505,16 +535,19 @@
this.fourToSeven = [];
this.eightToeleven = [];
this.twelveToTwenty = [];
this.DataList = [];
this.apipost("LeaderSchedule_get_GetLeaderList", msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
if (res.data.data.length > 0) {
this.Champion = res.data.data.splice(0, 1);
this.yajun = res.data.data.splice(0, 1);
this.jijun = res.data.data.splice(0, 1);
this.fourToSeven = res.data.data.splice(0, 4);
this.eightToeleven = res.data.data.splice(0, 4);
this.twelveToTwenty = res.data.data.splice(0, 9);
this.DataList =JSON.parse(JSON.stringify(res.data.data));
var nArray = JSON.parse(JSON.stringify(res.data.data));
if (nArray && nArray.length > 0) {
this.Champion = nArray.splice(0, 1);
this.yajun = nArray.splice(0, 1);
this.jijun = nArray.splice(0, 1);
this.fourToSeven = nArray.splice(0, 4);
this.eightToeleven = nArray.splice(0, 4);
this.twelveToTwenty = nArray.splice(0, 9);
}
}
},
......@@ -550,8 +583,8 @@
},
mounted() {
var Year = new Date().getFullYear();
this.msg.Year= new Date().getFullYear();
this.msg.Month= new Date().getMonth() + 1;
this.msg.Year = new Date().getFullYear();
this.msg.Month = new Date().getMonth() + 1;
let count = Year - (Year - 8);
for (let i = 0; i <= count; i++) {
this.yearList.push(Year - i);
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ c7be6b26
......@@ -242,7 +242,7 @@
</p>
</td>
<td style="white-space:nowrap; ">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1 && subItem.DMCPayType !== 9 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ c7be6b26
......@@ -562,8 +562,8 @@ export default {
}
},
queren(type, OrderID){
let text = type == 1 ? '确认' : '取消'
this.$confirm('确定“'+ text +'”订单？', this.$t('tips.tips'), {
let text = type == 1 ? '确认后，订单不会自动取消' : '取消后，订单会自动取消'
this.$confirm(text, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
......@@ -690,12 +690,13 @@ export default {
},
//点击收款
getShouKuan(obj){
let TCIDARR = obj.TCID ? [obj.TCID] : [];
let orderObj = {
OrderID:obj.OrderID,
OrderSource:1,
Obj: {},
SourceID:null,
TCIDList: []
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
......
src/components/leaderPay2.vue
View file @ c7be6b26
......@@ -362,7 +362,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{diningTotalPrice(subItem, subItem.DiningPriceList)}}
</td>
<td v-if="childIndex==0 && subIndex ==0" :rowspan="item.data.length * subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
......@@ -370,46 +370,7 @@ input[type="number"] {
</tr>
</template>
</template>
<!-- <template v-for='(item,index) in list.DiningList'>
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.UseDinnerTypeStr}}
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{diningTotalPrice(subItem, subItem.DiningPriceList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
......@@ -496,67 +457,12 @@ input[type="number"] {
</tr>
</template>
</template>
<!-- <template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.HotelName}}
</td>
<td>
<span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span>
<span v-if="childItem.HouseType === 6">不占床</span>
</td>
<td>
{{childItem.BookNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable">
<tr>
<th>类型</th>
<th>预计总金额</th>
<th>实付金额</th>
<!-- <th>报账金额
<input
v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
type="button"
value="保存"
class="leader2Btn"
@click="saveBZPrice()"
></th> -->
<th width="40">操作</th>
</tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0">
......@@ -564,7 +470,7 @@ input[type="number"] {
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingExpendTotalPrice)}}</td>
<td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhi')">明细</span> -->
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiZ')">明细</span> -->
</td>
</tr>
<tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
......@@ -572,12 +478,9 @@ input[type="number"] {
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
<td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiS')">明细</span> -->
</td>
</tr>
<!-- <tr v-show="totalList.IncomeTotalPrice>0">
<td>消费收入</td>
<td>{{moneyFormat(totalList.IncomeTotalPrice)}}</td>
</tr> -->
<tr
v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0"
>
......@@ -585,6 +488,7 @@ input[type="number"] {
<td>0</td>
<td>{{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}</td>
<td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('qitaF')">明细</span> -->
</td>
</tr>
<tr v-for="item in planPriceList">
......@@ -605,30 +509,6 @@ input[type="number"] {
</td>
</tr>
<!-- <tr v-show="totalScenicPrice>0">
<td>景点门票</td>
<td>{{moneyFormat(OtherTotalPrice)}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('ticket')">明细</span></td>
</tr>
<tr v-show="totalTrafficPrice>0">
<td>交通</td>
<td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('bus')">明细</span></td>
</tr>
<tr v-show="totalDinnerPrice>0">
<td>餐饮</td>
<td>{{moneyFormat(IncomeTotalPrice)}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('dining')">明细</span></td>
</tr>
<tr v-show="totalHotelPrice>0">
<td>酒店</td>
<td>{{moneyFormat(ExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('hotel')">明细</span></td>
</tr> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable">
<tr>
......@@ -1169,18 +1049,6 @@ export default {
if(res.data.resultCode == 1) {
let data = res.data.data;
this.ClientAccountListS = data;
// data.forEach(x=>{
// let obj = {
// ID:x.ID,
// Name:x.AccountHolder,
// Nom:x.CardNum,
// OpenBankName:x.OpenBankName,
// allName:x.CardNum,
// ObjID:x.ObjID,
// }
// ClientAccountList.push(obj)
// })
// this.ClientAccountListS = ClientAccountList;
}
}, err => {})
},
......@@ -1205,6 +1073,9 @@ export default {
} else if (name === 'hotel') {
path = 'leaderPayHotelDetail'
date = obj ? obj.CheckInDateStr : 'all'
} else if (name === 'qitaF') {
path = 'leaderPayQiTalDetail'
date = obj ? obj.CheckInDateStr : 'all'
}
let fullPath = `/${path}?TCIDs=${TCIDs}&date=${date}`;
let dom = document.querySelector("#blankLink");
......@@ -1662,6 +1533,13 @@ export default {
}
}
}
for(var i = 0; i < Diningdest.length; i++){
let row = 0;
for(var l = 0; l < Diningdest[i].data.length; l++){
row = row + Diningdest[i].data[l].DiningPriceList.length
}
Diningdest[i].row = row
}
this.DiningDataList = Diningdest
//票
let ScenicList = []
......
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