Skip to content

S
SuperMan
Commit 5a923f8e authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

单地接

parent 1f6340cb
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 57 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 5a923f8e
......@@ -2472,7 +2472,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
......@@ -2480,7 +2484,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
......@@ -2875,6 +2883,11 @@
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString()
this.addMsg.ChirdNum = x.ChirdNum.toString()
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString()
if (this.addMsg.GroupType == 4) {
this.addMsg.ChirdNoNeedBedNum = x.ChirdNoNeedBedNum.toString()
} 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();
......@@ -3146,11 +3159,16 @@
}
},
getHouseNo() {
let etbzc = 0
if (this.addMsg.GroupType == 4) {
etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
}
//算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
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)) /
......@@ -3159,23 +3177,30 @@
Number(this.addMsg.TripleRoomNum)
},
getNumber() {
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
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) +
ChirdNum +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum)
this.addMsg.SafeNum =
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
ChirdNum +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum)
var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) -
(Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum;
if (this.addMsg.GroupType == 4) {
this.addMsg.YSeatNum = 0
}
},
getTotalPrice(t) {
if (t === 3) {
......@@ -3244,7 +3269,10 @@
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * 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)
......@@ -3304,7 +3332,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.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)
......@@ -3506,73 +3537,81 @@
this.addMsg.CommissionShareMoney = '0'
},
saveOrder() {
//验证人数和机位数
if (
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) !=
Number(this.addMsg.YSeatNum) +
Number(this.addMsg.ESeatNum) +
Number(this.addMsg.FSeatNum)
) {
if (this.IsChargeLossOrders == 1) {
//验证人数和机位数 20190807 修改 如果是不是单地接才判断
if (this.addMsg.GroupType !== '4') {
if (
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) !=
Number(this.addMsg.YSeatNum) +
Number(this.addMsg.ESeatNum) +
Number(this.addMsg.FSeatNum)
) {
if (this.IsChargeLossOrders == 1) {
} else {
this.$message.warning('人数和机位数不相等！')
} else {
this.$message.warning('人数和机位数不相等！')
return
}
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.VisaNum)
) {
this.$message.warning('签证数量不能大于人数总和！')
return
}
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.VisaNum)
) {
this.$message.warning('签证数量不能大于人数总和！')
return
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.SafeNum)
) {
this.$message.warning('保险数量不能大于人数总和！')
return
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.SafeNum)
) {
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 (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') {
this.addMsg.CommissionShareMoney = '0'
}
}
let ChirdNum = Number(this.addMsg.ChirdNum)
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
this.addMsg.TCID = this.addObj.TCID
this.addMsg.GuestNum =
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
ChirdNum +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.AirticketNum)
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 5a923f8e
......@@ -3667,7 +3667,11 @@
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
this.addMsg.ChirdNum = x.ChirdNum.toString();
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
if (this.addMsg.GroupType == 4) {
this.addMsg.ChirdNoNeedBedNum = x.ChirdNoNeedBedNum.toString()
} else {
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;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 5a923f8e
......@@ -3432,7 +3432,11 @@
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
this.addMsg.ChirdNum = x.ChirdNum.toString();
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
if (this.addMsg.GroupType == 4) {
this.addMsg.ChirdNoNeedBedNum = x.ChirdNoNeedBedNum.toString()
} else {
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
}
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderBackScenicList=x.OrderBackScenicList;
......
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