Skip to content

S
SuperMan
Commit dbfd1142 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 11ce2fa5 e71674bd
Show whitespace changes
Inline Side-by-side
Showing with 327 additions and 312 deletions
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ dbfd1142
......@@ -16,7 +16,7 @@
.CapitalDetail .Ca_title{
width:190px;
margin:auto;
font-size:14px;
font-size:16px;
margin-top:20px;
color:#333333;
text-align: center;
......@@ -25,13 +25,15 @@
width:100%;
font-size:14px;
text-align: center;
margin-bottom: -8px;
}
.CapitalDetail .Ca_line{
width:110px;
height:3px;
margin:8px auto 10px;
border-top:1px solid #333333;
border-bottom:1px solid #333333;
border-top:1px solid #777373;
border-bottom:2px solid;
/* border-bottom:1px solid #333333; */
}
.CapitalDetail .collection_Order{
width:100%;
......@@ -200,7 +202,7 @@
<div class="Co_oderleft">
<div class="Ca_leftOrder">
<div class="Ca_title">{{dataList.CompanyName}}</div>
<div class="Ca_t2">资金调拨单</div>
<div class="Ca_t2">{{dataList.FinanceName}}</div>
<div class="Ca_line"></div>
<div class="clearfix collection_Order">
<div class="Co_oderleft">
......@@ -324,8 +326,8 @@
<div class="clearfix Ca_popDiv" v-if="dataList.AuditSteps!=''">
<template v-for="(item,index) in dataList.AuditSteps">
<p>{{item.AuditDescription}}：
<template v-if="item.AuditRecordList.length>0">
<span class="_r_name" v-for="(s,si) in item.AuditRecordList" v-if="s.AuditStatus==2">{{s.AuditName}} </span>
<template v-if="item.Status===2">
<span class="_r_name" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
</template>
</p>
</template>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ dbfd1142
......@@ -161,6 +161,7 @@
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option>
<el-option key="2" value="4" label="资金调拨"></el-option>
</el-select>
</span>
</li>
......
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ dbfd1142
......@@ -245,32 +245,49 @@
<th>团队编号</th>
<th>发团日期</th>
<th>订单号</th>
<th>客户信息</th>
<th>业务员</th>
<th>应收金额</th>
<th>实收金额</th>
<th>待收金额</th>
<th>已退款</th>
<th>平台税金</th>
<th>在途金额</th>
</tr>
<tr v-for=" ( item , index ) in DataList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', item.TCID, 1, 0)"> {{ item.TCNUM }} （{{ item.TCID }}） </span> </td>
<td> {{ item.StartDate }} </td>
<td colspan="7">
<td colspan="9">
<table class="_singeRowTable_two" style="width: 100%;table-layout: fixed;border-collapse: collapse;" cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr v-for=" ( son , sIndex ) in item.OrderList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', son.OrderId, 2, item.TCID)"> {{ son.OrderId }} </span> </td>
<td> {{ son.ContactName }} </td>
<td> {{ son.EmName }} </td>
<td> {{ son.PreferPrice }} </td>
<td> <span :class="son.DaiShou > 0 ? '':'_color_red'"> {{ son.Income }} </span> </td>
<td> <span :class="son.DaiShou > 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
<td>{{ son.DaiShou}} </td>
<td> {{ son.Refund }} </td>
<td> {{ son.PlatformTax }} </td>
<td> {{ son.ZaiTuMoney }} </td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td>合计</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>{{Statistics.PreferPrice}}</td>
<td>{{Statistics.Income}}</td>
<td>{{Statistics.DueinMoney}}</td>
<td>{{Statistics.Refund}}</td>
<td>{{Statistics.PlatformTax}}</td>
<td>{{Statistics.ZaiTuMoney}}</td>
</tr>
</table>
<div class="noDataNotice" v-if="noData">
<i class="iconfont icon-kong"></i>
......@@ -332,6 +349,7 @@ export default {
IsLeave:0,
},
DataList:[],
Statistics:{},
DepartmentList:[],
EmployeeList:[],
CompanyList:[],
......@@ -485,7 +503,8 @@ export default {
this.apipost('Financial_post_GetInComePayInfoList',this.msg,res=>{
if(res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.DataList = res.data.data.pageData.List;
this.Statistics=res.data.data.pageData.Statistics;
if(this.DataList.length==0){
this.noData = true;
}else{
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ dbfd1142
......@@ -1598,7 +1598,7 @@ export default {
return this.priceFormat(rowData.YongJinShouRu);
if (field === "YingFu") return this.priceFormat(rowData.YingFu);
if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
if (field === "MaoLiRate") return this.priceFormat(rowData.MaoLiRate*100)+'%';
if (field === "MaoLiRate") return rowData.MaoLiRate+'%';
if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
if (field === "TransportCost")
return this.priceFormat(rowData.TransportCost);
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ dbfd1142
......@@ -156,7 +156,7 @@
<div class="page_addCapitalAllocation" v-loading="loading">
<div class="_top">
<p>四川和平国际旅行社有限公司</p>
<p><span>资金调拨单</span></p>
<p><span>{{msg.TemplateId==34?'总部':'分公司'}}资金调拨单</span></p>
</div>
<div class="_conten">
<ul v-if="inList.length">
......@@ -359,7 +359,7 @@ export default {
return {
msg: {
FrID: 0,
TemplateId: 27,
TemplateId: 0,
Status: 1,
IsPublic: 0,
RB_Depart_Id: 0,
......@@ -404,6 +404,11 @@ export default {
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
this.msg.TemplateId=34;
}else{
this.msg.TemplateId=35;
}
}
},
methods:{
......
src/components/Hotel/roomReservationsDetails.vue
View file @ dbfd1142
......@@ -11,7 +11,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
<tr>
<th class="fz14" colspan="10">团队信息</th>
<th class="fz14" colspan="10">团队信息(定团号：{{NewCombinationNum}})</th>
<th class="fz14" colspan="12">地接操作信息</th>
</tr>
<tr>
......@@ -306,9 +306,10 @@ export default {
},
mounted() {
this.TCNUM=this.$route.query.TCNUM
this.flightTotal=this.$route.query.flightTotal
this.GuestNum=this.$route.query.GuestNum
this.TCNUM=this.$route.query.TCNUM;
this.flightTotal=this.$route.query.flightTotal;
this.GuestNum=this.$route.query.GuestNum;
this.NewCombinationNum=this.$route.query.NewCombinationNum;
this.getList()
// this.getHotelList()
},
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ dbfd1142
......@@ -4,8 +4,9 @@
<tr>
<th width="8%">出发地</th>
<th width="30%">行程名称</th>
<th width="15%">团号</th>
<th width="15%">出发时间</th>
<th width="10%">团号</th>
<th width="10%">定团号</th>
<th width="10%">出发时间</th>
<th width="8%">天数</th>
<th width="8%">出团人数</th>
<th width="8%">领队</th>
......@@ -17,6 +18,7 @@
<div class="padding10">{{item.Titles}}</div>
</td>
<td>{{item.TCNUMS}}</td>
<td>{{NewCombinationNum}}</td>
<td>{{item.FlightDate}}</td>
<td>{{item.DayNum}}天</td>
<td>{{item.TotalSeat}}人</td>
......@@ -566,6 +568,8 @@
TravelDayNum:0,
RealityNum:0,
UseCount:'',
//定团号
NewCombinationNum:'',
}
},
methods: {
......@@ -736,8 +740,9 @@
},
},
mounted() {
this.isUpdate=this.$route.query.isUpdate
this.msg.TCIDs=this.$route.query.id
this.isUpdate=this.$route.query.isUpdate;
this.msg.TCIDs=this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getNav()
this.getList()
}
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ dbfd1142
......@@ -12,6 +12,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe">
<tr>
<th width="120">公司团号</th>
<th width="130">定团号</th>
<th width="150">用餐时间</th>
<th width="200">餐厅名称</th>
<th width="200">修改餐厅</th>
......@@ -38,6 +39,9 @@
<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
</div>
</td>
<td :rowspan="list.length" v-if="index==0">
<div class="w120" style="margin:0 5px;">{{NewCombinationNum}}</div>
</td>
<td>
<div class="w120">{{item.UseTimeStr}}</div>
</td>
......@@ -214,6 +218,7 @@ export default {
TCNUM: "",
flightTotal: 0,
GuestNum: 0,
NewCombinationNum:'',
};
},
methods: {
......@@ -326,6 +331,7 @@ export default {
mounted() {
this.TCNUM = this.$route.query.TCNUM;
this.GuestNum= this.$route.query.GuestNum;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList();
}
};
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ dbfd1142
......@@ -304,7 +304,7 @@ export default {
this.loading = false;
this.dataList.forEach(x=>{
this.PreferPrice+=x.TotalPrice;
this.IncomePrice+=x.Income;
this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
})
}
},err=>{})
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ dbfd1142
......@@ -179,10 +179,11 @@
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>提成
</span>其他
</div>
<div class="Team_Incontent">
<div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
<div>提&nbsp;&nbsp;&nbsp;成<span>￥{{DataList.ExpectedCut}}</span></div>
<div>联运成本<span>￥{{DataList.LYCB}}</span></div>
</div>
</div>
</el-col>
......@@ -209,7 +210,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="isExists(item.CostTypeList,'团费')">
<tr v-if="isExists(item.CostTypeList,'团费') || isExists(item.CostTypeList,'团款')">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td>
......@@ -429,7 +430,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td>
......@@ -1189,7 +1190,7 @@
this.$router.push({
name: path,
query: {
id: id
id: id,blank: "y"
}
});
},
......
src/components/dmc/manager/LeaderHander.vue
View file @ dbfd1142
......@@ -84,7 +84,7 @@
.LH_contentDiv {
width: 1000px;
height: 1500px;
position: relative;
position: absolute;
background-color: #fff;
padding: 20px 10px;
}
......@@ -100,26 +100,34 @@
top: 20px;
right: 20px;
}
@media print {
.LH_btnList,.nav{display:none;}
}
</style>
<template>
<div class="LH_contentDiv" v-if="isShow" id="print">
<div class="LH_btnList">
<input type="button" v-if="ishowBtn" @click="saveDelivery()" value="保存" class="normalBtn"/>
<input type="button" v-if="ishowBtn" value="打印" @click.prevent="doPrint" class="normalBtn"/>
<input type="button" @click="saveDelivery()" value="保存" class="normalBtn"/>
<input type="button" value="打印" @click.prevent="doPrint" class="normalBtn"/>
</div>
<table class="Lh_Toptable">
<tr>
<th class="Lh_title" colspan="9">印象之旅 领队/导游/送机交接单（日本线）</th>
</tr>
<tr>
<td colspan="9">
<div style="float:left;">团名：</div>
<div style="float:left;width:95%;">{{sendReceiptData.Title}}</div>
</td>
</tr>
<tr>
<td width="300">
团号：
<el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/>
</td>
<td colspan="8">
团名：
<el-input type="text" class="w160" v-model="sendReceiptData.Title"/>
定团号：{{NewCombinationNum}}
</td>
</tr>
<tr>
......@@ -185,14 +193,14 @@
</tr>
<tr>
<th width="180">项目</th>
<th width="50">操作</th>
<th width="50">领队</th>
<th width="60">操作</th>
<th width="60">领队</th>
<th with="260">项目</th>
<th width="50">操作</th>
<th width="50">领队</th>
<th width="60">操作</th>
<th width="60">领队</th>
<th width="160">项目</th>
<th width="50">操作</th>
<th width="50">领队</th>
<th width="60">操作</th>
<th width="60">领队</th>
</tr>
<tr>
<td>
......@@ -387,7 +395,8 @@
return {
isShow:false,
sendReceiptData: "",
ishowBtn:true,
//定团号
NewCombinationNum:'',
};
},
methods: {
......@@ -402,6 +411,7 @@
res => {
if (res.data.resultCode == 1) {
this.sendReceiptData = res.data.data;
console.log(this.sendReceiptData,'sssssssssssss');
this.isShow=true;
}
},
......@@ -424,24 +434,13 @@
}
);
},
//打印
doPrint() {
this.ishowBtn=false;
setTimeout(this.getPrint,500);
},
getPrint(){
let subOutputRankPrint = document.getElementById("print");
let newContent = subOutputRankPrint.innerHTML;
let oldContent = document.body.innerHTML;
document.body.innerHTML = newContent;
doPrint(){
window.print();
window.location.reload();
document.body.innerHTML = oldContent;
return false;
},
},
mounted() {
this.getLeaderGuideSendReceipt();
this.NewCombinationNum = this.$route.query.NewCombinationNum;
}
}
</script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ dbfd1142
......@@ -185,31 +185,31 @@
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,'领队交接表')">
<div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,outItem,'领队交接表')">
<span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,'用款计划')">
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
<span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,'订房详情')">
<div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,'门票详情')">
<div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,'餐厅详情')">
<div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'餐厅详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span>
</div>
......@@ -221,7 +221,7 @@
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,'领队报账')">
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,outItem,'领队报账')">
<span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
......@@ -389,17 +389,18 @@
}
})
},
goUrlT(path, obj, title) {
goUrlT(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
"id": obj,
NewCombinationNum:outItem.NewCombinationNum,
blank: 'y',
tab: title
}
})
},
goUrl(path, obj, title) {
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -407,7 +408,7 @@
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
......@@ -426,11 +427,13 @@
}
})
},
goUrlLeaderIsApply(path, obj, title) {
goUrlLeaderIsApply(path, obj,outItem, title) {
console.log(outItem,'outItem');
this.$router.push({
name: path,
query: {
"id": obj.TCIDS,
NewCombinationNum:outItem.NewCombinationNum,
isUpdate: false,
blank: 'y',
tab: title
......@@ -560,7 +563,6 @@
}
.dmcTotalTable tr td .pMsgStyle {
;
padding: 0 10px;
line-height: 20px;
}
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ dbfd1142
......@@ -151,7 +151,7 @@
<div class="Travel_ImgList clearfix">
<div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
<img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
<img v-else :src="item.Url">
<img v-else :src=" item.Url">
<div class="TFIMGzhe">
<div class="TFreupload" @click="updateTFimg(index)">
<el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true"
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ dbfd1142
......@@ -209,9 +209,9 @@
this.FeatureData.FeatureHtmlJson.d &&
this.FeatureData.FeatureHtmlJson.d.length > 0
) {
// console.log("to do something");
//to do something
} else {
// this.$set(this.FeatureData, "DayList", data);
//this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data);
}
},
......@@ -589,7 +589,6 @@
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("tempData",tempData);
if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ dbfd1142
......@@ -259,6 +259,54 @@
top: 10px;
margin: 20px 0 30px 11px;
}
.Tp_hotelDialog{
width:900px;
}
.TphotelTable{
width:100%;
margin:auto;
text-align: center;
font-size: 12px;
color: #333;
border-collapse: collapse;
background-color: #fff;
border: 1px solid #d1d1d1;
}
.TphotelTable th{
background: #E6E6E6;
padding:8px 0;
color: #333;
border: 1px solid #d1d1d1;
font-weight:bold;
}
.TphotelTable tr td{
background-color:#fff;
/* padding:8px 0; */
border: 1px solid #d1d1d1;
}
.Tp_btn{
color: #fff;
height: 25px;
background: #E95252;
border: 1px solid #E95252;
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
}
.tp_divList{
width:100%;
min-height:30px;
border-bottom: 1px dashed #ccc;
}
.tp_divList div{
text-align: left;
padding:0 20px;
margin-top:5px;
}
.tp_divList:last-child{
border:0;
}
</style>
<template>
......@@ -280,14 +328,12 @@
<ul>
<li>
<i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">&lt;</i>
<input type="text" v-model="currentYear" disabled class="currentInput"
@input="getDateString(),initCalendar(dateString)">年
<input type="text" v-model="currentYear" disabled class="currentInput" @input="getDateString(),initCalendar(dateString)">年
<i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">&gt;</i>
</li>
<li>
<i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">&lt;</i>
<input type="text" v-model="currentMonth" disabled class="currentInput"
@input="getDateString(),initCalendar(dateString)">月
<input type="text" v-model="currentMonth" disabled class="currentInput" @input="getDateString(),initCalendar(dateString)">月
<i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">&gt;</i>
</li>
</ul>
......@@ -306,10 +352,8 @@
<ul class="days">
<li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked" class="other-month">{{dayobject.day.getDate()}}</span>
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li>
</ul>
</div>
......@@ -328,8 +372,7 @@
<i class="iconfont icon-previewleft"></i>
</span>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
v-for="(item,index) in showPriceList"
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)" v-for="(item,index) in showPriceList"
:key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
......@@ -353,46 +396,40 @@
</div>
<div class="TPright">
<div class="TP_noneed">
<el-checkbox v-model="priceData.IsSupportChildren"
:true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" style="display:none"
:true-label="CheckedVaule" :false-label="UnCheckedVaule">订团
<el-checkbox v-model="priceData.IsBookTeam" style="display:none" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">订团
</el-checkbox>
<input type="button" class="normalBtn" style="display:none;" value="酒店使用情况" @click="outerVisible=true" />
</div>
<el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">同行会员</template>
</el-input>
</el-form-item>
<el-form-item prop="B2BPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BPrice"
@keyup.native="checkPrice(priceData,'B2BPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BPrice" @keyup.native="checkPrice(priceData,'B2BPrice')">
<template slot="prepend">同行</template>
</el-input>
</el-form-item>
<el-form-item prop="B2CMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CMemberPrice"
@keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">直客会员</template>
</el-input>
</el-form-item>
<el-form-item prop="B2CPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2CPrice" @keyup.native="checkPrice(priceData,'B2CPrice')">
<template slot="prepend">直客</template>
</el-input>
</el-form-item>
<el-form-item prop="BabyPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyPrice"
@keyup.native="checkInteger(priceData,'BabyPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyPrice" @keyup.native="checkInteger(priceData,'BabyPrice')">
<template slot="prepend">婴儿</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleDMCPrice"
@keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleDMCPrice" @keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<template slot="prepend">单地接</template>
</el-input>
</el-form-item>
......@@ -405,14 +442,12 @@
</div>
<div class="TPright">
<el-form-item prop="ChildNeedPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNeedPrice" @keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<template slot="prepend">儿童占床</template>
</el-input>
</el-form-item>
<el-form-item prop="BabyChargePrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyChargePrice"
@keyup.native="checkPrice(priceData,'BabyChargePrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BabyChargePrice" @keyup.native="checkPrice(priceData,'BabyChargePrice')">
<template slot="prepend">儿童附加费</template>
</el-input>
</el-form-item>
......@@ -423,26 +458,22 @@
</el-input>
</el-form-item>
<el-form-item prop="VisaPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.VisaPrice" @keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">签证费</template>
</el-input>
</el-form-item>
<el-form-item prop="SingleRoomPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleRoomPrice"
@keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">单房差</template>
</el-input>
</el-form-item>
<el-form-item prop="SafeMoney">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SafeMoney" @keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">保险</template>
</el-input>
</el-form-item>
<el-form-item prop="OtherPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.OtherPrice" @keyup.native="checkPrice(priceData,'OtherPrice')">
<template slot="prepend">杂费</template>
</el-input>
</el-form-item>
......@@ -455,27 +486,23 @@
</div>
<div class="TPright">
<el-form-item prop="ChildNoNeedPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNoNeedPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice" @keyup.native="checkInteger(priceData,'ChildNoNeedPrice')">
<template slot="prepend">儿童不占床</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BackVisaPrice"
@keyup.native="checkInteger(priceData,'BackVisaPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
<template slot="prepend">退签证费</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.RebatePrice"
@keyup.native="checkPrice(priceData,'RebatePrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.RebatePrice" @keyup.native="checkPrice(priceData,'RebatePrice')">
<template slot="prepend">同行返佣</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.DiscountPrice"
@keyup.native="checkPrice(priceData,'DiscountPrice')">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.DiscountPrice" @keyup.native="checkPrice(priceData,'DiscountPrice')">
<template slot="prepend">早鸟优惠</template>
</el-input>
</el-form-item>
......@@ -488,43 +515,37 @@
</div>
<div class="TPright clearfix">
<el-form-item prop="ClearOrderHour">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')"
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour" @keyup.native="checkInteger(priceData,'ClearOrderHour')"
@blur="checkInteger(priceData,'ClearOrderHour')">
<template slot="prepend">自动清位</template>
</el-input>
</el-form-item>
<span class="TP_Sendprepend">送签时间</span>
<el-form-item prop="SendVisaTime" style="margin-top:1px;">
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd"
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团公司</span>
<el-select class="w180" v-model="priceData.OutBranchId">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</div>
<div class="TPright clearfix">
<el-form-item prop="YSeat">
<el-input placeholder="人数" class="w190" v-model="priceData.YSeat"
@keyup.native="checkInteger(priceData,'YSeat')">
<el-input placeholder="人数" class="w190" v-model="priceData.YSeat" @keyup.native="checkInteger(priceData,'YSeat')">
<template slot="prepend">经济舱/上铺</template>
</el-input>
</el-form-item>
<el-form-item prop="CSeat">
<el-input placeholder="人数" class="w260" v-model="priceData.CSeat"
@keyup.native="checkInteger(priceData,'CSeat')">
<el-input placeholder="人数" class="w260" v-model="priceData.CSeat" @keyup.native="checkInteger(priceData,'CSeat')">
<template slot="prepend">商务舱/中铺</template>
</el-input>
</el-form-item>
<el-form-item prop="FSeat">
<el-input placeholder="人数" class="w290" v-model="priceData.FSeat"
@keyup.native="checkInteger(priceData,'FSeat')">
<el-input placeholder="人数" class="w290" v-model="priceData.FSeat" @keyup.native="checkInteger(priceData,'FSeat')">
<template slot="prepend">头等舱/下铺</template>
</el-input>
</el-form-item>
......@@ -539,7 +560,8 @@
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="可销售机票数量" class="w290" v-model="priceData.CanSellTicketNum" maxlength="2" @keyup.native="checkInteger(priceData,'CanSellTicketNum')" @change="CheckSellTicketNum(priceData)">
<el-input placeholder="可销售机票数量" class="w290" v-model="priceData.CanSellTicketNum" maxlength="2"
@keyup.native="checkInteger(priceData,'CanSellTicketNum')" @change="CheckSellTicketNum(priceData)">
<template slot="prepend">可销售机票数量</template>
</el-input>
</el-form-item>
......@@ -558,8 +580,7 @@
<el-form-item>
<span class="TP_Sendprepend" style="margin-left:0;width:120px;">销售状态</span>
<el-select class="w180" v-model="priceData.TCSaleState">
<el-option v-for="item in TeamList" :key="item.Id" :label="item.name"
:value="item.Id"></el-option>
<el-option v-for="item in TeamList" :key="item.Id" :label="item.name" :value="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -583,12 +604,10 @@
<div>
<div style="margin-bottom:20px;">
开始日期
<el-date-picker class="w150" type="date" v-model="QFlightDateStart"
:picker-options="pickerBeginDateBefore"
<el-date-picker class="w150" type="date" v-model="QFlightDateStart" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
结束日期
<el-date-picker class="w150" type="date" v-model="QFlightDateEnd"
:picker-options="pickerBeginDateAfter"
<el-date-picker class="w150" type="date" v-model="QFlightDateEnd" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<button class="normalBtn" @click.stop="getSelectFilght()">查询</button>
</div>
......@@ -616,8 +635,7 @@
<td>{{fitem.PNR}}</td>
<td>{{fitem.UseAmount}} / {{fitem.RemainNum}}</td>
<td>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
v-model="fitem.BindNum"></el-input>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
</td>
</tr>
</table>
......@@ -631,8 +649,7 @@
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
<el-select class="w350 multiple_input" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}"
v-model="priceData.SaleBranchIdArray" multiple>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</div>
......@@ -651,8 +668,7 @@
<div>
<span class="TCSwitchtitle">订单操作</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsOrder" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<el-switch v-model="priceData.IsOrder" :active-value="inActive" :inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后，业务人员将不能操作订单</div>
</span>
</div>
......@@ -661,8 +677,7 @@
<div>
<span class="TCSwitchtitle">同行在线预订</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsB2B" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<el-switch v-model="priceData.IsB2B" :active-value="inActive" :inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2B站点</div>
</span>
</div>
......@@ -673,8 +688,7 @@
<div>
<span class="TCSwitchtitle">报名候补</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive" :inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后不可超收人数</div>
</span>
</div>
......@@ -683,8 +697,7 @@
<div>
<span class="TCSwitchtitle">直客在线预订</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsB2C" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<el-switch v-model="priceData.IsB2C" :active-value="inActive" :inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2C站点</div>
</span>
</div>
......@@ -698,24 +711,41 @@
</div>
</div>
<TravelPriceFlightList @headCallBack="setDisDirectFlight" ref="TravelFlightList" :priceData="priceData"
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds"
:selectFilghtList="selectFilghtList"></TravelPriceFlightList>
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds" :selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1'>
<tr v-for="item in returnPriceList[0].PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;<el-checkbox></el-checkbox>
</div>
</div>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid"],
data() {
return {
outerVisible: false,
currentDay: 1,
currentMonth: 1,
currentYear: 1970,
uploadList: [],
CheckedVaule: 1,//选中值
UnCheckedVaule: 2,//没选中
CheckedVaule: 1, //选中值
UnCheckedVaule: 2, //没选中
//日期数组
days: [],
dateString: "2016-01-02",
......@@ -757,8 +787,7 @@
trigger: "change"
}]
},
TeamList: [
{
TeamList: [{
Id: 1,
name: "一般团"
},
......@@ -774,8 +803,8 @@
currentPriceIndex: 0, //当前团期索引位置
showPriceList: [],
priceShowCount: 6, //团期展示条数
QFlightDateStart: '',//航班查询开始日期
QFlightDateEnd: '',//航班查询结束日期
QFlightDateStart: '', //航班查询开始日期
QFlightDateEnd: '', //航班查询结束日期
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.QFlightDateEnd);
......@@ -883,18 +912,15 @@
JSON.stringify(this.PostConfig.FlightList)
),
//删除的绑定的航班编号
DeleteAirticketIds:"",
GatherTag:"",//集合标识
AirportService:"",//机场服务
DeleteAirticketIds: "",
GatherTag: "", //集合标识
AirportService: "", //机场服务
//可销售机票数量
CanSellTicketNum:2,
CanSellTicketNum: 2,
//是否订团，0-不订，1需要订
IsBookTeam:0
IsBookTeam: 0
};
}
// if (this.modifyTcid > 0) {
// this.returnPriceList = [];
// }
this.returnPriceList.push(objItem);
this.initDatePickerCheched();
this.returnPriceList.sort(
......@@ -906,14 +932,7 @@
},
//单团期修改重置日历选中
initDatePickerCheched() {
// if (this.modifyTcid > 0 && this.returnPriceList.length > 0) {
// let oneDay = this.returnPriceList[0];
// this.days.forEach(x => {
// if (this.getDayStr(x.day) != oneDay.StartDate) {
// x.checkState = this.$calendarUtils.checkState.hasValue;
// }
// });
// }
},
RemovePrice(dateStr) {
var array = [];
......@@ -989,7 +1008,7 @@
},
//日期计算
daysCalculate(date, addDay) {
var date = new Date(date);//获取当前时间
var date = new Date(date); //获取当前时间
date.setDate(date.getDate() + addDay);
return date.Format("yyyy-MM-dd");
},
......@@ -1040,8 +1059,7 @@
});
}
},
err => {
}
err => {}
);
},
compareDay(day) {
......@@ -1115,7 +1133,7 @@
},
setDisDirectFlight(obj) {
this.priceData.PriceFlight = JSON.parse(JSON.stringify(obj.priceFlight));
this.priceData.DeleteAirticketIds=obj.DeleteAirticketIdArray.join(',');
this.priceData.DeleteAirticketIds = obj.DeleteAirticketIdArray.join(',');
},
//删除标签
delDateList(item) {
......@@ -1173,7 +1191,6 @@
item.Checked = true;
this.priceData = item;
this.initFlightData();
//this.getSelectFilght(this.priceData.StartDate);
},
//左移动获取展示的团期
priceLeftMove() {
......@@ -1229,8 +1246,7 @@
this.companyList = res.data.data;
}
},
err => {
}
err => {}
);
},
//选中航班选择框
......@@ -1303,30 +1319,24 @@
})
},
//检查机位数是否超过设置的可销售数量
CheckSellTicketNum(item)
{
var totalNum=0;
if(item.YSeat && item.YSeat!='')
{
totalNum+=Number(item.YSeat);
CheckSellTicketNum(item) {
var totalNum = 0;
if (item.YSeat && item.YSeat != '') {
totalNum += Number(item.YSeat);
}
if(item.CSeat && item.CSeat!='')
{
totalNum+=Number(item.CSeat);
if (item.CSeat && item.CSeat != '') {
totalNum += Number(item.CSeat);
}
if(item.FSeat && item.FSeat!='')
{
totalNum+=Number(item.FSeat);
if (item.FSeat && item.FSeat != '') {
totalNum += Number(item.FSeat);
}
var canSellNum=0;
if(item.CanSellTicketNum && item.CanSellTicketNum!='')
{
canSellNum=Number(item.CanSellTicketNum);
var canSellNum = 0;
if (item.CanSellTicketNum && item.CanSellTicketNum != '') {
canSellNum = Number(item.CanSellTicketNum);
}
if(totalNum<canSellNum)
{
if (totalNum < canSellNum) {
this.Info("可销售机票数量不能超过本团机位数!")
item.CanSellTicketNum=0;
item.CanSellTicketNum = 0;
}
}
},
......@@ -1360,7 +1370,6 @@
this.returnPriceList.forEach((x, index) => {
if (index == 0) {
this.priceData = this.returnPriceList[index];
x["Checked"] = true;
this.chooseDay = this.priceData.StartDate;
this.initFlightData();
......@@ -1394,5 +1403,4 @@
TravelPriceFlightList: TravelPriceFlightList
}
};
</script>
\ No newline at end of file
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature2.vue
View file @ dbfd1142
......@@ -1666,11 +1666,6 @@
watch:{
data:{
handler: function (val, oldVal) {
// console.log(val.DayList.length);
// console.log(oldVal.DayList.length);
// if (val && (val.DayList.length !== oldVal.DayList.length)) {
// console.log('ssss')
// }
},
deep: true
}
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ dbfd1142
......@@ -1170,7 +1170,6 @@
},
methods: {
DataComparison: function () { // 数据对比
console.log("DataComparison")
let newVal = this.newVal;
let newRestaurantObj = {
title:{
......@@ -1201,14 +1200,9 @@
deleteRestaurantHistory = [];
//json 历史数据 jsonDelete 历史删除数据
let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
console.log(json)
let jsonDelete = this.FeatureData.FeatureHtmlJsonDelete ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)) : '';
// console.log("json",json)
// console.log("jsonDelete",jsonDelete)
// 历史数据组装
// console.log("json",json)
if (JSON.stringify(json) !== '{}' && json && json.hotelObj.list && json.hotelObj.list.length>0 && this.theFirstTime) {
// console.log("json.travelFeature2",json)
this.jsonTravelFeature2 = json;
newHtelObj = json.hotelObj;
newViewSpotObj = json.viewSpotObj;
......@@ -1238,9 +1232,6 @@
})
newRestaurantObj = restaurantObj;
}
// console.log('1newViewSpotObj',newViewSpotObj)
// console.log('1restaurantObj',newRestaurantObj)
// console.log('1newHtelObj',newHtelObj)
// 获取并组装历史删除数据
if (jsonDelete && jsonDelete.length>0) {
jsonDelete.forEach(x=>{
......@@ -1264,23 +1255,18 @@
newViewSpotObj.list.push(...viewSpotObj);
}
// 对比景点 newViewSpotObj this.viewSpotObj.list
let DalateView = travelFeatureTwo.getArrDifference(newViewSpotObj.list, this.viewSpotObj.list);
if (deleteViewSpotHistory.length>0) {
DalateView.push(...deleteViewSpotHistory)
}
// console.log("newViewSpotObj.list",newViewSpotObj.list)
let VSobj = {};
console.log(this.viewSpotObj.list)
let ov = JSON.parse(JSON.stringify(this.viewSpotObj))
ov.list.push(...newViewSpotObj.list)
// newViewSpotObj.list.push(...this.viewSpotObj.list) //1-24 因为保存后特色已更改的刷新后变为上一次保存结果,所以调换顺序进行测试
ov.list = ov.list.reduce(function(item, next) { //根据MD5Sign数组对象去重
VSobj[next.MD5Sign] ? '' : VSobj[next.MD5Sign] = true && item.push(next);
return item;
}, []);
// console.log("newViewSpotObj.list",newViewSpotObj.list)
DalateView.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据
ov.list.filter((val, vIndex)=>{
if(x.MD5Sign === val.MD5Sign)
......@@ -1298,7 +1284,6 @@
let HTobj = {};
let hv = JSON.parse(JSON.stringify(this.hotelObj))
hv.list.push(...newHtelObj.list)
// newHtelObj.list.push(...this.hotelObj.list)
hv.list = hv.list.reduce(function(item, next) { //数组对象去重
HTobj[next.MD5Sign] ? '' : HTobj[next.MD5Sign] = true && item.push(next);
return item;
......@@ -1320,8 +1305,6 @@
let RTobj = {};
let rv = JSON.parse(JSON.stringify(this.restaurantObj))
rv.list.push(...newRestaurantObj.list)
console.log("rvrvrvrvrv",rv.list)
// newRestaurantObj.list.push(...this.restaurantObj.list)
rv.list = rv.list.reduce(function(item, next) { //数组对象去重
RTobj[next.MD5Sign] ? '' : RTobj[next.MD5Sign] = true && item.push(next);
return item;
......@@ -1332,9 +1315,7 @@
rv.list.splice(vIndex,1)
})
})
// console.log('2newViewSpotObj',newViewSpotObj)
// console.log('2restaurantObj',newRestaurantObj)
// console.log('2newHtelObj',newHtelObj)
// 餐饮对比结束
this.hotelObj.list = hv.list;
this.viewSpotObj.list = ov.list;
......@@ -1344,7 +1325,6 @@
this.pageCount('restaurant');
this.Refresh = false;
this.RenderingOk = false;
// console.log(this.viewSpotObj.list)
this.$forceUpdate()
},
UpDateInfo: function () { // 防止组件改动一直渲染数据造成卡顿 添加点击更新视图
......@@ -1363,9 +1343,6 @@
let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = !deleteDataList ? [] : deleteDataList;
// console.log("this.deleteArray", this.deleteArray)
// console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
......@@ -1421,7 +1398,6 @@
}
}
let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
// console.log("jsonjsonjson",json)
this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title;
this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title;
this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title;
......@@ -1868,7 +1844,6 @@
},
// 版块删除
bolckToDelete: function (name, index1, index2) {
console.log(name, index1)
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
......@@ -1877,10 +1852,8 @@
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
console.log(blockList)
this.imgTopReset(name, index1, index2);
this.deleteArray.push(blockList[index1]);
console.log("删除",blockList[index1])
blockList.splice(index1,1);
this.pageCount(name)
},
......@@ -1896,7 +1869,6 @@
basicData:travelFeature2,
deleteArray:this.deleteArray
}
console.log(obj)
return obj;
},
// 设置编辑状态
......@@ -1924,17 +1896,13 @@
watch:{
FeatureData:{
handler: function (val, oldVal) {
console.log('2019年2月12日10:53:11',oldVal)
console.log('2019年2月12日10:53:22',val)
if (this.ReadOnly) return;
if (val && this.oldVal != null) {
// console.log("watch_if_FeatureData",11111)
this.newVal = JSON.parse(JSON.stringify(val));
this.Refresh = true;
this.theFirstTime = false
return
} else {
// console.log("watch_else_FeatureData",333)
this.oldVal = JSON.parse(JSON.stringify(this.FeatureData));
this.init()
}
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ dbfd1142
......@@ -12,6 +12,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
<tr>
<th width="120">公司团号</th>
<th width="120">定团号</th>
<th width="120">游览时间</th>
<th width="200">景点名称</th>
<th width="100">总人数</th>
......@@ -30,6 +31,7 @@
</tr>
<tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td>
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{NewCombinationNum}}</div></td>
<td>
<div class="w120">
{{item.UseTimeStr}}
......@@ -146,7 +148,8 @@ export default {
roomList:[],
TCNUM:'',
flightTotal:0,
GuestNum:0
GuestNum:0,
NewCombinationNum:''
}
},
methods: {
......@@ -229,6 +232,7 @@ export default {
this.TCNUM=this.$route.query.TCNUM
this.flightTotal=this.$route.query.flightTotal
this.GuestNum=this.$route.query.GuestNum
this.NewCombinationNum = this.$route.query.NewCombinationNum
this.getList()
},
}
......
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