Commit f37a9bc6 authored by liudong1993's avatar liudong1993
parents 9c729559 3f5d5672
......@@ -329,21 +329,11 @@ export default {
if(this.$route.query.DayReport && this.$route.query.DayReport=='1'){
this.msg.IsFromDayReport =1;
}
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate?this.$route.query.sTradeDate:"";
this.msg.eTradeDate = this.$route.query.eTradeDate?this.$route.query.eTradeDate:"";
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.bankaccount_post_GetListS("query");
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId);
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
let mon1=this.$route.query.sTradeDate?this.$route.query.sTradeDate:moment().format("YYYY-MM-DD");
let mon2=this.$route.query.eTradeDate?this.$route.query.eTradeDate:moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
this.msg.eTradeDate=mon1;
......
......@@ -6,6 +6,15 @@
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<span>
<em>线路:</em>
<el-select class="w180 multiple_input" v-model="msg.LineId" clearable filterable @change="getHotelList">
<el-option v-for="item in LineList" :key="item.LineId" :label="item.LineName" :value="item.LineId">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>酒店名称:</em>
......@@ -43,9 +52,14 @@
<template slot-scope="scope">
<el-tooltip content="点击查看详情">
<span v-if="scope.row.priceType === '直客价'"
:style="{color: scope.row.SubList[index].Price <scope.row.SubList[index].TeamPrice ? 'red' : ''}"
:style="{color: scope.row.SubList[index].Price>0&&scope.row.SubList[index].Price <scope.row.SubList[index].TeamPrice ? 'red' : ''}"
@click="gotoPage(1,scope.row.SubList[index])" style="cursor:pointer;">
{{ scope.row.SubList[index].Price }}
<template v-if="scope.row.SubList[index].Price==0">
-
</template>
<template v-else>
{{ scope.row.SubList[index].Price }}
</template>
</span>
<span v-else @click="gotoPage(2,scope.row.SubList[index])" style="cursor:pointer;">
{{ scope.row.SubList[index].TeamPrice}}
......@@ -95,7 +109,15 @@
total: 0, //总条数
QStartDate: "",
QEndDate: "",
LineId: "",
},
LineList: [{
LineId: 14,
LineName: "日本线"
}, {
LineId: 1,
LineName: "东南亚线"
}],
userInfo: {}, //当前登录用户
dataList: [], //数据列表
hotelList: [], //酒店列表
......@@ -136,11 +158,14 @@
},
methods: {
gotoPage(type, item) {
//直客,天巡
//直客,天巡 变更为 Etrip
if (type == 1) {
var txUrl = "https://www.tianxun.com/hotels/search?entity_id=" + item.HotelId + "&checkin=" + item
.CheckInDate + "&checkout=" + item.CheckOutDate + "&adults=2&rooms=1&sort=-relevance";
window.open(txUrl);
var etripUrl = "https://search.etrip.net/Hotel/Search?hotelId=" + item.HotelId + "&checkIn=" + item
.CheckInDate + "&checkOut=" + item.CheckOutDate + "&rooms=2&userSearch=1"
window.open(etripUrl);
}
//道旅
else if (type == 2) {
......@@ -204,8 +229,15 @@
);
},
getHotelList() {
var hMsg = {
LineId: 0
};
if (this.msg.LineId && this.msg.LineId != 0) {
hMsg.LineId = this.msg.LineId;
}
this.hotelList = [];
this.apipost(
"AirTicket_post_GetSpiderHotelList", {},
"AirTicket_post_GetSpiderHotelList", hMsg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
......@@ -218,11 +250,6 @@
}
},
created() {
if (this.$route.query) {
// if (this.$route.query.AirticketId) {
// this.msg.AirticketId = this.$route.query.AirticketId;
// }
}
let myDate = new Date();
myDate.setDate(myDate.getDate() + 14);
let nowDate =
......@@ -232,7 +259,7 @@
"-" +
myDate.getDate();
this.msg.QStartDate = nowDate;
myDate.setMonth(myDate.getMonth() + 1); // 将当前时间的月份加1
this.msg.QEndDate = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1) + "-" + myDate
.getDate();
......
......@@ -5165,7 +5165,7 @@
});
}
this.addMsg.PreferPrice =
this.OpSetLossMoney +
(this.OpSetLossMoney +
dandijie +
lianyun +
chengren +
......@@ -5174,7 +5174,7 @@
laoren +
zafeiqianzhen +
danfang +
ertongbed - refundScenicPrice;
ertongbed - refundScenicPrice).toFixed(2);
// this.ScenicRefundMoney *
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
......@@ -5209,7 +5209,8 @@
this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
}
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
this.addMsg.PreferPrice = (this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney).toFixed(2);
} else {
let chengren =
......@@ -5275,7 +5276,7 @@
});
}
this.addMsg.PreferPrice =
this.OpSetLossMoney +
(this.OpSetLossMoney +
dandijie +
lianyun +
chengren +
......@@ -5284,7 +5285,8 @@
laoren +
zafeiqianzhen +
danfang +
ertongbed - refundScenicPrice;
ertongbed - refundScenicPrice).toFixed(2);
// this.ScenicRefundMoney *
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
......@@ -5319,12 +5321,13 @@
this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
}
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
this.addMsg.PreferPrice = (this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney).toFixed(2);
}
} else {
this.addMsg.PreferPrice =
Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) +
this.OpSetLossMoney;
(Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) +
this.OpSetLossMoney).toFixed(2);
}
this.getTicheng();
......
<template>
<!-- border-top: 1px solid #cccccc;margin-top: 5px -->
<div class="passengerSaleList">
<div class="passengerSaleList_topBtn" style="width: 30%;float:right;margin-bottom: 10px;">
<template v-if="isOrder==0">
......@@ -10,7 +9,6 @@
{{$t('objFill.v101.Rest.xuanzhelddy')}}</div>
<div v-show="tableList.length<guestNum" @click="goUrlA(0)">{{$t('pub.addBtn')}}</div>
</template>
<div v-if="isOrder==1 && isOneDay !== 1 && !isDis" @click="goUrlP()">{{$t('op.Fenfang')}}</div>
</div>
<div class="passengerSaleList_tableBox">
......@@ -161,8 +159,6 @@
getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】</span>
</div>
</div>
</div>
<div class="clearfix " style="float: left;width: 5%;">
......@@ -171,7 +167,6 @@
</div>
</div>
</div>
</div>
</div>
<el-dialog custom-class="w450" :title="$t('sm.exitsure')" :visible.sync="isShowOpSure" center
......
......@@ -166,7 +166,7 @@
</el-select>
</td>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBedNoneedBed')}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBed')}}</td>
<td>{{subItem.ESurName}}</td>
<td>{{subItem.EName}}</td>
<td>{{getSexStr(subItem)}}</td>
......@@ -208,7 +208,7 @@
{{subItem.GroupTypeStr}}
</td>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBedNoneedBed')}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBed')}}</td>
<td>{{subItem.ESurName}}</td>
<td>{{subItem.EName}}</td>
<td>{{getSexStr(subItem)}}</td>
......
......@@ -499,7 +499,7 @@
</el-form-item>
</td>
<td>
<template v-if="teamPrice&&teamPrice.SingleDMCPrice">
<template v-if="teamPrice&&teamPrice.SingleDMCPrice>=0">
<el-form-item :label="$t('objFill.dandijcb')">
<el-input v-model="teamPrice.SingleDMCPrice"
@keyup.native="checkInteger(teamPrice,'SingleDMCPrice')" @change="getchange()" class="w70">
......
......@@ -396,6 +396,7 @@ export default {
methods: {
clickSetAdmin(obj){
this.dialogFormVisible = true
this.resetForm('addMsg');
this.addType = 2
let list = obj.CustomerChildrenIds.split(',')
this.addMsg = {
......@@ -532,7 +533,7 @@ export default {
},
UploadAttachment(file) {
//上传
if(!this.fileLoading) return
if(this.fileLoading) return
this.fileLoading = true;
let newArr = [];
newArr.push(file.file);
......@@ -665,7 +666,6 @@ export default {
accountId:'',// 结算账户id
};
this.CustomerIDs = [];
this.resetForm('addMsg');
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
......
......@@ -161,7 +161,7 @@
let _date = myDate.getDate() > 9 ? myDate.getDate() : '0' + myDate.getDate();
this.msg.QStartDate = _year + '-' + _month + '-' + '01';
this.msg.QEndDate = _year + '-' + _month + '-' + _date;
this.msg.QStartDate = "2025-05-01";
//this.msg.QStartDate = "2025-05-01";
},
mounted() {
let userInfo = this.getLocalStorage();
......
This diff is collapsed.
This diff is collapsed.
......@@ -284,7 +284,6 @@
</div>
</td>
<td>
<!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" -->
<div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" v-if="item.HouseResult==1"></span>
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
......
......@@ -92,23 +92,23 @@
<!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0||PostConfig.TeamType==5" @saveMsg="SaveData(1)" ref="TravelPrice1"
@headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
:CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect" :dayObj="journeyList"></TravelPrice>
<!--小包团-->
<TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice2" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect">
:IsDirect="PostConfig.IsDirect" :dayObj="journeyList">
</TravelPrice2>
<!--当地游-->
<TravelPrice3 v-show="PostConfig.TeamType==2" @saveMsg="SaveData(1)" ref="TravelPrice3" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect"></TravelPrice3>
:IsDirect="PostConfig.IsDirect" :dayObj="journeyList"></TravelPrice3>
<!--地接团-->
<TravelPrice4 v-show="PostConfig.TeamType==3" @saveMsg="SaveData(1)" ref="TravelPrice4" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:TeamType="PostConfig.TeamType"></TravelPrice4>
:TeamType="PostConfig.TeamType" :dayObj="journeyList"></TravelPrice4>
</div>
<div class="btnFixedDiv" v-if="IsShowBtn">
......@@ -232,6 +232,7 @@
FeaturePageType: 0, //1横版 2竖版
TeamType: 0,
IsSplitTeam:0,//当团修改是否拆分团队(1-拆分)
BackScenicList:[],//可退景点
},
//行程
FeatureData: {
......@@ -434,14 +435,6 @@
this.Error(this.$t('objFill.v101.dmc.qingxuanzxl'));
return
}
// if (this.PostPrice && this.PostPrice.length > 0) {
// for (let i = 0; i < this.PostPrice.length; i++) {
// if (this.PostPrice[i].PriceTeamType == 3 && this.PostPrice[i].PriceOfferUrl == '') {
// this.Error(this.$t('fnc.tuanqi') + this.PostPrice[i].StartDate +this.$t('objFill.v101.myOrdersAllType.deriwdant'));
// return
// }
// }
// }
if (this.FeatureData.FeatureType == 9 && !this.isPptJourney) {
var that = this
that.Confirm(that.$t('objFill.v101.myOrdersAllType.dangqxcwbjxcsfbc'), function () {
......@@ -692,7 +685,6 @@
if (uploadConfig != undefined) {
var configData = JSON.parse(uploadConfig);
//基础数据组装
//this.PostConfig.Title = "";
this.PostConfig.IsDirect = 0;
//线路行程组装
let dayList = [];
......@@ -980,6 +972,7 @@
this.PostConfig.TripMapList = tempData.TripMapList;
this.PostConfig.NotQueryCityList = tempData.NotQueryCityList;
this.PostConfig.MapUrl = tempData.MapUrl;
this.PostConfig.BackScenicList=tempData.BackScenicList;
let arrList = function (list) {
list.forEach(x => {
x.CountrySelectList = []; //国家下拉列表
......
......@@ -873,7 +873,8 @@
</tr>
<tr v-for="item in priceData.ScenicBackList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox>
<!--<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox>-->
<el-checkbox v-model="item.IsChecked"></el-checkbox>
</td>
<td>
{{item.Name}}
......@@ -887,7 +888,8 @@
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicList">{{subItem.Name}}</span>
<span class="SD_flight" v-for="subItem in priceData.ScenicBackList"
v-if="subItem.IsChecked">{{subItem.Name}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i>
</div>
</el-popover>
......@@ -1224,11 +1226,11 @@
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
export default {
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect", "dayObj"],
data() {
return {
changePlat: "",//选择的平台
platformList: [],//平台列表
changePlat: "", //选择的平台
platformList: [], //平台列表
outerVisible: false,
currentDay: 1,
currentMonth: 1,
......@@ -1272,8 +1274,6 @@
offerList: [],
selectFilghtList: [],
FinfoList: [],
//选中景点
ScenicList: [],
//下拉框默认值
SelectDefaultValue: 0,
SelectOtherDefault: -1,
......@@ -1963,19 +1963,44 @@
}
});
},
//选中景点选择框
getScenic(item) {
item.IsChecked = !item.IsChecked;
this.initScenic();
},
//初始化景点
initScenic() {
this.ScenicList = [];
this.priceData.ScenicBackList.forEach(x => {
if (x.IsChecked) {
this.ScenicList.push(x);
var that = this;
var tempBackCouponList = [];
if (this.dayObj && this.dayObj.DayList && this.dayObj.DayList.length > 0 && this.PostConfig && this.PostConfig
.BackScenicList && this.PostConfig.BackScenicList.length > 0) {
this.dayObj.DayList.forEach(dItem => {
if (dItem.ScenicArray && dItem.ScenicArray.length > 0) {
dItem.ScenicArray.forEach(sItem => {
if (that.PostConfig.BackScenicList.indexOf(sItem.CouponsId) !== -1) {
var tempObj = {
ID: sItem.CouponsId,
IsChecked: false,
Name: sItem.CouponsName,
RefundMoney: 0
}
tempBackCouponList.push(tempObj);
}
})
}
})
}
if (tempBackCouponList && tempBackCouponList.length > 0) {
if (this.priceData.ScenicBackList && this.priceData.ScenicBackList.length == 0) {
this.priceData.ScenicBackList = JSON.parse(JSON.stringify(tempBackCouponList));
} else {
var scenicBackList = JSON.parse(JSON.stringify(this.priceData.ScenicBackList));
this.priceData.ScenicBackList = [];
scenicBackList.forEach(x => {
var tempObj = tempBackCouponList.find(sItem => sItem.ID == x.ID);
if (tempObj) {
that.priceData.ScenicBackList.push(x);
}
})
}
})
} else {
this.priceData.ScenicBackList = [];
}
},
goUrl(path, id) {
this.$router.push({
......@@ -2250,6 +2275,13 @@
},
deep: true
},
dayObj: {
//监听行程景点是否编号
handler: function (val, oldVal) {
this.initScenic();
},
deep: true
},
},
components: {
TravelPriceFlightList: TravelPriceFlightList,
......
......@@ -857,7 +857,7 @@
</tr>
<tr v-for="item in priceData.ScenicBackList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox>
<el-checkbox v-model="item.IsChecked"></el-checkbox>
</td>
<td>
{{item.Name}}
......@@ -871,7 +871,8 @@
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicList">{{subItem.Name}}</span>
<span class="SD_flight" v-for="subItem in priceData.ScenicBackList"
v-if="subItem.IsChecked">{{subItem.Name}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i>
</div>
</el-popover>
......@@ -1200,7 +1201,6 @@
<button class="hollowFixedBtn" @click="lessPriceVisible=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -1209,7 +1209,7 @@
import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType", "CurrentUserInfo",
"IsDirect"
"IsDirect", "dayObj"
],
data() {
return {
......@@ -1955,19 +1955,44 @@
}
});
},
//选中景点选择框
getScenic(item) {
item.IsChecked = !item.IsChecked;
this.initScenic();
},
//初始化景点
initScenic() {
this.ScenicList = [];
this.priceData.ScenicBackList.forEach(x => {
if (x.IsChecked) {
this.ScenicList.push(x);
var that = this;
var tempBackCouponList = [];
if (this.dayObj && this.dayObj.DayList && this.dayObj.DayList.length > 0 && this.PostConfig && this.PostConfig
.BackScenicList && this.PostConfig.BackScenicList.length > 0) {
this.dayObj.DayList.forEach(dItem => {
if (dItem.ScenicArray && dItem.ScenicArray.length > 0) {
dItem.ScenicArray.forEach(sItem => {
if (that.PostConfig.BackScenicList.indexOf(sItem.CouponsId) !== -1) {
var tempObj = {
ID: sItem.CouponsId,
IsChecked: false,
Name: sItem.CouponsName,
RefundMoney: 0
}
tempBackCouponList.push(tempObj);
}
})
}
})
}
if (tempBackCouponList && tempBackCouponList.length > 0) {
if (this.priceData.ScenicBackList && this.priceData.ScenicBackList.length == 0) {
this.priceData.ScenicBackList = JSON.parse(JSON.stringify(tempBackCouponList));
} else {
var scenicBackList = JSON.parse(JSON.stringify(this.priceData.ScenicBackList));
this.priceData.ScenicBackList = [];
scenicBackList.forEach(x => {
var tempObj = tempBackCouponList.find(sItem => sItem.ID == x.ID);
if (tempObj) {
that.priceData.ScenicBackList.push(x);
}
})
}
})
} else {
this.priceData.ScenicBackList = [];
}
},
goUrl(path, id) {
this.$router.push({
......@@ -2260,7 +2285,14 @@
this.initCalendar();
},
deep: true
}
},
dayObj: {
//监听行程景点是否编号
handler: function (val, oldVal) {
this.initScenic();
},
deep: true
},
},
components: {
TravelPriceFlightList: TravelPriceFlightList,
......
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