Skip to content

S
SuperMan
Commit 8cb3d897 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents ee5b986a 980ba60f
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 93 deletions
src/components/Contract/TravelContract.vue
View file @ 8cb3d897
......@@ -820,8 +820,8 @@
</table>
</div>
</el-form>
<div>
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:40px 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
<div style="margin-top:20px;">
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:0 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
<input type="button" class="normalBtn" @click="submitForm('CtObj')" 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="作废">
......@@ -957,8 +957,8 @@
agentCall:'',
contractPlace:'',
//合同条款
totalNumber:0,
eachNumber:0,
totalNumber:2,
eachNumber:1,
productName:'',
startDate:'',
returnDate:'',
......@@ -1054,6 +1054,9 @@
this.CtObj.businessCertificate = '0000000';
this.CtObj.tcid = this.$route.query.TCID;
this.CtObj.orderId = this.$route.query.orderID;
this.CtObj.totalNumber=2;
this.CtObj.eachNumber=1;
if(this.CtObj.clientCountryid>0){
this.GetSubAreaList(this.CtObj.clientCountryid,1,1);
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ 8cb3d897
......@@ -864,6 +864,12 @@
</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()'></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' @keyup.native="checkInteger(addMsg,'ManNum')"
......@@ -896,12 +902,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></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()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1819,7 +1820,8 @@
</span>
</div>
<span class="GO_Contract" @click="goContract(item)" >领取合同</span>
<span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
<span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
</td>
</tr>
<tr>
......@@ -2888,7 +2890,6 @@
} else {
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
}
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm
......@@ -3177,7 +3178,13 @@
Number(this.addMsg.TripleRoomNum)
},
getNumber() {
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
let ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
......@@ -3269,7 +3276,7 @@
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
......@@ -3332,14 +3339,14 @@
(Number(this.stratPrice) + Number(this.returnPrice))
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
dandijie = this.addObj.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)
}
console.log(dandijie)
this.addMsg.PreferPrice =
dandijie +
lianyun +
......@@ -3577,17 +3584,7 @@
this.$message.warning('保险数量不能大于人数总和！')
return
}
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning('儿童占床不能大于儿童数！')
return
}
if (this.addMsg.GroupType == 4) {
} else {
if (
if (
Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum) +
Number(this.addMsg.BabyNum) >
......@@ -3598,7 +3595,14 @@
this.$message.warning('儿童占床数量不足！')
return
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning('儿童占床不能大于儿童数！')
return
}
}
if (this.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == '-1') {
this.addMsg.CommissionShareMoney = '0'
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 8cb3d897
......@@ -870,7 +870,11 @@
line-height: 22px;
background-color: #f0f2f5;
}
.GO_Contract{
color:blue;
display: block;
cursor: pointer;
}
</style>
<template>
......@@ -1287,6 +1291,12 @@
</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="单地接数量" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成人人数" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
......@@ -1319,12 +1329,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单地接数量" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -2137,7 +2142,8 @@
<span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
</span>
<div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</div>
<div v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</div>
</div>
</td>
......@@ -3993,7 +3999,13 @@
Number(this.addMsg.TripleRoomNum);
},
getNumber() {
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
let ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
......@@ -4406,24 +4418,25 @@
this.$message.warning("保险数量不能大于人数总和！");
return;
}
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！");
return;
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！");
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 (
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;
}
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
......@@ -4789,6 +4802,18 @@
tab: name
}
});
},
//跳转至领取合同
goContract(item){
let routeData = this.$router.resolve({
name: 'TravelContract',
query: {
TCID: item.tcid,
orderID:item.orderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
},
goUrl(name, path, id, tcmun) {
this.$router.push({
......
src/components/SalesModule/productQuery.vue
View file @ 8cb3d897
......@@ -1712,10 +1712,11 @@
this.$forceUpdate()
return
}
let ChirdNum = Number(this.addMsg.ChirdNum)
let ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
console.log(ChirdNum)
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
this.addMsg.VisaNum = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
......@@ -1953,6 +1954,15 @@
this.$message.warning('保险数量不能大于人数总和！')
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 (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning('儿童占床不能大于儿童数！')
return
}
}
// if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum))
// <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
......@@ -1961,20 +1971,7 @@
// return
// }
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
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) {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 8cb3d897
......@@ -929,7 +929,11 @@
margin: 0 20px 5px 0;
width: 100%;
}
.GO_Contract{
color:blue;
display: block;
cursor: pointer;
}
</style>
<template>
......@@ -1241,6 +1245,12 @@
</el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20">
<el-col :span="3">
<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()'></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' @keyup.native="checkInteger(addMsg,'ManNum')"
......@@ -1273,12 +1283,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<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()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1772,7 +1777,8 @@
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
<span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
</td>
</tr>
<tr>
......@@ -2088,7 +2094,8 @@
<span>单据：</span>
<span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
</span>
<span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)" >领取合同</span>
<span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
</div>
</td>
</tr>
......@@ -3971,7 +3978,13 @@
Number(this.addMsg.TripleRoomNum);
},
getNumber() {
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
let ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
......@@ -4368,24 +4381,25 @@
this.$message.warning("保险数量不能大于人数总和！");
return;
}
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！");
return;
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！");
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 (
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") {
......@@ -5040,6 +5054,18 @@
});
},
//跳转至领取合同
goContract(item){
let routeData = this.$router.resolve({
name: 'TravelContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
},
Discount(TCID) {
this.SpecialOffer = true
this.apipost(
......
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