Skip to content

S
SuperMan
Commit e56fbee4 authored by 王悦's avatar 王悦
Browse files
Options

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

parents 1f29a7cb a38e578d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 160 deletions
src/components/Ticketing/flightChild.vue
View file @ e56fbee4
......@@ -363,12 +363,12 @@
this.Error('请选择结束日期');
isSubmit = false;
}
if (this.PostData.SubList.length == 0) {
this.Error('请选择星期');
isSubmit = false;
}
}
});
if (this.PostData.SubList.length == 0) {
this.Error('请选择星期');
isSubmit = false;
}
}
if (isSubmit&&this.isSaved) {
this.isSaved = false;
......
src/components/Ticketing/flightManagement.vue
View file @ e56fbee4
......@@ -349,8 +349,6 @@
callback(new Error("请输入航班号"));
} else if (!reg3.test(value)) {
callback(new Error("请输入数字或字母"));
} else if (!reg.test(value.slice(0,1))) {
callback(new Error("首字母必须为字母"));
} else if(!reg2.test(value.charAt(value.length - 1))){
callback(new Error("尾数必须为数字"));
} else {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ e56fbee4
......@@ -57,7 +57,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr>
<th colspan="9">公司通用信息</th>
<th colspan="10">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="7">地接op操作</th>
</tr>
......@@ -68,6 +68,7 @@
<th width="125">公司团号</th>
<th width="75">线路<br />负责人</th>
<th width="75">进出点</th>
<th width="70">订单人数</th>
<th width="80">机位总数<br />(Y/E/F)</th>
<th width="60">领队</th>
<th width="60">导游</th>
......@@ -141,6 +142,9 @@
<td>
{{item.InOut}}
</td>
<td>
{{item.CommonReport.HouseStatistics.RealityNum}}
</td>
<td>
<div class="link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
......@@ -252,7 +256,7 @@
</td>
</tr>
<tr>
<td colspan="20" style="text-align: left!important;padding:0 20px;">
<td colspan="21" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ e56fbee4
......@@ -394,6 +394,112 @@
err => {}
);
},
/*保存数据*/
SaveData_V2(SaveType) {
this.MsgBus.$emit('saveTravel', true);
this.FeatureData.IsSave = true;
this.submitText = "保存中";
//团队配置
var basicData = {};
basicData.PriceList = this.PostPrice;
//配置编号
basicData.ID = this.ConfigId;
basicData.LineId = this.PostConfig.LineId;
basicData.LineteamId = this.PostConfig.LineteamId;
basicData.Title = this.PostConfig.Title;
basicData.OpRemark = this.PostConfig.OpRemark;
basicData.ProductRecommend = this.PostConfig.ProductRecommend;
basicData.VideoStr = this.PostConfig.VideoStr;
basicData.PDFAlias = this.PostConfig.PDFAlias;
basicData.ImgCover = this.PostConfig.ImgCover;
basicData.PriceIsDirect = this.PostConfig.PriceIsDirect;
basicData.IsDirect = this.PostConfig.IsDirect;
basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.TeamType = this.PostConfig.TeamType;
basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum != "") ? this.PostDaysTrip.DayNum : 0;
basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum != "") ? this.PostDaysTrip.NightNum : 0;
basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId != "") ? this.PostDaysTrip.StartCityId :
0;
basicData.ReturnArriveCityId = (this.PostDaysTrip && this.PostDaysTrip.ReturnArriveCityId != "") ? this.PostDaysTrip
.ReturnArriveCityId : 0;
basicData.SelfpayingList = this.PostConfig.SelfpayingList;
basicData.ShopList = this.PostConfig.ShopList;
basicData.DinnerList = this.PostDaysTrip.DinnerList;
basicData.FreedomList = this.PostDaysTrip.FreedomList;
var tripHotelArray = this.PostDaysTrip.HotelList;
var chooseHotelArray=[];
var newHotelArray=[];
// chooseHotelArray.forEach(item=>{
// tripHotelArray.forEach(subItem=>{
// if(item.Hotel==1 && item.DayNum==1)
// {
// newHotelArray.push(subItem)
// }
// });
// });
basicData.HotelList=newHotelArray;
basicData.ScenicList = this.PostDaysTrip.ScenicList;
basicData.TrafficList = this.PostDaysTrip.TrafficList;
basicData.WarmTipList = this.PostDaysTrip.WarmTipList;
basicData.TitleList = this.PostDaysTrip.TitleList;
basicData.RemoveImg = this.PostDaysTrip.RemoveImg;
//行程特色数据
var TripFeature = {};
if (this.PostFeature == "") {
TripFeature = this.FeatureData;
} else {
TripFeature = this.PostFeature;
}
TripFeature.FeatureHtmlJson = TripFeature.FeatureHtmlJson ?
JSON.stringify(TripFeature.FeatureHtmlJson) :
"";
TripFeature.FeatureHtmlJsonDelete = TripFeature.FeatureHtmlJsonDelete ? JSON.stringify(TripFeature.FeatureHtmlJsonDelete) :
"";
TripFeature.FeeInclude = this.PostNotice.FeeInclude;
TripFeature.FeeNonInclude = this.PostNotice.FeeNonInclude;
TripFeature.ImportantTip = this.PostNotice.ImportantTip;
TripFeature.WarmTip = this.PostNotice.WarmTip;
TripFeature.B2BRemark = this.PostNotice.B2BRemark;
TripFeature.ShopRemark = this.PostNotice.ShopRemark;
TripFeature.VisaRemark = this.PostNotice.VisaRemark;
if (
basicData.TrafficList != null &&
basicData.TrafficList.length > 0 &&
basicData.TrafficList[0].SubTraffic != null &&
basicData.TrafficList[0].SubTraffic.length > 0
) {
basicData["ArriveCityId"] =
basicData.TrafficList[0].SubTraffic[0].ArrivalCityId;
}
if (basicData.OpenState == 1) {
basicData["AfterOpenModify"] = true;
}
//"另存"新增团期
if (SaveType == 3) {
basicData.TravelInfoIsCopy = true;
}
//小包团
if (this.flagWangYue) {
basicData.TeamType = 1;
} else {
basicData.TeamType = 0;
}
this.apipost(
"travel_post_SetTravelConfigInfo_V2",
basicData,
res => {
if (res.data.resultCode == 1) {
console.log("res",res.data);
}
},
err => {}
);
},
//初始化团的幻灯片
initFileList() {
for (var i = 0; i < 5; i++) {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ e56fbee4
......@@ -400,7 +400,7 @@
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule" style="display:none;">订团
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" style="display:none;" @click="outerVisible=true" />
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" style="display:none;" />
</div>
<el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
......@@ -713,21 +713,19 @@
: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' v-if="returnPriceList.length>0">
<!-- <table class="TphotelTable" border="0" cellspacing='1' v-if="returnPriceList.length>0">
<tr v-if="returnPriceList[0].PriceHotelList" 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;
{{item.CheckList[index].CheckStatus}}
<el-checkbox :checked="item.CheckList[index].CheckStatus===true" @change="changeHotelStatus(item,index,item.CheckList[index].CheckStatus)"></el-checkbox>
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index)"></el-checkbox>
</div>
</div>
</td>
</tr>
</table>
</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>
......@@ -764,6 +762,8 @@
SaleBranchIdArray: []
},
returnPriceList: this.priceList,
//选中的酒店数组
ChooseHotelArray:[],
companyList: [],
offerList: [],
selectFilghtList: [],
......@@ -920,7 +920,9 @@
//可销售机票数量
CanSellTicketNum: 2,
//是否订团，0-不订，1需要订
IsBookTeam: 0
IsBookTeam: 0,
//是否重新生成行程数据
IsNew:false,
};
}
this.returnPriceList.push(objItem);
......@@ -1343,14 +1345,12 @@
}
},
//每一天只能选择一个酒店
changeHotelStatus(item, index,flag) {
if (item.CheckList != null && item.CheckList.length > 0) {
item.CheckList.forEach(subItem => {
changeHotelStatus(item, index) {
item.CheckList.forEach((subItem, subIndex) => {
if (subIndex != index) {
subItem.CheckStatus = false;
});
item.CheckList[index].CheckStatus = !flag;
}
console.log("CheckList",item.CheckList);
}
});
}
},
mounted() {
......
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