Skip to content

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

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

parents 956231dc df48ed3b
Hide whitespace changes
Inline Side-by-side
Showing with 1520 additions and 1172 deletions
src/components/Contract/ElectronicContract.vue
View file @ 0c5083db
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Contract/TravelContract.vue
View file @ 0c5083db
......@@ -751,7 +751,7 @@
<th>手机号</th>
</tr>
<tr v-for="item in guestList">
<td>{{item.name}}</td>
<td>{{item.surName+''+item.name}}</td>
<td>{{item.nationalityName}}</td>
<td></td>
<td>{{item.sex==1?'男':'女'}}</td>
......@@ -821,9 +821,9 @@
</div>
</el-form>
<div>
<input type="button" class="normalBtn" style="margin:40px 0 30px 60px;" value="提交审核"/>
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:40px 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
<input type="button" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
<input type="button" class="normalBtn" @click="goUrl()" value="预览">
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="goUrl()" value="预览">
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废">
</div>
</div>
......@@ -1047,7 +1047,6 @@
//获取数据
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) {
this.CtObj = res.data.data;
this.guestList = res.data.data.guestList;
......@@ -1055,7 +1054,6 @@
this.CtObj.businessCertificate = '0000000';
this.CtObj.tcid = this.$route.query.TCID;
this.CtObj.orderId = this.$route.query.orderID;
console.log(this.CtObj,'ctobjjjjjjj');
if(this.CtObj.clientCountryid>0){
this.GetSubAreaList(this.CtObj.clientCountryid,1,1);
}
......@@ -1191,6 +1189,7 @@
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
......@@ -1219,6 +1218,7 @@
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
......@@ -1240,7 +1240,18 @@
return false;
}
});
},
},
sendAudit(){
this.CtObj.auditContract=1;
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},null);
}
},
mounted() {
this.GetCounrty();
......
src/components/Hotel/HotelWorkList.vue
View file @ 0c5083db
......@@ -16,9 +16,9 @@
</ul>
</div>
<div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
<span style="color: green; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span>
<span style="color: #F75000; background-color: #F75000; padding: 2px 4px; border-radius: 5px;">暂定</span>
<span style="color:red; background-color: red; padding: 2px 4px; border-radius: 5px;">未操作</span>
<span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span>
<span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span>
<span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span>
</div>
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
<el-table-column fixed label="酒店名称" min-width="180">
......@@ -36,7 +36,7 @@
<template v-else 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">{{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:#F75000;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
</template>
</template>
</el-table-column>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 0c5083db
......@@ -818,7 +818,7 @@
}
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
subItem.OrderDetailsList.forEach((y, sIndex) => {
if (y.HouseTypeCount) {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
} else {
......@@ -837,10 +837,13 @@
if (y.BookNum == "") {
y.BookNum = 0;
}
if (y.RebateRatio == "") {
if (!this.$commonUtils.isNumber(y.RebateRatio)) {
y.RebateRatio = 0;
}
})
if (!this.$commonUtils.isNumber(subItem.TotalPrice)) {
subItem.TotalPrice = 0;
}
});
})
this.loading = true;
......@@ -879,10 +882,13 @@
if (y.BookNum == "") {
y.BookNum = 0;
}
if (y.RebateRatio == "") {
if (!this.$commonUtils.isNumber(y.RebateRatio)) {
y.RebateRatio = 0;
}
})
if (!this.$commonUtils.isNumber(subItem.TotalPrice)) {
subItem.TotalPrice = 0;
}
});
})
let mag = {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 0c5083db
......@@ -873,7 +873,7 @@
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
......@@ -1819,7 +1819,7 @@
</span>
</div>
<span class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</span>
<span class="GO_Contract" @click="goContract(item)" >领取合同</span>
</td>
</tr>
<tr>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 0c5083db
......@@ -1296,7 +1296,7 @@
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" v-show="addMsg.GroupType !== '4'">
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
......@@ -3328,7 +3328,11 @@
this.travelControlTripLayerShow = false;
},
yzVisaNum: function () {
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.VisaNum) {
this.addMsg.VisaNum = count
......@@ -3336,7 +3340,11 @@
}
},
yzSafeNum: function () {
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.SafeNum) {
this.addMsg.SafeNum = count
......@@ -3963,11 +3971,16 @@
}
},
getHouseNo() {
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床 减去 儿童不占床
let etbzc = 0
if (this.addMsg.GroupType == 4) {
etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
}
this.addMsg.PredictRoomNum =
(Number(this.addMsg.AirticketNum) +
(Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNeedBedNum) +
Number(this.addMsg.ChirdNeedBedNum) -
etbzc +
Number(this.addMsg.OldPeopleNum)) -
Number(this.addMsg.TripleRoomNum) * 3 -
Number(this.addMsg.SingleRoomNum)) /
......@@ -4061,8 +4074,10 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
......@@ -4120,7 +4135,10 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
......
src/components/SalesModule/productQuery.vue
View file @ 0c5083db
......@@ -160,7 +160,7 @@
<div class="flexOne">
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
<p>
立即报名555
立即报名
<span class="fr">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmit()" />
<input type="button" class="normalBtn" value="立即报名" @click="submitForm('addMsg')" />
......@@ -278,6 +278,11 @@
</el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ManNum')"
......@@ -286,8 +291,8 @@
</el-col>
<el-col :span="4">
<p v-if='addObj.IsSupportChildren==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">本团不支持儿童出游!</p>
<el-form-item v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" label="儿童不占床" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
<el-form-item v-if='addObj.IsSupportChildren==1' label="儿童不占床" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童不占床");'></el-input>
</el-form-item>
</el-col>
......@@ -308,12 +313,7 @@
<el-input v-model='addMsg.OldPeopleNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'OldPeopleNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("OldPeopleNum","老人人数");'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1241,7 +1241,11 @@
this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name);
},
yzVisaNum: function () {
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.VisaNum) {
this.addMsg.VisaNum = count
......@@ -1249,7 +1253,11 @@
}
},
yzSafeNum: function () {
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) +ChirdNum +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.SafeNum) {
this.addMsg.SafeNum = count
......@@ -1423,6 +1431,11 @@
let _this = this;
let newRemark = '';
_this.addMsg.Remarks = '';
if (this.addMsg.GroupType == 4) {
newRemark = _this.addMsg.Remarks + _this.otherRemark;
} else{
newRemark = _this.addMsg.Remarks;
}
newRemark = _this.addMsg.Remarks + _this.otherRemark;
Object.keys(_this.remarkMsg).forEach(function (key) {
newRemark = newRemark + _this.remarkMsg[key];
......@@ -1683,12 +1696,22 @@
},
getHouseNo() {
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床 减去 儿童不占床
let etbzc = 0
if (this.addMsg.GroupType == 4) {
etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
}
this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) + Number(this.addMsg
.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum)) - Number(this.addMsg.TripleRoomNum) * 3 - Number(
.ChirdNeedBedNum) - etbzc + Number(this.addMsg.OldPeopleNum)) - Number(this.addMsg.TripleRoomNum) * 3 - Number(
this.addMsg.SingleRoomNum)) / 2 + Number(this.addMsg.SingleRoomNum) + Number(this.addMsg.TripleRoomNum)
},
getNumber() {
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
this.addMsg.VisaNum = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
......@@ -1748,8 +1771,12 @@
let lianyun = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice))
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum)
dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
}
......@@ -1773,14 +1800,17 @@
(Number(this.stratPrice) + Number(this.returnPrice))
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum)
dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
}
this.addMsg.PreferPrice = dandijie + lianyun + chengren + ertong + yinger + laoren + zafeiqianzhen + danfang +
ertongbed - this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(
this.addMsg.OldPeopleNum));
this.addMsg.OldPeopleNum));
console.log(dandijie , lianyun , chengren , ertong , yinger , laoren , zafeiqianzhen , danfang ,ertongbed)
}
this.getTicheng();
if (!t) {
......@@ -1929,12 +1959,16 @@
return
}
if (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.BabyNum) > Number(
this.addMsg.ManNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.ChirdNeedBedNum)) {
this.$message.warning('儿童占床数量不足！')
return
if (this.addMsg.GroupType == 4) {
} else {
if (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.BabyNum) > Number(
this.addMsg.ManNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.ChirdNeedBedNum)) {
this.$message.warning('儿童占床数量不足！')
return
}
}
if (this.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == '-1') {
......@@ -1980,12 +2014,12 @@
this.getScenicRefund(obj.TCID);
this.getPlatformAccount(obj.PlatformAccountTypeId);
this.clearMsg()
let str = ''
if (obj.OtherPrice > 0) {
str += '杂费' + obj.OtherPrice + '/人;'
}
this.addMsg.Remarks = str
this.otherRemark = str;
// let str = ''
// if (obj.OtherPrice > 0 ) {
// str += '杂费' + obj.OtherPrice + '/人;'
// }
// this.addMsg.Remarks = str
// this.otherRemark = str;
this.SingleDMCPrice = obj.SingleDMCPrice;
this.SingleDMCPricex = obj.SingleDMCPrice;
},
......
src/components/SalesModule/productQueryOne.vue
View file @ 0c5083db
......@@ -283,8 +283,8 @@
<el-input v-model='addMsg.ChirdNoNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童不占床");'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'">
</el-col> -->
<!-- <el-col :span="4" v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'">
<el-form-item label="儿童占床" prop="ChirdNeedBedNum">
<el-input v-model='addMsg.ChirdNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNeedBedNum","儿童占床");'></el-input>
......
src/components/Ticketing/TicketManager.vue
View file @ 0c5083db
......@@ -1676,7 +1676,9 @@
</div>
</el-col>
<el-col :span="8">
<div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}</div>
<div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}
<template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
</div>
</el-col>
</el-row>
</li>
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ 0c5083db
......@@ -867,7 +867,7 @@
</el-col>
<el-col :span="8">
<div class="TCID_cont">
PNR：{{item.PNR}}
PNR：{{item.PNR}} <template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
</div>
</el-col>
</el-row>
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 0c5083db
......@@ -850,7 +850,7 @@
</el-col>
<el-col :span="10">
<div class="TCID_cont">
PNR：{{item.PNR}}
PNR：{{item.PNR}}<template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
</div>
</el-col>
</el-row>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 0c5083db
......@@ -1250,8 +1250,7 @@
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum"
v-show="addMsg.GroupType !== '4'">
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" >
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
......@@ -3902,11 +3901,16 @@
}
},
getHouseNo() {
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床 减去 儿童不占床
let etbzc = 0
if (this.addMsg.GroupType == 4) {
etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
}
this.addMsg.PredictRoomNum =
(Number(this.addMsg.AirticketNum) +
(Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNeedBedNum) +
Number(this.addMsg.ChirdNeedBedNum) -
etbzc +
Number(this.addMsg.OldPeopleNum)) -
Number(this.addMsg.TripleRoomNum) * 3 -
Number(this.addMsg.SingleRoomNum)) /
......@@ -4014,7 +4018,10 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
......@@ -4074,7 +4081,10 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0c5083db
......@@ -649,6 +649,7 @@
<th width="70" style="text-align:center;">机票数量</th>
<th width="70" style="text-align:center;">价格</th>
<th width="130" style="text-align:center;">PNR</th>
<th width="130" style="text-align:center;">中段PNR</th>
<th width="100" style="text-align:center;">票务</th>
</tr>
<tr v-for="subItem in item.TicketList">
......@@ -656,6 +657,7 @@
<td style="text-align:center;">{{subItem.TicketNum}}</td>
<td style="text-align:center;">{{subItem.TicketPrice}}</td>
<td style="text-align:center;">{{subItem.PNR}}</td>
<td style="text-align:center;">{{subItem.MidpiecePNR}}</td>
<td style="text-align:center;">{{subItem.TicketCreateByName}}</td>
</tr>
</table>
......
src/components/administrative/ElectronicAudit.vue
View file @ 0c5083db
......@@ -22,16 +22,12 @@
<el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList" class="w210"></el-input>
</li>
<li>
<el-date-picker
@change="dateChange"
size="small"
value-format="yyyy-MM-dd"
v-model="DateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="返回日期">
</el-date-picker>
<label>日期</label>
<el-date-picker v-model='msg.startDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model='msg.returnDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
......@@ -49,33 +45,38 @@
<th>返回日期</th>
<th width="200">操作</th>
</tr>
<tr>
<td>123</td>
<td>456</td>
<td>123123213</td>
<td>123</td>
<td>2019-08-06</td>
<td>2019-08-13</td>
<tr v-for="item in dataList">
<td>{{item.contractNum}}</td>
<td>{{item.orderId}}</td>
<td>{{item.tcid}}</td>
<td>{{item.productName}}</td>
<td>{{getDate(item.startDate)}}</td>
<td>{{getDate(item.returnDate)}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="审核通过" placement="top-start">
<el-button type="primary" icon="iconfont icon-shenpi" circle></el-button>
<el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(2)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="驳回" placement="top-start">
<el-button type="danger" icon="iconfont icon-shenhebohui" @click="AuditElec(0)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail()" circle></el-button>
<el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<!-- <div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div> -->
<div class="noData" v-show="dataList.length<1">
<i class="iconfont icon-kong" style="font-size:100px;"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
......@@ -87,12 +88,24 @@ export default {
startDate:'',
returnDate:''
},
DateList:[],
// pickerOptions0: {
// disabledDate(time) {
// return time.getTime() < Date.now() - 8.64e7;
// }
// },
dataList:[],
loading:false,
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.returnDate == null) {
return false;
} else {
let endTime = new Date(this.msg.returnDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.startDate)
return startTime.getTime() >= time.getTime()
}
}
};
},
methods: {
......@@ -103,23 +116,46 @@ export default {
}
},
//跳转至详情
goToDetail(){
goToDetail(item){
this.$router.push({
name: 'ElectronicContract',
query: {
// TCID: this.$route.query.TCID,
// orderID: this.$route.query.orderID,
TCID:5560,
orderID:28807,
TCID: item.tcid,
orderID: item.orderId,
blank: "y",
}
});
},
getList() {
this.loading=true;
this.apiJavaPost("/api/contract/auditContract",this.msg,res => {
this.loading=false;
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},null);
},
//审核通过或者驳回
AuditElec(type){
let msg = this.dataList[0];
msg.auditContract=type;
this.apiJavaPost("/api/contract/dosaveOrUpdate",msg,res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},null);
},
getDate(date) {
return moment(date).format("YYYY-MM-DD");
},
},
mounted() {
this.getList();
}
......
src/components/clientConfirm.vue
View file @ 0c5083db
......@@ -784,7 +784,7 @@
methods: {
//获取数据
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
this.apiJavaPost("/api/contract/getContractInfoForCode",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......
src/components/confirmationOrderDownLoad.vue
View file @ 0c5083db
......@@ -698,7 +698,6 @@
this.apipost('survey_post_GetSurveyWeiXinShare', {
TCID: this.$route.query.tcid
}, res => {
console.log("生成二维码",res.data);
if (res.data.resultCode == 1) {
this.WeiXinShareImgSrc=res.data.data;
}
......
src/components/systemManagement/AccountType.vue
View file @ 0c5083db
......@@ -112,7 +112,7 @@
<p class="_t"><span>{{$t('fnc.xnleixing')}}</span><span v-if="item.IsVirtual==0">{{$t('fnc.fou')}}</span><span v-if="item.IsVirtual==1">{{$t('fnc.yes')}}</span></p>
<p class="_btn">
<span class="_e" @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true">{{$t('pub.updateMsg')}}</span>
<span class="_d" @click="financeinfoRemove(item.ID,item.Name)">{{$t('sysytem.table_delete')}}</span>
<span class="_d" @click="financeinfoRemove(item.ID,item.Name)">{{$t('system.table_delete')}}</span>
</p>
</div>
</div>
......@@ -127,7 +127,7 @@
<th>{{$t('fnc.glzhangu')}}</th>
<th>{{$t('fnc.sfduigong')}}</th>
<th>{{$t('fnc.xnleixing')}}</th>
<th>{{$t('sysytem.table_operation')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in tableInfo" :key="index">
<td>{{item.Name}}</td>
......@@ -145,7 +145,7 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sysytem.table_delete')" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle @click="financeinfoRemove(item.ID,item.Name)"></el-button>
</el-tooltip>
</el-row>
......
src/plug/index.js
View file @ 0c5083db
......@@ -121,6 +121,7 @@ export default {
domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.65:8025";
domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......@@ -401,6 +402,10 @@ export default {
})
} else if (res.resultCode == 10005) {
this.$router.go(-1)
} else if(res.data.data.isJumpTwoCode==1){
this.$router.push({
path: '/clientConfirm'
})
} else {
successCall(res)
}
......
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