Skip to content

S
SuperMan
Commit 1ff5dd90 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

单地接

parent 5a923f8e
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 79 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 1ff5dd90
...@@ -864,6 +864,12 @@ ...@@ -864,6 +864,12 @@
</el-row> </el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div> <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20"> <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-col :span="4">
<el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'"> <el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')" <el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
...@@ -896,12 +902,7 @@ ...@@ -896,12 +902,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -2888,7 +2889,6 @@ ...@@ -2888,7 +2889,6 @@
} else { } else {
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString() this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
} }
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
this.addMsg.BabyNum = x.BabyNum.toString(); this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString(); this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm this.addMsg.OrderForm = x.OrderForm
...@@ -3177,6 +3177,12 @@ ...@@ -3177,6 +3177,12 @@
Number(this.addMsg.TripleRoomNum) Number(this.addMsg.TripleRoomNum)
}, },
getNumber() { getNumber() {
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
let ChirdNum = Number(this.addMsg.ChirdNum) let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
ChirdNum = 0 ChirdNum = 0
...@@ -3269,7 +3275,7 @@ ...@@ -3269,7 +3275,7 @@
let dandijie let dandijie
if(this.addMsg.GroupType == 4){ 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 ertong = 0
ertongbed = 0 ertongbed = 0
zafeiqianzhen = 0 zafeiqianzhen = 0
...@@ -3332,14 +3338,14 @@ ...@@ -3332,14 +3338,14 @@
(Number(this.stratPrice) + Number(this.returnPrice)) (Number(this.stratPrice) + Number(this.returnPrice))
let dandijie let dandijie
if(this.addMsg.GroupType == 4){ 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 ertong = 0
ertongbed = 0 ertongbed = 0
zafeiqianzhen = 0 zafeiqianzhen = 0
}else { }else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum) dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
} }
console.log(dandijie)
this.addMsg.PreferPrice = this.addMsg.PreferPrice =
dandijie + dandijie +
lianyun + lianyun +
...@@ -3577,17 +3583,7 @@ ...@@ -3577,17 +3583,7 @@
this.$message.warning('保险数量不能大于人数总和！') this.$message.warning('保险数量不能大于人数总和！')
return return
} }
} if (
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.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) +
Number(this.addMsg.BabyNum) > Number(this.addMsg.BabyNum) >
...@@ -3598,7 +3594,14 @@ ...@@ -3598,7 +3594,14 @@
this.$message.warning('儿童占床数量不足！') this.$message.warning('儿童占床数量不足！')
return return
} }
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning('儿童占床不能大于儿童数！')
return
}
} }
if (this.userId == this.createByInfo) { if (this.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == '-1') { if (this.addMsg.CommissionSharePeople == '-1') {
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 1ff5dd90
...@@ -1287,6 +1287,12 @@ ...@@ -1287,6 +1287,12 @@
</el-row> </el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div> <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20"> <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-col :span="4">
<el-form-item label="成人人数" v-show="addMsg.GroupType !== '4'"> <el-form-item label="成人人数" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')" <el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
...@@ -1319,12 +1325,7 @@ ...@@ -1319,12 +1325,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -3993,6 +3994,12 @@ ...@@ -3993,6 +3994,12 @@
Number(this.addMsg.TripleRoomNum); Number(this.addMsg.TripleRoomNum);
}, },
getNumber() { getNumber() {
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
let ChirdNum = Number(this.addMsg.ChirdNum) let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
ChirdNum = 0 ChirdNum = 0
...@@ -4406,24 +4413,25 @@ ...@@ -4406,24 +4413,25 @@
this.$message.warning("保险数量不能大于人数总和！"); this.$message.warning("保险数量不能大于人数总和！");
return; return;
} }
} if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！");
return;
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) { if (
this.$message.warning("儿童占床不能大于儿童数！"); Number(this.addMsg.ChirdNum) -
return; 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) let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
ChirdNum = 0 ChirdNum = 0
......
src/components/SalesModule/productQuery.vue
View file @ 1ff5dd90
...@@ -1953,6 +1953,15 @@ ...@@ -1953,6 +1953,15 @@
this.$message.warning('保险数量不能大于人数总和！') this.$message.warning('保险数量不能大于人数总和！')
return 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)) // 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))) // <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
...@@ -1961,20 +1970,7 @@ ...@@ -1961,20 +1970,7 @@
// return // 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) { if (this.userId == this.createByInfo) {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 1ff5dd90
...@@ -1241,6 +1241,12 @@ ...@@ -1241,6 +1241,12 @@
</el-row> </el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div> <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20"> <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-col :span="4">
<el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'"> <el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')" <el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
...@@ -1273,12 +1279,7 @@ ...@@ -1273,12 +1279,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </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>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -3971,6 +3972,12 @@ ...@@ -3971,6 +3972,12 @@
Number(this.addMsg.TripleRoomNum); Number(this.addMsg.TripleRoomNum);
}, },
getNumber() { getNumber() {
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
}
let ChirdNum = Number(this.addMsg.ChirdNum) let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
ChirdNum = 0 ChirdNum = 0
...@@ -4368,24 +4375,25 @@ ...@@ -4368,24 +4375,25 @@
this.$message.warning("保险数量不能大于人数总和！"); this.$message.warning("保险数量不能大于人数总和！");
return; return;
} }
} if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！");
return;
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) { if (
this.$message.warning("儿童占床不能大于儿童数！"); Number(this.addMsg.ChirdNum) -
return; 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.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == "-1") { if (this.addMsg.CommissionSharePeople == "-1") {
......
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